[packages/kernel/LINUX_3_10] - 3.10.33 - vserver patch updated to patch-3.10.33-vs2.3.6.8.diff
baggins
baggins at pld-linux.org
Fri Mar 14 20:29:19 CET 2014
commit 365e2173c62e5ffd0a45b81bc025715eb644babc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Mar 14 20:28:59 2014 +0100
- 3.10.33
- vserver patch updated to patch-3.10.33-vs2.3.6.8.diff
kernel-vserver-2.3.patch | 2412 +++++++++++++++++++++++-----------------------
kernel.spec | 4 +-
2 files changed, 1208 insertions(+), 1208 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index b796bb0..bcdd503 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@
%define rel 1
%define basever 3.10
-%define postver .32
+%define postver .33
%define versuffix -%{basever}
@@ -114,7 +114,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
# Source0-md5: 4f25cd5bec5f8d5a7d935b3f2ccb8481
%if "%{postver}" != ".0"
Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5: f462ded4115e99d666e0b59b0f4b0f3d
+# Patch0-md5: 2a453acf41c3f28122a7cabd3d4acbf5
%endif
Source1: kernel.sysconfig
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index cb2aa7b..86281e2 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-3.10.27/Documentation/vserver/debug.txt linux-3.10.27-vs2.3.6.8/Documentation/vserver/debug.txt
---- linux-3.10.27/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/Documentation/vserver/debug.txt 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/Documentation/vserver/debug.txt linux-3.10.33-vs2.3.6.8/Documentation/vserver/debug.txt
+--- linux-3.10.33/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/Documentation/vserver/debug.txt 2013-08-22 20:29:59.000000000 +0000
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -156,9 +156,9 @@ diff -NurpP --minimal linux-3.10.27/Documentation/vserver/debug.txt linux-3.10.2
+ 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.10.27/arch/alpha/Kconfig linux-3.10.27-vs2.3.6.8/arch/alpha/Kconfig
---- linux-3.10.27/arch/alpha/Kconfig 2013-07-14 17:00:13.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/alpha/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/alpha/Kconfig linux-3.10.33-vs2.3.6.8/arch/alpha/Kconfig
+--- linux-3.10.33/arch/alpha/Kconfig 2013-07-14 17:00:13.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/alpha/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -665,6 +665,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -168,9 +168,9 @@ diff -NurpP --minimal linux-3.10.27/arch/alpha/Kconfig linux-3.10.27-vs2.3.6.8/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.27/arch/alpha/kernel/systbls.S linux-3.10.27-vs2.3.6.8/arch/alpha/kernel/systbls.S
---- linux-3.10.27/arch/alpha/kernel/systbls.S 2013-02-19 13:56:11.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/alpha/kernel/systbls.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/alpha/kernel/systbls.S linux-3.10.33-vs2.3.6.8/arch/alpha/kernel/systbls.S
+--- linux-3.10.33/arch/alpha/kernel/systbls.S 2013-02-19 13:56:11.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/alpha/kernel/systbls.S 2013-08-22 20:29:59.000000000 +0000
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -180,9 +180,9 @@ diff -NurpP --minimal linux-3.10.27/arch/alpha/kernel/systbls.S linux-3.10.27-vs
.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.10.27/arch/alpha/kernel/traps.c linux-3.10.27-vs2.3.6.8/arch/alpha/kernel/traps.c
---- linux-3.10.27/arch/alpha/kernel/traps.c 2013-07-14 17:00:13.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/alpha/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/alpha/kernel/traps.c linux-3.10.33-vs2.3.6.8/arch/alpha/kernel/traps.c
+--- linux-3.10.33/arch/alpha/kernel/traps.c 2013-07-14 17:00:13.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/alpha/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
@@ -177,7 +177,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -193,9 +193,9 @@ diff -NurpP --minimal linux-3.10.27/arch/alpha/kernel/traps.c linux-3.10.27-vs2.
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.10.27/arch/arm/Kconfig linux-3.10.27-vs2.3.6.8/arch/arm/Kconfig
---- linux-3.10.27/arch/arm/Kconfig 2014-01-22 18:40:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/arm/Kconfig 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/arm/Kconfig linux-3.10.33-vs2.3.6.8/arch/arm/Kconfig
+--- linux-3.10.33/arch/arm/Kconfig 2014-03-12 13:15:53.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/arm/Kconfig 2013-11-13 17:17:15.000000000 +0000
@@ -2238,6 +2238,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -205,9 +205,9 @@ diff -NurpP --minimal linux-3.10.27/arch/arm/Kconfig linux-3.10.27-vs2.3.6.8/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.27/arch/arm/kernel/calls.S linux-3.10.27-vs2.3.6.8/arch/arm/kernel/calls.S
---- linux-3.10.27/arch/arm/kernel/calls.S 2013-05-31 13:44:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/arm/kernel/calls.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/arm/kernel/calls.S linux-3.10.33-vs2.3.6.8/arch/arm/kernel/calls.S
+--- linux-3.10.33/arch/arm/kernel/calls.S 2013-05-31 13:44:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/arm/kernel/calls.S 2013-08-22 20:29:59.000000000 +0000
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -217,9 +217,9 @@ diff -NurpP --minimal linux-3.10.27/arch/arm/kernel/calls.S linux-3.10.27-vs2.3.
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.10.27/arch/arm/kernel/traps.c linux-3.10.27-vs2.3.6.8/arch/arm/kernel/traps.c
---- linux-3.10.27/arch/arm/kernel/traps.c 2014-01-22 18:40:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/arm/kernel/traps.c 2014-01-22 19:00:34.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/arm/kernel/traps.c linux-3.10.33-vs2.3.6.8/arch/arm/kernel/traps.c
+--- linux-3.10.33/arch/arm/kernel/traps.c 2014-03-12 13:15:53.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/arm/kernel/traps.c 2014-01-22 19:00:34.000000000 +0000
@@ -246,8 +246,8 @@ static int __die(const char *str, int er
print_modules();
@@ -231,9 +231,9 @@ diff -NurpP --minimal linux-3.10.27/arch/arm/kernel/traps.c linux-3.10.27-vs2.3.
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.10.27/arch/cris/Kconfig linux-3.10.27-vs2.3.6.8/arch/cris/Kconfig
---- linux-3.10.27/arch/cris/Kconfig 2013-07-14 17:00:25.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/cris/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/cris/Kconfig linux-3.10.33-vs2.3.6.8/arch/cris/Kconfig
+--- linux-3.10.33/arch/cris/Kconfig 2013-07-14 17:00:25.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/cris/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -673,6 +673,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -243,9 +243,9 @@ diff -NurpP --minimal linux-3.10.27/arch/cris/Kconfig linux-3.10.27-vs2.3.6.8/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.27/arch/h8300/Kconfig linux-3.10.27-vs2.3.6.8/arch/h8300/Kconfig
---- linux-3.10.27/arch/h8300/Kconfig 2013-07-14 17:00:25.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/h8300/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/h8300/Kconfig linux-3.10.33-vs2.3.6.8/arch/h8300/Kconfig
+--- linux-3.10.33/arch/h8300/Kconfig 2013-07-14 17:00:25.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/h8300/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -218,6 +218,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -255,9 +255,9 @@ diff -NurpP --minimal linux-3.10.27/arch/h8300/Kconfig linux-3.10.27-vs2.3.6.8/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.27/arch/ia64/Kconfig linux-3.10.27-vs2.3.6.8/arch/ia64/Kconfig
---- linux-3.10.27/arch/ia64/Kconfig 2013-07-14 17:00:25.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/ia64/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/ia64/Kconfig linux-3.10.33-vs2.3.6.8/arch/ia64/Kconfig
+--- linux-3.10.33/arch/ia64/Kconfig 2013-07-14 17:00:25.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/ia64/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -643,6 +643,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -267,9 +267,9 @@ diff -NurpP --minimal linux-3.10.27/arch/ia64/Kconfig linux-3.10.27-vs2.3.6.8/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.27/arch/ia64/kernel/entry.S linux-3.10.27-vs2.3.6.8/arch/ia64/kernel/entry.S
---- linux-3.10.27/arch/ia64/kernel/entry.S 2013-05-31 13:44:38.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/ia64/kernel/entry.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/ia64/kernel/entry.S linux-3.10.33-vs2.3.6.8/arch/ia64/kernel/entry.S
+--- linux-3.10.33/arch/ia64/kernel/entry.S 2013-05-31 13:44:38.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/ia64/kernel/entry.S 2013-08-22 20:29:59.000000000 +0000
@@ -1719,7 +1719,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -279,9 +279,9 @@ diff -NurpP --minimal linux-3.10.27/arch/ia64/kernel/entry.S linux-3.10.27-vs2.3
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-3.10.27/arch/ia64/kernel/ptrace.c linux-3.10.27-vs2.3.6.8/arch/ia64/kernel/ptrace.c
---- linux-3.10.27/arch/ia64/kernel/ptrace.c 2013-02-19 13:56:51.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/ia64/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/ia64/kernel/ptrace.c linux-3.10.33-vs2.3.6.8/arch/ia64/kernel/ptrace.c
+--- linux-3.10.33/arch/ia64/kernel/ptrace.c 2013-02-19 13:56:51.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/ia64/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -290,9 +290,9 @@ diff -NurpP --minimal linux-3.10.27/arch/ia64/kernel/ptrace.c linux-3.10.27-vs2.
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.10.27/arch/ia64/kernel/traps.c linux-3.10.27-vs2.3.6.8/arch/ia64/kernel/traps.c
---- linux-3.10.27/arch/ia64/kernel/traps.c 2013-05-31 13:44:38.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/ia64/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/ia64/kernel/traps.c linux-3.10.33-vs2.3.6.8/arch/ia64/kernel/traps.c
+--- linux-3.10.33/arch/ia64/kernel/traps.c 2013-05-31 13:44:38.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/ia64/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -317,9 +317,9 @@ diff -NurpP --minimal linux-3.10.27/arch/ia64/kernel/traps.c linux-3.10.27-vs2.3
}
}
}
-diff -NurpP --minimal linux-3.10.27/arch/m32r/kernel/traps.c linux-3.10.27-vs2.3.6.8/arch/m32r/kernel/traps.c
---- linux-3.10.27/arch/m32r/kernel/traps.c 2013-07-14 17:00:26.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/m32r/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/m32r/kernel/traps.c linux-3.10.33-vs2.3.6.8/arch/m32r/kernel/traps.c
+--- linux-3.10.33/arch/m32r/kernel/traps.c 2013-07-14 17:00:26.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/m32r/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
@@ -184,8 +184,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -332,9 +332,9 @@ diff -NurpP --minimal linux-3.10.27/arch/m32r/kernel/traps.c linux-3.10.27-vs2.3
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.10.27/arch/m68k/Kconfig linux-3.10.27-vs2.3.6.8/arch/m68k/Kconfig
---- linux-3.10.27/arch/m68k/Kconfig 2013-07-14 17:00:26.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/m68k/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/m68k/Kconfig linux-3.10.33-vs2.3.6.8/arch/m68k/Kconfig
+--- linux-3.10.33/arch/m68k/Kconfig 2013-07-14 17:00:26.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/m68k/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -134,6 +134,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -344,9 +344,9 @@ diff -NurpP --minimal linux-3.10.27/arch/m68k/Kconfig linux-3.10.27-vs2.3.6.8/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.27/arch/mips/Kconfig linux-3.10.27-vs2.3.6.8/arch/mips/Kconfig
---- linux-3.10.27/arch/mips/Kconfig 2014-01-22 18:40:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/mips/Kconfig 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/mips/Kconfig linux-3.10.33-vs2.3.6.8/arch/mips/Kconfig
+--- linux-3.10.33/arch/mips/Kconfig 2014-03-12 13:15:54.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/mips/Kconfig 2013-11-13 17:17:15.000000000 +0000
@@ -2583,6 +2583,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -356,9 +356,9 @@ diff -NurpP --minimal linux-3.10.27/arch/mips/Kconfig linux-3.10.27-vs2.3.6.8/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.27/arch/mips/kernel/ptrace.c linux-3.10.27-vs2.3.6.8/arch/mips/kernel/ptrace.c
---- linux-3.10.27/arch/mips/kernel/ptrace.c 2013-05-31 13:44:42.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/mips/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/mips/kernel/ptrace.c linux-3.10.33-vs2.3.6.8/arch/mips/kernel/ptrace.c
+--- linux-3.10.33/arch/mips/kernel/ptrace.c 2013-05-31 13:44:42.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/mips/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -377,9 +377,9 @@ diff -NurpP --minimal linux-3.10.27/arch/mips/kernel/ptrace.c linux-3.10.27-vs2.
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.10.27/arch/mips/kernel/scall32-o32.S linux-3.10.27-vs2.3.6.8/arch/mips/kernel/scall32-o32.S
---- linux-3.10.27/arch/mips/kernel/scall32-o32.S 2013-07-14 17:00:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/mips/kernel/scall32-o32.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/mips/kernel/scall32-o32.S linux-3.10.33-vs2.3.6.8/arch/mips/kernel/scall32-o32.S
+--- linux-3.10.33/arch/mips/kernel/scall32-o32.S 2013-07-14 17:00:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/mips/kernel/scall32-o32.S 2013-08-22 20:29:59.000000000 +0000
@@ -521,7 +521,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
@@ -389,9 +389,9 @@ diff -NurpP --minimal linux-3.10.27/arch/mips/kernel/scall32-o32.S linux-3.10.27
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-3.10.27/arch/mips/kernel/scall64-64.S linux-3.10.27-vs2.3.6.8/arch/mips/kernel/scall64-64.S
---- linux-3.10.27/arch/mips/kernel/scall64-64.S 2013-07-14 17:00:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/mips/kernel/scall64-64.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/mips/kernel/scall64-64.S linux-3.10.33-vs2.3.6.8/arch/mips/kernel/scall64-64.S
+--- linux-3.10.33/arch/mips/kernel/scall64-64.S 2013-07-14 17:00:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/mips/kernel/scall64-64.S 2013-08-22 20:29:59.000000000 +0000
@@ -351,7 +351,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -401,9 +401,9 @@ diff -NurpP --minimal linux-3.10.27/arch/mips/kernel/scall64-64.S linux-3.10.27-
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.10.27/arch/mips/kernel/scall64-n32.S linux-3.10.27-vs2.3.6.8/arch/mips/kernel/scall64-n32.S
---- linux-3.10.27/arch/mips/kernel/scall64-n32.S 2013-07-14 17:00:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/mips/kernel/scall64-n32.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/mips/kernel/scall64-n32.S linux-3.10.33-vs2.3.6.8/arch/mips/kernel/scall64-n32.S
+--- linux-3.10.33/arch/mips/kernel/scall64-n32.S 2013-07-14 17:00:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/mips/kernel/scall64-n32.S 2013-08-22 20:29:59.000000000 +0000
@@ -344,7 +344,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -413,9 +413,9 @@ diff -NurpP --minimal linux-3.10.27/arch/mips/kernel/scall64-n32.S linux-3.10.27
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.10.27/arch/mips/kernel/scall64-o32.S linux-3.10.27-vs2.3.6.8/arch/mips/kernel/scall64-o32.S
---- linux-3.10.27/arch/mips/kernel/scall64-o32.S 2013-07-14 17:00:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/mips/kernel/scall64-o32.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/mips/kernel/scall64-o32.S linux-3.10.33-vs2.3.6.8/arch/mips/kernel/scall64-o32.S
+--- linux-3.10.33/arch/mips/kernel/scall64-o32.S 2013-07-14 17:00:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/mips/kernel/scall64-o32.S 2013-08-22 20:29:59.000000000 +0000
@@ -469,7 +469,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -425,9 +425,9 @@ diff -NurpP --minimal linux-3.10.27/arch/mips/kernel/scall64-o32.S linux-3.10.27
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.10.27/arch/mips/kernel/traps.c linux-3.10.27-vs2.3.6.8/arch/mips/kernel/traps.c
---- linux-3.10.27/arch/mips/kernel/traps.c 2013-07-14 17:00:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/mips/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/mips/kernel/traps.c linux-3.10.33-vs2.3.6.8/arch/mips/kernel/traps.c
+--- linux-3.10.33/arch/mips/kernel/traps.c 2013-07-14 17:00:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/mips/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
@@ -331,9 +331,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
@@ -442,9 +442,9 @@ diff -NurpP --minimal linux-3.10.27/arch/mips/kernel/traps.c linux-3.10.27-vs2.3
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-3.10.27/arch/parisc/Kconfig linux-3.10.27-vs2.3.6.8/arch/parisc/Kconfig
---- linux-3.10.27/arch/parisc/Kconfig 2013-07-14 17:00:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/parisc/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/parisc/Kconfig linux-3.10.33-vs2.3.6.8/arch/parisc/Kconfig
+--- linux-3.10.33/arch/parisc/Kconfig 2013-07-14 17:00:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/parisc/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -318,6 +318,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -454,9 +454,9 @@ diff -NurpP --minimal linux-3.10.27/arch/parisc/Kconfig linux-3.10.27-vs2.3.6.8/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.27/arch/parisc/kernel/syscall_table.S linux-3.10.27-vs2.3.6.8/arch/parisc/kernel/syscall_table.S
---- linux-3.10.27/arch/parisc/kernel/syscall_table.S 2013-07-14 17:00:31.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/parisc/kernel/syscall_table.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/parisc/kernel/syscall_table.S linux-3.10.33-vs2.3.6.8/arch/parisc/kernel/syscall_table.S
+--- linux-3.10.33/arch/parisc/kernel/syscall_table.S 2013-07-14 17:00:31.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/parisc/kernel/syscall_table.S 2013-08-22 20:29:59.000000000 +0000
@@ -358,7 +358,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -466,9 +466,9 @@ diff -NurpP --minimal linux-3.10.27/arch/parisc/kernel/syscall_table.S linux-3.1
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-3.10.27/arch/parisc/kernel/traps.c linux-3.10.27-vs2.3.6.8/arch/parisc/kernel/traps.c
---- linux-3.10.27/arch/parisc/kernel/traps.c 2014-01-22 18:40:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/parisc/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/parisc/kernel/traps.c linux-3.10.33-vs2.3.6.8/arch/parisc/kernel/traps.c
+--- linux-3.10.33/arch/parisc/kernel/traps.c 2014-03-12 13:15:54.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/parisc/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000
@@ -229,8 +229,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
@@ -492,9 +492,9 @@ diff -NurpP --minimal linux-3.10.27/arch/parisc/kernel/traps.c linux-3.10.27-vs2
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.10.27/arch/parisc/mm/fault.c linux-3.10.27-vs2.3.6.8/arch/parisc/mm/fault.c
---- linux-3.10.27/arch/parisc/mm/fault.c 2013-05-31 13:44:44.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/parisc/mm/fault.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/parisc/mm/fault.c linux-3.10.33-vs2.3.6.8/arch/parisc/mm/fault.c
+--- linux-3.10.33/arch/parisc/mm/fault.c 2013-05-31 13:44:44.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/parisc/mm/fault.c 2013-08-22 20:29:59.000000000 +0000
@@ -257,8 +257,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
@@ -507,9 +507,9 @@ diff -NurpP --minimal linux-3.10.27/arch/parisc/mm/fault.c linux-3.10.27-vs2.3.6
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.10.27/arch/powerpc/Kconfig linux-3.10.27-vs2.3.6.8/arch/powerpc/Kconfig
---- linux-3.10.27/arch/powerpc/Kconfig 2014-01-22 18:40:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/powerpc/Kconfig 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/powerpc/Kconfig linux-3.10.33-vs2.3.6.8/arch/powerpc/Kconfig
+--- linux-3.10.33/arch/powerpc/Kconfig 2014-03-12 13:15:54.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/powerpc/Kconfig 2013-11-13 17:17:15.000000000 +0000
@@ -1010,6 +1010,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -519,9 +519,9 @@ diff -NurpP --minimal linux-3.10.27/arch/powerpc/Kconfig linux-3.10.27-vs2.3.6.8
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-3.10.27/arch/powerpc/include/uapi/asm/unistd.h linux-3.10.27-vs2.3.6.8/arch/powerpc/include/uapi/asm/unistd.h
---- linux-3.10.27/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 13:44:44.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/powerpc/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/powerpc/include/uapi/asm/unistd.h linux-3.10.33-vs2.3.6.8/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-3.10.33/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 13:44:44.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/powerpc/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -531,9 +531,9 @@ diff -NurpP --minimal linux-3.10.27/arch/powerpc/include/uapi/asm/unistd.h linux
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-3.10.27/arch/powerpc/kernel/traps.c linux-3.10.27-vs2.3.6.8/arch/powerpc/kernel/traps.c
---- linux-3.10.27/arch/powerpc/kernel/traps.c 2014-01-22 18:40:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/powerpc/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/powerpc/kernel/traps.c linux-3.10.33-vs2.3.6.8/arch/powerpc/kernel/traps.c
+--- linux-3.10.33/arch/powerpc/kernel/traps.c 2014-03-12 13:15:54.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/powerpc/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000
@@ -1231,8 +1231,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
@@ -546,9 +546,9 @@ diff -NurpP --minimal linux-3.10.27/arch/powerpc/kernel/traps.c linux-3.10.27-vs
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-3.10.27/arch/s390/Kconfig linux-3.10.27-vs2.3.6.8/arch/s390/Kconfig
---- linux-3.10.27/arch/s390/Kconfig 2014-01-22 18:40:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/s390/Kconfig 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/s390/Kconfig linux-3.10.33-vs2.3.6.8/arch/s390/Kconfig
+--- linux-3.10.33/arch/s390/Kconfig 2014-03-12 13:15:55.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/s390/Kconfig 2013-11-13 17:17:15.000000000 +0000
@@ -579,6 +579,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -558,9 +558,9 @@ diff -NurpP --minimal linux-3.10.27/arch/s390/Kconfig linux-3.10.27-vs2.3.6.8/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.27/arch/s390/include/asm/tlb.h linux-3.10.27-vs2.3.6.8/arch/s390/include/asm/tlb.h
---- linux-3.10.27/arch/s390/include/asm/tlb.h 2014-01-22 18:40:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/s390/include/asm/tlb.h 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/s390/include/asm/tlb.h linux-3.10.33-vs2.3.6.8/arch/s390/include/asm/tlb.h
+--- linux-3.10.33/arch/s390/include/asm/tlb.h 2014-03-12 13:15:55.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/s390/include/asm/tlb.h 2013-11-13 17:17:15.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -569,9 +569,9 @@ diff -NurpP --minimal linux-3.10.27/arch/s390/include/asm/tlb.h linux-3.10.27-vs
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.10.27/arch/s390/include/uapi/asm/unistd.h linux-3.10.27-vs2.3.6.8/arch/s390/include/uapi/asm/unistd.h
---- linux-3.10.27/arch/s390/include/uapi/asm/unistd.h 2013-02-19 13:57:16.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/s390/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/s390/include/uapi/asm/unistd.h linux-3.10.33-vs2.3.6.8/arch/s390/include/uapi/asm/unistd.h
+--- linux-3.10.33/arch/s390/include/uapi/asm/unistd.h 2013-02-19 13:57:16.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/s390/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
@@ -200,7 +200,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
@@ -581,9 +581,9 @@ diff -NurpP --minimal linux-3.10.27/arch/s390/include/uapi/asm/unistd.h linux-3.
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-3.10.27/arch/s390/kernel/ptrace.c linux-3.10.27-vs2.3.6.8/arch/s390/kernel/ptrace.c
---- linux-3.10.27/arch/s390/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/s390/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/s390/kernel/ptrace.c linux-3.10.33-vs2.3.6.8/arch/s390/kernel/ptrace.c
+--- linux-3.10.33/arch/s390/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/s390/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
@@ -592,9 +592,9 @@ diff -NurpP --minimal linux-3.10.27/arch/s390/kernel/ptrace.c linux-3.10.27-vs2.
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-3.10.27/arch/s390/kernel/syscalls.S linux-3.10.27-vs2.3.6.8/arch/s390/kernel/syscalls.S
---- linux-3.10.27/arch/s390/kernel/syscalls.S 2013-07-14 17:00:34.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/s390/kernel/syscalls.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/s390/kernel/syscalls.S linux-3.10.33-vs2.3.6.8/arch/s390/kernel/syscalls.S
+--- linux-3.10.33/arch/s390/kernel/syscalls.S 2013-07-14 17:00:34.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/s390/kernel/syscalls.S 2013-08-22 20:29:59.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)
@@ -604,9 +604,9 @@ diff -NurpP --minimal linux-3.10.27/arch/s390/kernel/syscalls.S linux-3.10.27-vs
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.10.27/arch/sh/Kconfig linux-3.10.27-vs2.3.6.8/arch/sh/Kconfig
---- linux-3.10.27/arch/sh/Kconfig 2013-07-14 17:00:35.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/sh/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/sh/Kconfig linux-3.10.33-vs2.3.6.8/arch/sh/Kconfig
+--- linux-3.10.33/arch/sh/Kconfig 2013-07-14 17:00:35.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/sh/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -928,6 +928,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -616,9 +616,9 @@ diff -NurpP --minimal linux-3.10.27/arch/sh/Kconfig linux-3.10.27-vs2.3.6.8/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.27/arch/sh/kernel/irq.c linux-3.10.27-vs2.3.6.8/arch/sh/kernel/irq.c
---- linux-3.10.27/arch/sh/kernel/irq.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/sh/kernel/irq.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/sh/kernel/irq.c linux-3.10.33-vs2.3.6.8/arch/sh/kernel/irq.c
+--- linux-3.10.33/arch/sh/kernel/irq.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/sh/kernel/irq.c 2013-08-22 20:29:59.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
@@ -627,9 +627,9 @@ diff -NurpP --minimal linux-3.10.27/arch/sh/kernel/irq.c linux-3.10.27-vs2.3.6.8
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.10.27/arch/sparc/Kconfig linux-3.10.27-vs2.3.6.8/arch/sparc/Kconfig
---- linux-3.10.27/arch/sparc/Kconfig 2013-07-14 17:00:35.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/sparc/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/sparc/Kconfig linux-3.10.33-vs2.3.6.8/arch/sparc/Kconfig
+--- linux-3.10.33/arch/sparc/Kconfig 2013-07-14 17:00:35.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/sparc/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -550,6 +550,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
@@ -639,9 +639,9 @@ diff -NurpP --minimal linux-3.10.27/arch/sparc/Kconfig linux-3.10.27-vs2.3.6.8/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.27/arch/sparc/include/uapi/asm/unistd.h linux-3.10.27-vs2.3.6.8/arch/sparc/include/uapi/asm/unistd.h
---- linux-3.10.27/arch/sparc/include/uapi/asm/unistd.h 2013-02-19 13:57:17.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/sparc/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/sparc/include/uapi/asm/unistd.h linux-3.10.33-vs2.3.6.8/arch/sparc/include/uapi/asm/unistd.h
+--- linux-3.10.33/arch/sparc/include/uapi/asm/unistd.h 2013-02-19 13:57:17.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/sparc/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
@@ -332,7 +332,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -651,9 +651,9 @@ diff -NurpP --minimal linux-3.10.27/arch/sparc/include/uapi/asm/unistd.h linux-3
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-3.10.27/arch/sparc/kernel/systbls_32.S linux-3.10.27-vs2.3.6.8/arch/sparc/kernel/systbls_32.S
---- linux-3.10.27/arch/sparc/kernel/systbls_32.S 2013-05-31 13:44:48.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/sparc/kernel/systbls_32.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/sparc/kernel/systbls_32.S linux-3.10.33-vs2.3.6.8/arch/sparc/kernel/systbls_32.S
+--- linux-3.10.33/arch/sparc/kernel/systbls_32.S 2013-05-31 13:44:48.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/sparc/kernel/systbls_32.S 2013-08-22 20:29:59.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
@@ -663,9 +663,9 @@ diff -NurpP --minimal linux-3.10.27/arch/sparc/kernel/systbls_32.S linux-3.10.27
/*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.10.27/arch/sparc/kernel/systbls_64.S linux-3.10.27-vs2.3.6.8/arch/sparc/kernel/systbls_64.S
---- linux-3.10.27/arch/sparc/kernel/systbls_64.S 2013-07-14 17:00:35.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/sparc/kernel/systbls_64.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/sparc/kernel/systbls_64.S linux-3.10.33-vs2.3.6.8/arch/sparc/kernel/systbls_64.S
+--- linux-3.10.33/arch/sparc/kernel/systbls_64.S 2013-07-14 17:00:35.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/sparc/kernel/systbls_64.S 2013-08-22 20:29:59.000000000 +0000
@@ -71,7 +71,7 @@ sys_call_table32:
/*250*/ .word sys_mremap, compat_sys_sysctl, sys_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
@@ -684,9 +684,9 @@ diff -NurpP --minimal linux-3.10.27/arch/sparc/kernel/systbls_64.S linux-3.10.27
/*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.10.27/arch/um/Kconfig.rest linux-3.10.27-vs2.3.6.8/arch/um/Kconfig.rest
---- linux-3.10.27/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/um/Kconfig.rest 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/um/Kconfig.rest linux-3.10.33-vs2.3.6.8/arch/um/Kconfig.rest
+--- linux-3.10.33/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/um/Kconfig.rest 2013-08-22 20:29:59.000000000 +0000
@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
@@ -696,9 +696,9 @@ diff -NurpP --minimal linux-3.10.27/arch/um/Kconfig.rest linux-3.10.27-vs2.3.6.8
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.27/arch/x86/Kconfig linux-3.10.27-vs2.3.6.8/arch/x86/Kconfig
---- linux-3.10.27/arch/x86/Kconfig 2013-07-14 17:00:36.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/x86/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/x86/Kconfig linux-3.10.33-vs2.3.6.8/arch/x86/Kconfig
+--- linux-3.10.33/arch/x86/Kconfig 2013-07-14 17:00:36.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/x86/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -2339,6 +2339,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
@@ -708,9 +708,9 @@ diff -NurpP --minimal linux-3.10.27/arch/x86/Kconfig linux-3.10.27-vs2.3.6.8/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.27/arch/x86/syscalls/syscall_32.tbl linux-3.10.27-vs2.3.6.8/arch/x86/syscalls/syscall_32.tbl
---- linux-3.10.27/arch/x86/syscalls/syscall_32.tbl 2013-07-14 17:00:37.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/x86/syscalls/syscall_32.tbl 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/x86/syscalls/syscall_32.tbl linux-3.10.33-vs2.3.6.8/arch/x86/syscalls/syscall_32.tbl
+--- linux-3.10.33/arch/x86/syscalls/syscall_32.tbl 2013-07-14 17:00:37.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/x86/syscalls/syscall_32.tbl 2013-08-22 20:29:59.000000000 +0000
@@ -279,7 +279,7 @@
270 i386 tgkill sys_tgkill
271 i386 utimes sys_utimes compat_sys_utimes
@@ -720,9 +720,9 @@ diff -NurpP --minimal linux-3.10.27/arch/x86/syscalls/syscall_32.tbl linux-3.10.
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.10.27/arch/x86/syscalls/syscall_64.tbl linux-3.10.27-vs2.3.6.8/arch/x86/syscalls/syscall_64.tbl
---- linux-3.10.27/arch/x86/syscalls/syscall_64.tbl 2013-05-31 13:44:50.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/arch/x86/syscalls/syscall_64.tbl 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/arch/x86/syscalls/syscall_64.tbl linux-3.10.33-vs2.3.6.8/arch/x86/syscalls/syscall_64.tbl
+--- linux-3.10.33/arch/x86/syscalls/syscall_64.tbl 2013-05-31 13:44:50.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/arch/x86/syscalls/syscall_64.tbl 2013-08-22 20:29:59.000000000 +0000
@@ -242,7 +242,7 @@
233 common epoll_ctl sys_epoll_ctl
234 common tgkill sys_tgkill
@@ -732,9 +732,9 @@ diff -NurpP --minimal linux-3.10.27/arch/x86/syscalls/syscall_64.tbl linux-3.10.
237 common mbind sys_mbind
238 common set_mempolicy sys_set_mempolicy
239 common get_mempolicy sys_get_mempolicy
-diff -NurpP --minimal linux-3.10.27/drivers/block/Kconfig linux-3.10.27-vs2.3.6.8/drivers/block/Kconfig
---- linux-3.10.27/drivers/block/Kconfig 2013-05-31 13:44:51.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/drivers/block/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/drivers/block/Kconfig linux-3.10.33-vs2.3.6.8/drivers/block/Kconfig
+--- linux-3.10.33/drivers/block/Kconfig 2013-05-31 13:44:51.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/drivers/block/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -278,6 +278,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
@@ -749,9 +749,9 @@ diff -NurpP --minimal linux-3.10.27/drivers/block/Kconfig linux-3.10.27-vs2.3.6.
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-3.10.27/drivers/block/Makefile linux-3.10.27-vs2.3.6.8/drivers/block/Makefile
---- linux-3.10.27/drivers/block/Makefile 2013-07-14 17:00:41.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/drivers/block/Makefile 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/drivers/block/Makefile linux-3.10.33-vs2.3.6.8/drivers/block/Makefile
+--- linux-3.10.33/drivers/block/Makefile 2013-07-14 17:00:41.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/drivers/block/Makefile 2013-08-22 20:29:59.000000000 +0000
@@ -33,6 +33,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
@@ -760,9 +760,9 @@ diff -NurpP --minimal linux-3.10.27/drivers/block/Makefile linux-3.10.27-vs2.3.6
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
-diff -NurpP --minimal linux-3.10.27/drivers/block/loop.c linux-3.10.27-vs2.3.6.8/drivers/block/loop.c
---- linux-3.10.27/drivers/block/loop.c 2014-01-22 18:40:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/drivers/block/loop.c 2013-12-23 17:42:39.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/drivers/block/loop.c linux-3.10.33-vs2.3.6.8/drivers/block/loop.c
+--- linux-3.10.33/drivers/block/loop.c 2014-03-12 13:15:56.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/drivers/block/loop.c 2013-12-23 17:42:39.000000000 +0000
@@ -76,6 +76,7 @@
#include <linux/sysfs.h>
#include <linux/miscdevice.h>
@@ -818,9 +818,9 @@ diff -NurpP --minimal linux-3.10.27/drivers/block/loop.c linux-3.10.27-vs2.3.6.8
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-3.10.27/drivers/block/vroot.c linux-3.10.27-vs2.3.6.8/drivers/block/vroot.c
---- linux-3.10.27/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/drivers/block/vroot.c 2013-08-23 00:23:45.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/drivers/block/vroot.c linux-3.10.33-vs2.3.6.8/drivers/block/vroot.c
+--- linux-3.10.33/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/drivers/block/vroot.c 2013-08-23 00:23:45.000000000 +0000
@@ -0,0 +1,290 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -1112,9 +1112,9 @@ diff -NurpP --minimal linux-3.10.27/drivers/block/vroot.c linux-3.10.27-vs2.3.6.
+
+#endif
+
-diff -NurpP --minimal linux-3.10.27/drivers/infiniband/Kconfig linux-3.10.27-vs2.3.6.8/drivers/infiniband/Kconfig
---- linux-3.10.27/drivers/infiniband/Kconfig 2013-07-14 17:00:49.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/drivers/infiniband/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/drivers/infiniband/Kconfig linux-3.10.33-vs2.3.6.8/drivers/infiniband/Kconfig
+--- linux-3.10.33/drivers/infiniband/Kconfig 2013-07-14 17:00:49.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/drivers/infiniband/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
config INFINIBAND_ADDR_TRANS
bool
@@ -1124,9 +1124,9 @@ diff -NurpP --minimal linux-3.10.27/drivers/infiniband/Kconfig linux-3.10.27-vs2
default y
source "drivers/infiniband/hw/mthca/Kconfig"
-diff -NurpP --minimal linux-3.10.27/drivers/infiniband/core/addr.c linux-3.10.27-vs2.3.6.8/drivers/infiniband/core/addr.c
---- linux-3.10.27/drivers/infiniband/core/addr.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/drivers/infiniband/core/addr.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/drivers/infiniband/core/addr.c linux-3.10.33-vs2.3.6.8/drivers/infiniband/core/addr.c
+--- linux-3.10.33/drivers/infiniband/core/addr.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/drivers/infiniband/core/addr.c 2013-08-22 20:29:59.000000000 +0000
@@ -261,7 +261,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl6.saddr)) {
@@ -1136,9 +1136,9 @@ diff -NurpP --minimal linux-3.10.27/drivers/infiniband/core/addr.c linux-3.10.27
if (ret)
goto put;
-diff -NurpP --minimal linux-3.10.27/drivers/md/dm-ioctl.c linux-3.10.27-vs2.3.6.8/drivers/md/dm-ioctl.c
---- linux-3.10.27/drivers/md/dm-ioctl.c 2014-01-22 18:40:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/drivers/md/dm-ioctl.c 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/drivers/md/dm-ioctl.c linux-3.10.33-vs2.3.6.8/drivers/md/dm-ioctl.c
+--- linux-3.10.33/drivers/md/dm-ioctl.c 2014-03-12 13:16:01.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/drivers/md/dm-ioctl.c 2013-11-13 17:17:15.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
@@ -1224,9 +1224,9 @@ diff -NurpP --minimal linux-3.10.27/drivers/md/dm-ioctl.c linux-3.10.27-vs2.3.6.
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.10.27/drivers/md/dm.c linux-3.10.27-vs2.3.6.8/drivers/md/dm.c
---- linux-3.10.27/drivers/md/dm.c 2014-01-22 18:40:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/drivers/md/dm.c 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/drivers/md/dm.c linux-3.10.33-vs2.3.6.8/drivers/md/dm.c
+--- linux-3.10.33/drivers/md/dm.c 2014-03-12 13:16:01.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/drivers/md/dm.c 2014-03-12 13:18:23.000000000 +0000
@@ -19,6 +19,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
@@ -1300,10 +1300,10 @@ diff -NurpP --minimal linux-3.10.27/drivers/md/dm.c linux-3.10.27-vs2.3.6.8/driv
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-3.10.27/drivers/md/dm.h linux-3.10.27-vs2.3.6.8/drivers/md/dm.h
---- linux-3.10.27/drivers/md/dm.h 2013-02-19 13:57:51.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/drivers/md/dm.h 2013-08-22 20:29:59.000000000 +0000
-@@ -46,6 +46,8 @@ struct dm_dev_internal {
+diff -NurpP --minimal linux-3.10.33/drivers/md/dm.h linux-3.10.33-vs2.3.6.8/drivers/md/dm.h
+--- linux-3.10.33/drivers/md/dm.h 2014-03-12 13:16:01.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/drivers/md/dm.h 2014-03-12 13:18:23.000000000 +0000
+@@ -48,6 +48,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
@@ -1312,9 +1312,9 @@ diff -NurpP --minimal linux-3.10.27/drivers/md/dm.h linux-3.10.27-vs2.3.6.8/driv
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.10.27/drivers/net/tun.c linux-3.10.27-vs2.3.6.8/drivers/net/tun.c
---- linux-3.10.27/drivers/net/tun.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/drivers/net/tun.c 2014-01-22 19:00:34.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/drivers/net/tun.c linux-3.10.33-vs2.3.6.8/drivers/net/tun.c
+--- linux-3.10.33/drivers/net/tun.c 2014-03-12 13:16:01.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/drivers/net/tun.c 2014-01-22 19:00:34.000000000 +0000
@@ -64,6 +64,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
@@ -1383,9 +1383,9 @@ diff -NurpP --minimal linux-3.10.27/drivers/net/tun.c linux-3.10.27-vs2.3.6.8/dr
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.10.27/drivers/tty/sysrq.c linux-3.10.27-vs2.3.6.8/drivers/tty/sysrq.c
---- linux-3.10.27/drivers/tty/sysrq.c 2013-07-14 17:01:22.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/drivers/tty/sysrq.c 2013-08-22 20:58:35.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/drivers/tty/sysrq.c linux-3.10.33-vs2.3.6.8/drivers/tty/sysrq.c
+--- linux-3.10.33/drivers/tty/sysrq.c 2013-07-14 17:01:22.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/drivers/tty/sysrq.c 2013-08-22 20:58:35.000000000 +0000
@@ -44,6 +44,7 @@
#include <linux/uaccess.h>
#include <linux/moduleparam.h>
@@ -1437,9 +1437,9 @@ diff -NurpP --minimal linux-3.10.27/drivers/tty/sysrq.c linux-3.10.27-vs2.3.6.8/
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-3.10.27/drivers/tty/tty_io.c linux-3.10.27-vs2.3.6.8/drivers/tty/tty_io.c
---- linux-3.10.27/drivers/tty/tty_io.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/drivers/tty/tty_io.c 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/drivers/tty/tty_io.c linux-3.10.33-vs2.3.6.8/drivers/tty/tty_io.c
+--- linux-3.10.33/drivers/tty/tty_io.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/drivers/tty/tty_io.c 2013-11-13 17:17:15.000000000 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
@@ -1466,9 +1466,9 @@ diff -NurpP --minimal linux-3.10.27/drivers/tty/tty_io.c linux-3.10.27-vs2.3.6.8
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-3.10.27/fs/attr.c linux-3.10.27-vs2.3.6.8/fs/attr.c
---- linux-3.10.27/fs/attr.c 2013-02-19 13:58:46.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/attr.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/attr.c linux-3.10.33-vs2.3.6.8/fs/attr.c
+--- linux-3.10.33/fs/attr.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/attr.c 2014-03-12 13:18:32.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/security.h>
#include <linux/evm.h>
@@ -1509,9 +1509,9 @@ diff -NurpP --minimal linux-3.10.27/fs/attr.c linux-3.10.27-vs2.3.6.8/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-3.10.27/fs/block_dev.c linux-3.10.27-vs2.3.6.8/fs/block_dev.c
---- linux-3.10.27/fs/block_dev.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/block_dev.c 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/block_dev.c linux-3.10.33-vs2.3.6.8/fs/block_dev.c
+--- linux-3.10.33/fs/block_dev.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/block_dev.c 2013-11-13 17:17:15.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/log2.h>
#include <linux/cleancache.h>
@@ -1549,9 +1549,9 @@ diff -NurpP --minimal linux-3.10.27/fs/block_dev.c linux-3.10.27-vs2.3.6.8/fs/bl
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.10.27/fs/btrfs/ctree.h linux-3.10.27-vs2.3.6.8/fs/btrfs/ctree.h
---- linux-3.10.27/fs/btrfs/ctree.h 2013-07-14 17:01:26.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/btrfs/ctree.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/btrfs/ctree.h linux-3.10.33-vs2.3.6.8/fs/btrfs/ctree.h
+--- linux-3.10.33/fs/btrfs/ctree.h 2013-07-14 17:01:26.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/btrfs/ctree.h 2013-08-22 20:29:59.000000000 +0000
@@ -707,11 +707,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
@@ -1604,9 +1604,9 @@ diff -NurpP --minimal linux-3.10.27/fs/btrfs/ctree.h linux-3.10.27-vs2.3.6.8/fs/
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.10.27/fs/btrfs/disk-io.c linux-3.10.27-vs2.3.6.8/fs/btrfs/disk-io.c
---- linux-3.10.27/fs/btrfs/disk-io.c 2013-07-14 17:01:26.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/btrfs/disk-io.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/btrfs/disk-io.c linux-3.10.33-vs2.3.6.8/fs/btrfs/disk-io.c
+--- linux-3.10.33/fs/btrfs/disk-io.c 2013-07-14 17:01:26.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/btrfs/disk-io.c 2013-08-22 20:29:59.000000000 +0000
@@ -2360,6 +2360,9 @@ int open_ctree(struct super_block *sb,
goto fail_alloc;
}
@@ -1617,9 +1617,9 @@ diff -NurpP --minimal linux-3.10.27/fs/btrfs/disk-io.c linux-3.10.27-vs2.3.6.8/f
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-3.10.27/fs/btrfs/inode.c linux-3.10.27-vs2.3.6.8/fs/btrfs/inode.c
---- linux-3.10.27/fs/btrfs/inode.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/btrfs/inode.c 2013-12-23 17:42:39.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/btrfs/inode.c linux-3.10.33-vs2.3.6.8/fs/btrfs/inode.c
+--- linux-3.10.33/fs/btrfs/inode.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/btrfs/inode.c 2014-03-12 13:18:32.000000000 +0000
@@ -42,6 +42,7 @@
#include <linux/mount.h>
#include <linux/btrfs.h>
@@ -1676,7 +1676,7 @@ diff -NurpP --minimal linux-3.10.27/fs/btrfs/inode.c linux-3.10.27-vs2.3.6.8/fs/
btrfs_set_token_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size,
&token);
btrfs_set_token_inode_mode(leaf, item, inode->i_mode, &token);
-@@ -8729,11 +8746,13 @@ static const struct inode_operations btr
+@@ -8733,11 +8750,13 @@ static const struct inode_operations btr
.listxattr = btrfs_listxattr,
.removexattr = btrfs_removexattr,
.permission = btrfs_permission,
@@ -1690,9 +1690,9 @@ diff -NurpP --minimal linux-3.10.27/fs/btrfs/inode.c linux-3.10.27-vs2.3.6.8/fs/
.get_acl = btrfs_get_acl,
};
-diff -NurpP --minimal linux-3.10.27/fs/btrfs/ioctl.c linux-3.10.27-vs2.3.6.8/fs/btrfs/ioctl.c
---- linux-3.10.27/fs/btrfs/ioctl.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/btrfs/ioctl.c 2013-12-23 17:42:39.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/btrfs/ioctl.c linux-3.10.33-vs2.3.6.8/fs/btrfs/ioctl.c
+--- linux-3.10.33/fs/btrfs/ioctl.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/btrfs/ioctl.c 2014-03-12 13:18:23.000000000 +0000
@@ -75,10 +75,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
@@ -1864,9 +1864,9 @@ diff -NurpP --minimal linux-3.10.27/fs/btrfs/ioctl.c linux-3.10.27-vs2.3.6.8/fs/
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-3.10.27/fs/btrfs/super.c linux-3.10.27-vs2.3.6.8/fs/btrfs/super.c
---- linux-3.10.27/fs/btrfs/super.c 2013-07-14 17:01:26.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/btrfs/super.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/btrfs/super.c linux-3.10.33-vs2.3.6.8/fs/btrfs/super.c
+--- linux-3.10.33/fs/btrfs/super.c 2013-07-14 17:01:26.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/btrfs/super.c 2013-08-22 20:29:59.000000000 +0000
@@ -319,7 +319,7 @@ enum {
Opt_no_space_cache, Opt_recovery, Opt_skip_balance,
Opt_check_integrity, Opt_check_integrity_including_extent_data,
@@ -1922,9 +1922,9 @@ diff -NurpP --minimal linux-3.10.27/fs/btrfs/super.c linux-3.10.27-vs2.3.6.8/fs/
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
goto out;
-diff -NurpP --minimal linux-3.10.27/fs/char_dev.c linux-3.10.27-vs2.3.6.8/fs/char_dev.c
---- linux-3.10.27/fs/char_dev.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/char_dev.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/char_dev.c linux-3.10.33-vs2.3.6.8/fs/char_dev.c
+--- linux-3.10.33/fs/char_dev.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/char_dev.c 2013-08-22 20:29:59.000000000 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
@@ -1957,9 +1957,9 @@ diff -NurpP --minimal linux-3.10.27/fs/char_dev.c linux-3.10.27-vs2.3.6.8/fs/cha
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.10.27/fs/dcache.c linux-3.10.27-vs2.3.6.8/fs/dcache.c
---- linux-3.10.27/fs/dcache.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/dcache.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/dcache.c linux-3.10.33-vs2.3.6.8/fs/dcache.c
+--- linux-3.10.33/fs/dcache.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/dcache.c 2014-03-12 13:18:23.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rculist_bl.h>
#include <linux/prefetch.h>
@@ -2011,9 +2011,9 @@ diff -NurpP --minimal linux-3.10.27/fs/dcache.c linux-3.10.27-vs2.3.6.8/fs/dcach
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-3.10.27/fs/devpts/inode.c linux-3.10.27-vs2.3.6.8/fs/devpts/inode.c
---- linux-3.10.27/fs/devpts/inode.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/devpts/inode.c 2013-12-23 17:42:40.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/devpts/inode.c linux-3.10.33-vs2.3.6.8/fs/devpts/inode.c
+--- linux-3.10.33/fs/devpts/inode.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/devpts/inode.c 2013-12-23 17:42:40.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
@@ -2101,9 +2101,9 @@ diff -NurpP --minimal linux-3.10.27/fs/devpts/inode.c linux-3.10.27-vs2.3.6.8/fs
inode->i_private = priv;
sprintf(s, "%d", index);
-diff -NurpP --minimal linux-3.10.27/fs/ext2/balloc.c linux-3.10.27-vs2.3.6.8/fs/ext2/balloc.c
---- linux-3.10.27/fs/ext2/balloc.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext2/balloc.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext2/balloc.c linux-3.10.33-vs2.3.6.8/fs/ext2/balloc.c
+--- linux-3.10.33/fs/ext2/balloc.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext2/balloc.c 2013-08-22 20:29:59.000000000 +0000
@@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
@@ -2112,9 +2112,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext2/balloc.c linux-3.10.27-vs2.3.6.8/fs/
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-3.10.27/fs/ext2/ext2.h linux-3.10.27-vs2.3.6.8/fs/ext2/ext2.h
---- linux-3.10.27/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext2/ext2.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext2/ext2.h linux-3.10.33-vs2.3.6.8/fs/ext2/ext2.h
+--- linux-3.10.33/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext2/ext2.h 2013-08-22 20:29:59.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) */
@@ -2162,18 +2162,18 @@ diff -NurpP --minimal linux-3.10.27/fs/ext2/ext2.h linux-3.10.27-vs2.3.6.8/fs/ex
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.10.27/fs/ext2/file.c linux-3.10.27-vs2.3.6.8/fs/ext2/file.c
---- linux-3.10.27/fs/ext2/file.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext2/file.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext2/file.c linux-3.10.33-vs2.3.6.8/fs/ext2/file.c
+--- linux-3.10.33/fs/ext2/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext2/file.c 2013-08-22 20:29:59.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.10.27/fs/ext2/ialloc.c linux-3.10.27-vs2.3.6.8/fs/ext2/ialloc.c
---- linux-3.10.27/fs/ext2/ialloc.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext2/ialloc.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext2/ialloc.c linux-3.10.33-vs2.3.6.8/fs/ext2/ialloc.c
+--- linux-3.10.33/fs/ext2/ialloc.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext2/ialloc.c 2013-08-22 20:29:59.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
@@ -2190,9 +2190,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext2/ialloc.c linux-3.10.27-vs2.3.6.8/fs/
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.10.27/fs/ext2/inode.c linux-3.10.27-vs2.3.6.8/fs/ext2/inode.c
---- linux-3.10.27/fs/ext2/inode.c 2013-07-14 17:01:27.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext2/inode.c 2013-08-22 21:46:54.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext2/inode.c linux-3.10.33-vs2.3.6.8/fs/ext2/inode.c
+--- linux-3.10.33/fs/ext2/inode.c 2013-07-14 17:01:27.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext2/inode.c 2013-08-22 21:46:54.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/fiemap.h>
#include <linux/namei.h>
@@ -2325,9 +2325,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext2/inode.c linux-3.10.27-vs2.3.6.8/fs/e
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-3.10.27/fs/ext2/ioctl.c linux-3.10.27-vs2.3.6.8/fs/ext2/ioctl.c
---- linux-3.10.27/fs/ext2/ioctl.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext2/ioctl.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext2/ioctl.c linux-3.10.33-vs2.3.6.8/fs/ext2/ioctl.c
+--- linux-3.10.33/fs/ext2/ioctl.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext2/ioctl.c 2013-08-22 20:29:59.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
@@ -2377,9 +2377,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext2/ioctl.c linux-3.10.27-vs2.3.6.8/fs/e
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.10.27/fs/ext2/namei.c linux-3.10.27-vs2.3.6.8/fs/ext2/namei.c
---- linux-3.10.27/fs/ext2/namei.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext2/namei.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext2/namei.c linux-3.10.33-vs2.3.6.8/fs/ext2/namei.c
+--- linux-3.10.33/fs/ext2/namei.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext2/namei.c 2013-08-22 20:29:59.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
@@ -2404,9 +2404,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext2/namei.c linux-3.10.27-vs2.3.6.8/fs/e
.get_acl = ext2_get_acl,
};
-diff -NurpP --minimal linux-3.10.27/fs/ext2/super.c linux-3.10.27-vs2.3.6.8/fs/ext2/super.c
---- linux-3.10.27/fs/ext2/super.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext2/super.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext2/super.c linux-3.10.33-vs2.3.6.8/fs/ext2/super.c
+--- linux-3.10.33/fs/ext2/super.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext2/super.c 2013-08-22 20:29:59.000000000 +0000
@@ -395,7 +395,8 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
@@ -2472,9 +2472,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext2/super.c linux-3.10.27-vs2.3.6.8/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.10.27/fs/ext3/ext3.h linux-3.10.27-vs2.3.6.8/fs/ext3/ext3.h
---- linux-3.10.27/fs/ext3/ext3.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext3/ext3.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext3/ext3.h linux-3.10.33-vs2.3.6.8/fs/ext3/ext3.h
+--- linux-3.10.33/fs/ext3/ext3.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext3/ext3.h 2013-08-22 20:29:59.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) */
@@ -2526,9 +2526,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext3/ext3.h linux-3.10.27-vs2.3.6.8/fs/ex
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.10.27/fs/ext3/file.c linux-3.10.27-vs2.3.6.8/fs/ext3/file.c
---- linux-3.10.27/fs/ext3/file.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext3/file.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext3/file.c linux-3.10.33-vs2.3.6.8/fs/ext3/file.c
+--- linux-3.10.33/fs/ext3/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext3/file.c 2013-08-22 20:29:59.000000000 +0000
@@ -76,5 +76,6 @@ const struct inode_operations ext3_file_
#endif
.get_acl = ext3_get_acl,
@@ -2536,9 +2536,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext3/file.c linux-3.10.27-vs2.3.6.8/fs/ex
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-3.10.27/fs/ext3/ialloc.c linux-3.10.27-vs2.3.6.8/fs/ext3/ialloc.c
---- linux-3.10.27/fs/ext3/ialloc.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext3/ialloc.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext3/ialloc.c linux-3.10.33-vs2.3.6.8/fs/ext3/ialloc.c
+--- linux-3.10.33/fs/ext3/ialloc.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext3/ialloc.c 2013-08-22 20:29:59.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/quotaops.h>
@@ -2555,9 +2555,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext3/ialloc.c linux-3.10.27-vs2.3.6.8/fs/
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.10.27/fs/ext3/inode.c linux-3.10.27-vs2.3.6.8/fs/ext3/inode.c
---- linux-3.10.27/fs/ext3/inode.c 2013-07-14 17:01:27.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext3/inode.c 2013-08-22 21:21:18.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext3/inode.c linux-3.10.33-vs2.3.6.8/fs/ext3/inode.c
+--- linux-3.10.33/fs/ext3/inode.c 2013-07-14 17:01:27.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext3/inode.c 2013-08-22 21:21:18.000000000 +0000
@@ -28,6 +28,8 @@
#include <linux/mpage.h>
#include <linux/namei.h>
@@ -2690,9 +2690,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext3/inode.c linux-3.10.27-vs2.3.6.8/fs/e
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.10.27/fs/ext3/ioctl.c linux-3.10.27-vs2.3.6.8/fs/ext3/ioctl.c
---- linux-3.10.27/fs/ext3/ioctl.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext3/ioctl.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext3/ioctl.c linux-3.10.33-vs2.3.6.8/fs/ext3/ioctl.c
+--- linux-3.10.33/fs/ext3/ioctl.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext3/ioctl.c 2013-08-22 20:29:59.000000000 +0000
@@ -12,6 +12,34 @@
#include <asm/uaccess.h>
#include "ext3.h"
@@ -2760,9 +2760,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext3/ioctl.c linux-3.10.27-vs2.3.6.8/fs/e
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.10.27/fs/ext3/namei.c linux-3.10.27-vs2.3.6.8/fs/ext3/namei.c
---- linux-3.10.27/fs/ext3/namei.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext3/namei.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext3/namei.c linux-3.10.33-vs2.3.6.8/fs/ext3/namei.c
+--- linux-3.10.33/fs/ext3/namei.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext3/namei.c 2013-11-13 17:17:16.000000000 +0000
@@ -25,6 +25,8 @@
*/
@@ -2788,9 +2788,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext3/namei.c linux-3.10.27-vs2.3.6.8/fs/e
.get_acl = ext3_get_acl,
};
-diff -NurpP --minimal linux-3.10.27/fs/ext3/super.c linux-3.10.27-vs2.3.6.8/fs/ext3/super.c
---- linux-3.10.27/fs/ext3/super.c 2013-07-14 17:01:27.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext3/super.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext3/super.c linux-3.10.33-vs2.3.6.8/fs/ext3/super.c
+--- linux-3.10.33/fs/ext3/super.c 2013-07-14 17:01:27.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext3/super.c 2013-08-22 20:29:59.000000000 +0000
@@ -813,7 +813,8 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
@@ -2857,9 +2857,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext3/super.c linux-3.10.27-vs2.3.6.8/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.10.27/fs/ext4/ext4.h linux-3.10.27-vs2.3.6.8/fs/ext4/ext4.h
---- linux-3.10.27/fs/ext4/ext4.h 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext4/ext4.h 2014-01-22 19:00:34.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext4/ext4.h linux-3.10.33-vs2.3.6.8/fs/ext4/ext4.h
+--- linux-3.10.33/fs/ext4/ext4.h 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext4/ext4.h 2014-03-12 13:18:32.000000000 +0000
@@ -397,7 +397,10 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
@@ -2880,7 +2880,7 @@ diff -NurpP --minimal linux-3.10.27/fs/ext4/ext4.h linux-3.10.27-vs2.3.6.8/fs/ex
} linux2;
struct {
__le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */
-@@ -791,6 +794,7 @@ do { \
+@@ -793,6 +796,7 @@ do { \
#define i_gid_low i_gid
#define i_uid_high osd2.linux2.l_i_uid_high
#define i_gid_high osd2.linux2.l_i_gid_high
@@ -2888,7 +2888,7 @@ diff -NurpP --minimal linux-3.10.27/fs/ext4/ext4.h linux-3.10.27-vs2.3.6.8/fs/ex
#define i_checksum_lo osd2.linux2.l_i_checksum_lo
#elif defined(__GNU__)
-@@ -968,6 +972,7 @@ struct ext4_inode_info {
+@@ -970,6 +974,7 @@ struct ext4_inode_info {
#define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */
#define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */
#define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */
@@ -2896,7 +2896,7 @@ diff -NurpP --minimal linux-3.10.27/fs/ext4/ext4.h linux-3.10.27-vs2.3.6.8/fs/ex
#define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */
#define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
#define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
-@@ -2548,6 +2553,7 @@ extern struct buffer_head *ext4_get_firs
+@@ -2550,6 +2555,7 @@ extern struct buffer_head *ext4_get_firs
extern int ext4_inline_data_fiemap(struct inode *inode,
struct fiemap_extent_info *fieinfo,
int *has_inline);
@@ -2904,9 +2904,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext4/ext4.h linux-3.10.27-vs2.3.6.8/fs/ex
extern int ext4_try_to_evict_inline_data(handle_t *handle,
struct inode *inode,
int needed);
-diff -NurpP --minimal linux-3.10.27/fs/ext4/file.c linux-3.10.27-vs2.3.6.8/fs/ext4/file.c
---- linux-3.10.27/fs/ext4/file.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext4/file.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext4/file.c linux-3.10.33-vs2.3.6.8/fs/ext4/file.c
+--- linux-3.10.33/fs/ext4/file.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext4/file.c 2013-11-13 17:17:16.000000000 +0000
@@ -651,5 +651,6 @@ const struct inode_operations ext4_file_
.removexattr = generic_removexattr,
.get_acl = ext4_get_acl,
@@ -2914,9 +2914,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext4/file.c linux-3.10.27-vs2.3.6.8/fs/ex
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-3.10.27/fs/ext4/ialloc.c linux-3.10.27-vs2.3.6.8/fs/ext4/ialloc.c
---- linux-3.10.27/fs/ext4/ialloc.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext4/ialloc.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext4/ialloc.c linux-3.10.33-vs2.3.6.8/fs/ext4/ialloc.c
+--- linux-3.10.33/fs/ext4/ialloc.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext4/ialloc.c 2013-11-13 17:17:16.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -2933,9 +2933,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext4/ialloc.c linux-3.10.27-vs2.3.6.8/fs/
} else
inode_init_owner(inode, dir, mode);
dquot_initialize(inode);
-diff -NurpP --minimal linux-3.10.27/fs/ext4/inode.c linux-3.10.27-vs2.3.6.8/fs/ext4/inode.c
---- linux-3.10.27/fs/ext4/inode.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext4/inode.c 2014-01-22 19:00:34.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext4/inode.c linux-3.10.33-vs2.3.6.8/fs/ext4/inode.c
+--- linux-3.10.33/fs/ext4/inode.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext4/inode.c 2014-03-12 13:18:32.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/slab.h>
#include <linux/ratelimit.h>
@@ -3071,9 +3071,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext4/inode.c linux-3.10.27-vs2.3.6.8/fs/e
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.10.27/fs/ext4/ioctl.c linux-3.10.27-vs2.3.6.8/fs/ext4/ioctl.c
---- linux-3.10.27/fs/ext4/ioctl.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext4/ioctl.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext4/ioctl.c linux-3.10.33-vs2.3.6.8/fs/ext4/ioctl.c
+--- linux-3.10.33/fs/ext4/ioctl.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext4/ioctl.c 2014-03-12 13:18:32.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/compat.h>
#include <linux/mount.h>
@@ -3082,7 +3082,7 @@ diff -NurpP --minimal linux-3.10.27/fs/ext4/ioctl.c linux-3.10.27-vs2.3.6.8/fs/e
#include <asm/uaccess.h>
#include "ext4_jbd2.h"
#include "ext4.h"
-@@ -214,6 +215,33 @@ swap_boot_out:
+@@ -215,6 +216,33 @@ swap_boot_out:
return err;
}
@@ -3116,7 +3116,7 @@ diff -NurpP --minimal linux-3.10.27/fs/ext4/ioctl.c linux-3.10.27-vs2.3.6.8/fs/e
long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = file_inode(filp);
-@@ -247,6 +275,11 @@ long ext4_ioctl(struct file *filp, unsig
+@@ -248,6 +276,11 @@ long ext4_ioctl(struct file *filp, unsig
flags = ext4_mask_flags(inode->i_mode, flags);
@@ -3128,7 +3128,7 @@ diff -NurpP --minimal linux-3.10.27/fs/ext4/ioctl.c linux-3.10.27-vs2.3.6.8/fs/e
err = -EPERM;
mutex_lock(&inode->i_mutex);
/* Is it quota file? Do not allow user to mess with it */
-@@ -264,7 +297,9 @@ long ext4_ioctl(struct file *filp, unsig
+@@ -265,7 +298,9 @@ long ext4_ioctl(struct file *filp, unsig
*
* This test looks nicer. Thanks to Pauline Middelink
*/
@@ -3139,9 +3139,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext4/ioctl.c linux-3.10.27-vs2.3.6.8/fs/e
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-3.10.27/fs/ext4/namei.c linux-3.10.27-vs2.3.6.8/fs/ext4/namei.c
---- linux-3.10.27/fs/ext4/namei.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext4/namei.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext4/namei.c linux-3.10.33-vs2.3.6.8/fs/ext4/namei.c
+--- linux-3.10.33/fs/ext4/namei.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext4/namei.c 2013-11-13 17:17:16.000000000 +0000
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3166,9 +3166,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext4/namei.c linux-3.10.27-vs2.3.6.8/fs/e
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.10.27/fs/ext4/super.c linux-3.10.27-vs2.3.6.8/fs/ext4/super.c
---- linux-3.10.27/fs/ext4/super.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ext4/super.c 2014-01-22 19:00:34.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ext4/super.c linux-3.10.33-vs2.3.6.8/fs/ext4/super.c
+--- linux-3.10.33/fs/ext4/super.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ext4/super.c 2014-03-12 13:18:32.000000000 +0000
@@ -1129,7 +1129,7 @@ enum {
Opt_inode_readahead_blks, Opt_journal_ioprio,
Opt_dioread_nolock, Opt_dioread_lock,
@@ -3219,7 +3219,7 @@ diff -NurpP --minimal linux-3.10.27/fs/ext4/super.c linux-3.10.27-vs2.3.6.8/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -4673,6 +4693,14 @@ static int ext4_remount(struct super_blo
+@@ -4679,6 +4699,14 @@ static int ext4_remount(struct super_blo
if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
ext4_abort(sb, "Abort forced by user");
@@ -3234,9 +3234,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ext4/super.c linux-3.10.27-vs2.3.6.8/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.10.27/fs/fcntl.c linux-3.10.27-vs2.3.6.8/fs/fcntl.c
---- linux-3.10.27/fs/fcntl.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/fcntl.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/fcntl.c linux-3.10.33-vs2.3.6.8/fs/fcntl.c
+--- linux-3.10.33/fs/fcntl.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/fcntl.c 2013-08-22 20:29:59.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/rcupdate.h>
#include <linux/pid_namespace.h>
@@ -3254,9 +3254,9 @@ diff -NurpP --minimal linux-3.10.27/fs/fcntl.c linux-3.10.27-vs2.3.6.8/fs/fcntl.
if (unlikely(f.file->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
-diff -NurpP --minimal linux-3.10.27/fs/file.c linux-3.10.27-vs2.3.6.8/fs/file.c
---- linux-3.10.27/fs/file.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/file.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/file.c linux-3.10.33-vs2.3.6.8/fs/file.c
+--- linux-3.10.33/fs/file.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/file.c 2014-03-12 13:18:23.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -3311,9 +3311,9 @@ diff -NurpP --minimal linux-3.10.27/fs/file.c linux-3.10.27-vs2.3.6.8/fs/file.c
return fd;
-diff -NurpP --minimal linux-3.10.27/fs/file_table.c linux-3.10.27-vs2.3.6.8/fs/file_table.c
---- linux-3.10.27/fs/file_table.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/file_table.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/file_table.c linux-3.10.33-vs2.3.6.8/fs/file_table.c
+--- linux-3.10.33/fs/file_table.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/file_table.c 2013-08-22 20:29:59.000000000 +0000
@@ -26,6 +26,8 @@
#include <linux/hardirq.h>
#include <linux/task_work.h>
@@ -3350,9 +3350,9 @@ diff -NurpP --minimal linux-3.10.27/fs/file_table.c linux-3.10.27-vs2.3.6.8/fs/f
file_sb_list_del(file);
file_free(file);
}
-diff -NurpP --minimal linux-3.10.27/fs/fs_struct.c linux-3.10.27-vs2.3.6.8/fs/fs_struct.c
---- linux-3.10.27/fs/fs_struct.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/fs_struct.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/fs_struct.c linux-3.10.33-vs2.3.6.8/fs/fs_struct.c
+--- linux-3.10.33/fs/fs_struct.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/fs_struct.c 2013-08-22 20:29:59.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -3377,9 +3377,9 @@ diff -NurpP --minimal linux-3.10.27/fs/fs_struct.c linux-3.10.27-vs2.3.6.8/fs/fs
}
return fs;
}
-diff -NurpP --minimal linux-3.10.27/fs/gfs2/file.c linux-3.10.27-vs2.3.6.8/fs/gfs2/file.c
---- linux-3.10.27/fs/gfs2/file.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/gfs2/file.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/gfs2/file.c linux-3.10.33-vs2.3.6.8/fs/gfs2/file.c
+--- linux-3.10.33/fs/gfs2/file.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/gfs2/file.c 2013-08-22 20:29:59.000000000 +0000
@@ -144,6 +144,9 @@ static const u32 fsflags_to_gfs2[32] = {
[12] = GFS2_DIF_EXHASH,
[14] = GFS2_DIF_INHERIT_JDATA,
@@ -3502,9 +3502,9 @@ diff -NurpP --minimal linux-3.10.27/fs/gfs2/file.c linux-3.10.27-vs2.3.6.8/fs/gf
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-3.10.27/fs/gfs2/inode.h linux-3.10.27-vs2.3.6.8/fs/gfs2/inode.h
---- linux-3.10.27/fs/gfs2/inode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/gfs2/inode.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/gfs2/inode.h linux-3.10.33-vs2.3.6.8/fs/gfs2/inode.h
+--- linux-3.10.33/fs/gfs2/inode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/gfs2/inode.h 2013-08-22 20:29:59.000000000 +0000
@@ -117,6 +117,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
@@ -3513,9 +3513,9 @@ diff -NurpP --minimal linux-3.10.27/fs/gfs2/inode.h linux-3.10.27-vs2.3.6.8/fs/g
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-3.10.27/fs/hostfs/hostfs.h linux-3.10.27-vs2.3.6.8/fs/hostfs/hostfs.h
---- linux-3.10.27/fs/hostfs/hostfs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/hostfs/hostfs.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/hostfs/hostfs.h linux-3.10.33-vs2.3.6.8/fs/hostfs/hostfs.h
+--- linux-3.10.33/fs/hostfs/hostfs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/hostfs/hostfs.h 2013-08-22 20:29:59.000000000 +0000
@@ -42,6 +42,7 @@ struct hostfs_iattr {
unsigned short ia_mode;
uid_t ia_uid;
@@ -3524,9 +3524,9 @@ diff -NurpP --minimal linux-3.10.27/fs/hostfs/hostfs.h linux-3.10.27-vs2.3.6.8/f
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-diff -NurpP --minimal linux-3.10.27/fs/inode.c linux-3.10.27-vs2.3.6.8/fs/inode.c
---- linux-3.10.27/fs/inode.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/inode.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/inode.c linux-3.10.33-vs2.3.6.8/fs/inode.c
+--- linux-3.10.33/fs/inode.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/inode.c 2013-08-22 20:29:59.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/prefetch.h>
#include <linux/buffer_head.h> /* for inode_has_buffers */
@@ -3589,9 +3589,9 @@ diff -NurpP --minimal linux-3.10.27/fs/inode.c linux-3.10.27-vs2.3.6.8/fs/inode.
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-3.10.27/fs/ioctl.c linux-3.10.27-vs2.3.6.8/fs/ioctl.c
---- linux-3.10.27/fs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ioctl.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ioctl.c linux-3.10.33-vs2.3.6.8/fs/ioctl.c
+--- linux-3.10.33/fs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ioctl.c 2013-08-22 20:29:59.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -3602,9 +3602,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ioctl.c linux-3.10.27-vs2.3.6.8/fs/ioctl.
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-3.10.27/fs/ioprio.c linux-3.10.27-vs2.3.6.8/fs/ioprio.c
---- linux-3.10.27/fs/ioprio.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ioprio.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ioprio.c linux-3.10.33-vs2.3.6.8/fs/ioprio.c
+--- linux-3.10.33/fs/ioprio.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ioprio.c 2013-08-22 20:29:59.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
@@ -3631,9 +3631,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ioprio.c linux-3.10.27-vs2.3.6.8/fs/iopri
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-3.10.27/fs/jfs/file.c linux-3.10.27-vs2.3.6.8/fs/jfs/file.c
---- linux-3.10.27/fs/jfs/file.c 2013-02-19 13:58:48.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/jfs/file.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/jfs/file.c linux-3.10.33-vs2.3.6.8/fs/jfs/file.c
+--- linux-3.10.33/fs/jfs/file.c 2013-02-19 13:58:48.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/jfs/file.c 2013-08-22 20:29:59.000000000 +0000
@@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
@@ -3652,9 +3652,9 @@ diff -NurpP --minimal linux-3.10.27/fs/jfs/file.c linux-3.10.27-vs2.3.6.8/fs/jfs
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.10.27/fs/jfs/ioctl.c linux-3.10.27-vs2.3.6.8/fs/jfs/ioctl.c
---- linux-3.10.27/fs/jfs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/jfs/ioctl.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/jfs/ioctl.c linux-3.10.33-vs2.3.6.8/fs/jfs/ioctl.c
+--- linux-3.10.33/fs/jfs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/jfs/ioctl.c 2013-08-22 20:29:59.000000000 +0000
@@ -12,6 +12,7 @@
#include <linux/time.h>
#include <linux/sched.h>
@@ -3712,9 +3712,9 @@ diff -NurpP --minimal linux-3.10.27/fs/jfs/ioctl.c linux-3.10.27-vs2.3.6.8/fs/jf
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-3.10.27/fs/jfs/jfs_dinode.h linux-3.10.27-vs2.3.6.8/fs/jfs/jfs_dinode.h
---- linux-3.10.27/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/jfs/jfs_dinode.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/jfs/jfs_dinode.h linux-3.10.33-vs2.3.6.8/fs/jfs/jfs_dinode.h
+--- linux-3.10.33/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/jfs/jfs_dinode.h 2013-08-22 20:29:59.000000000 +0000
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
@@ -3731,9 +3731,9 @@ diff -NurpP --minimal linux-3.10.27/fs/jfs/jfs_dinode.h linux-3.10.27-vs2.3.6.8/
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-3.10.27/fs/jfs/jfs_filsys.h linux-3.10.27-vs2.3.6.8/fs/jfs/jfs_filsys.h
---- linux-3.10.27/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/jfs/jfs_filsys.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/jfs/jfs_filsys.h linux-3.10.33-vs2.3.6.8/fs/jfs/jfs_filsys.h
+--- linux-3.10.33/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/jfs/jfs_filsys.h 2013-08-22 20:29:59.000000000 +0000
@@ -266,6 +266,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
@@ -3742,9 +3742,9 @@ diff -NurpP --minimal linux-3.10.27/fs/jfs/jfs_filsys.h linux-3.10.27-vs2.3.6.8/
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-3.10.27/fs/jfs/jfs_imap.c linux-3.10.27-vs2.3.6.8/fs/jfs/jfs_imap.c
---- linux-3.10.27/fs/jfs/jfs_imap.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/jfs/jfs_imap.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/jfs/jfs_imap.c linux-3.10.33-vs2.3.6.8/fs/jfs/jfs_imap.c
+--- linux-3.10.33/fs/jfs/jfs_imap.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/jfs/jfs_imap.c 2013-08-22 20:29:59.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
@@ -3808,9 +3808,9 @@ diff -NurpP --minimal linux-3.10.27/fs/jfs/jfs_imap.c linux-3.10.27-vs2.3.6.8/fs
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-3.10.27/fs/jfs/jfs_inode.c linux-3.10.27-vs2.3.6.8/fs/jfs/jfs_inode.c
---- linux-3.10.27/fs/jfs/jfs_inode.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/jfs/jfs_inode.c 2013-11-13 17:22:25.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/jfs/jfs_inode.c linux-3.10.33-vs2.3.6.8/fs/jfs/jfs_inode.c
+--- linux-3.10.33/fs/jfs/jfs_inode.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/jfs/jfs_inode.c 2013-11-13 17:22:25.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -3884,9 +3884,9 @@ diff -NurpP --minimal linux-3.10.27/fs/jfs/jfs_inode.c linux-3.10.27-vs2.3.6.8/f
}
/*
-diff -NurpP --minimal linux-3.10.27/fs/jfs/jfs_inode.h linux-3.10.27-vs2.3.6.8/fs/jfs/jfs_inode.h
---- linux-3.10.27/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/jfs/jfs_inode.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/jfs/jfs_inode.h linux-3.10.33-vs2.3.6.8/fs/jfs/jfs_inode.h
+--- linux-3.10.33/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/jfs/jfs_inode.h 2013-08-22 20:29:59.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);
@@ -3895,9 +3895,9 @@ diff -NurpP --minimal linux-3.10.27/fs/jfs/jfs_inode.h linux-3.10.27-vs2.3.6.8/f
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.10.27/fs/jfs/namei.c linux-3.10.27-vs2.3.6.8/fs/jfs/namei.c
---- linux-3.10.27/fs/jfs/namei.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/jfs/namei.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/jfs/namei.c linux-3.10.33-vs2.3.6.8/fs/jfs/namei.c
+--- linux-3.10.33/fs/jfs/namei.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/jfs/namei.c 2013-08-22 20:29:59.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
@@ -3922,9 +3922,9 @@ diff -NurpP --minimal linux-3.10.27/fs/jfs/namei.c linux-3.10.27-vs2.3.6.8/fs/jf
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.10.27/fs/jfs/super.c linux-3.10.27-vs2.3.6.8/fs/jfs/super.c
---- linux-3.10.27/fs/jfs/super.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/jfs/super.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/jfs/super.c linux-3.10.33-vs2.3.6.8/fs/jfs/super.c
+--- linux-3.10.33/fs/jfs/super.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/jfs/super.c 2013-08-22 20:29:59.000000000 +0000
@@ -199,7 +199,8 @@ enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota,
@@ -3991,9 +3991,9 @@ diff -NurpP --minimal linux-3.10.27/fs/jfs/super.c linux-3.10.27-vs2.3.6.8/fs/jf
if (newLVSize) {
pr_err("resize option for remount only\n");
-diff -NurpP --minimal linux-3.10.27/fs/libfs.c linux-3.10.27-vs2.3.6.8/fs/libfs.c
---- linux-3.10.27/fs/libfs.c 2013-02-19 13:58:48.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/libfs.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/libfs.c linux-3.10.33-vs2.3.6.8/fs/libfs.c
+--- linux-3.10.33/fs/libfs.c 2013-02-19 13:58:48.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/libfs.c 2013-08-22 20:29:59.000000000 +0000
@@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
@@ -4039,9 +4039,9 @@ diff -NurpP --minimal linux-3.10.27/fs/libfs.c linux-3.10.27-vs2.3.6.8/fs/libfs.
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(mount_pseudo);
EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-3.10.27/fs/locks.c linux-3.10.27-vs2.3.6.8/fs/locks.c
---- linux-3.10.27/fs/locks.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/locks.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/locks.c linux-3.10.33-vs2.3.6.8/fs/locks.c
+--- linux-3.10.33/fs/locks.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/locks.c 2013-08-22 20:29:59.000000000 +0000
@@ -126,6 +126,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
@@ -4239,9 +4239,9 @@ diff -NurpP --minimal linux-3.10.27/fs/locks.c linux-3.10.27-vs2.3.6.8/fs/locks.
return 0;
}
-diff -NurpP --minimal linux-3.10.27/fs/mount.h linux-3.10.27-vs2.3.6.8/fs/mount.h
---- linux-3.10.27/fs/mount.h 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/mount.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/mount.h linux-3.10.33-vs2.3.6.8/fs/mount.h
+--- linux-3.10.33/fs/mount.h 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/mount.h 2014-03-12 13:18:23.000000000 +0000
@@ -56,6 +56,7 @@ struct mount {
int mnt_expiry_mark; /* true if marked for expiry */
int mnt_pinned;
@@ -4250,9 +4250,9 @@ diff -NurpP --minimal linux-3.10.27/fs/mount.h linux-3.10.27-vs2.3.6.8/fs/mount.
};
#define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
-diff -NurpP --minimal linux-3.10.27/fs/namei.c linux-3.10.27-vs2.3.6.8/fs/namei.c
---- linux-3.10.27/fs/namei.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/namei.c 2013-12-23 17:42:40.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/namei.c linux-3.10.33-vs2.3.6.8/fs/namei.c
+--- linux-3.10.33/fs/namei.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/namei.c 2013-12-23 17:42:40.000000000 +0000
@@ -34,9 +34,19 @@
#include <linux/device_cgroup.h>
#include <linux/fs_struct.h>
@@ -4817,9 +4817,9 @@ diff -NurpP --minimal linux-3.10.27/fs/namei.c linux-3.10.27-vs2.3.6.8/fs/namei.
EXPORT_SYMBOL(dentry_unhash);
EXPORT_SYMBOL(generic_readlink);
+EXPORT_SYMBOL(vx_info_mnt_namespace);
-diff -NurpP --minimal linux-3.10.27/fs/namespace.c linux-3.10.27-vs2.3.6.8/fs/namespace.c
---- linux-3.10.27/fs/namespace.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/namespace.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/namespace.c linux-3.10.33-vs2.3.6.8/fs/namespace.c
+--- linux-3.10.33/fs/namespace.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/namespace.c 2013-11-13 17:17:16.000000000 +0000
@@ -23,6 +23,11 @@
#include <linux/uaccess.h>
#include <linux/proc_ns.h>
@@ -4964,9 +4964,9 @@ diff -NurpP --minimal linux-3.10.27/fs/namespace.c linux-3.10.27-vs2.3.6.8/fs/na
free_mnt_ns(ns);
}
-diff -NurpP --minimal linux-3.10.27/fs/nfs/client.c linux-3.10.27-vs2.3.6.8/fs/nfs/client.c
---- linux-3.10.27/fs/nfs/client.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/nfs/client.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/nfs/client.c linux-3.10.33-vs2.3.6.8/fs/nfs/client.c
+--- linux-3.10.33/fs/nfs/client.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/nfs/client.c 2013-08-22 20:29:59.000000000 +0000
@@ -684,6 +684,9 @@ int nfs_init_server_rpcclient(struct nfs
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
@@ -4988,9 +4988,9 @@ diff -NurpP --minimal linux-3.10.27/fs/nfs/client.c linux-3.10.27-vs2.3.6.8/fs/n
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.10.27/fs/nfs/dir.c linux-3.10.27-vs2.3.6.8/fs/nfs/dir.c
---- linux-3.10.27/fs/nfs/dir.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/nfs/dir.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/nfs/dir.c linux-3.10.33-vs2.3.6.8/fs/nfs/dir.c
+--- linux-3.10.33/fs/nfs/dir.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/nfs/dir.c 2013-08-22 20:29:59.000000000 +0000
@@ -36,6 +36,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
@@ -5007,9 +5007,9 @@ diff -NurpP --minimal linux-3.10.27/fs/nfs/dir.c linux-3.10.27-vs2.3.6.8/fs/nfs/
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-3.10.27/fs/nfs/inode.c linux-3.10.27-vs2.3.6.8/fs/nfs/inode.c
---- linux-3.10.27/fs/nfs/inode.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/nfs/inode.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/nfs/inode.c linux-3.10.33-vs2.3.6.8/fs/nfs/inode.c
+--- linux-3.10.33/fs/nfs/inode.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/nfs/inode.c 2013-08-22 20:29:59.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/compat.h>
#include <linux/freezer.h>
@@ -5136,9 +5136,9 @@ diff -NurpP --minimal linux-3.10.27/fs/nfs/inode.c linux-3.10.27-vs2.3.6.8/fs/nf
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-3.10.27/fs/nfs/nfs3xdr.c linux-3.10.27-vs2.3.6.8/fs/nfs/nfs3xdr.c
---- linux-3.10.27/fs/nfs/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/nfs/nfs3xdr.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/nfs/nfs3xdr.c linux-3.10.33-vs2.3.6.8/fs/nfs/nfs3xdr.c
+--- linux-3.10.33/fs/nfs/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/nfs/nfs3xdr.c 2013-08-22 20:29:59.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -5284,9 +5284,9 @@ diff -NurpP --minimal linux-3.10.27/fs/nfs/nfs3xdr.c linux-3.10.27-vs2.3.6.8/fs/
}
/*
-diff -NurpP --minimal linux-3.10.27/fs/nfs/super.c linux-3.10.27-vs2.3.6.8/fs/nfs/super.c
---- linux-3.10.27/fs/nfs/super.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/nfs/super.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/nfs/super.c linux-3.10.33-vs2.3.6.8/fs/nfs/super.c
+--- linux-3.10.33/fs/nfs/super.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/nfs/super.c 2013-08-22 20:29:59.000000000 +0000
@@ -55,6 +55,7 @@
#include <linux/parser.h>
#include <linux/nsproxy.h>
@@ -5360,9 +5360,9 @@ diff -NurpP --minimal linux-3.10.27/fs/nfs/super.c linux-3.10.27-vs2.3.6.8/fs/nf
/*
* options that take text values
-diff -NurpP --minimal linux-3.10.27/fs/nfsd/auth.c linux-3.10.27-vs2.3.6.8/fs/nfsd/auth.c
---- linux-3.10.27/fs/nfsd/auth.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/nfsd/auth.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/nfsd/auth.c linux-3.10.33-vs2.3.6.8/fs/nfsd/auth.c
+--- linux-3.10.33/fs/nfsd/auth.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/nfsd/auth.c 2013-08-22 20:29:59.000000000 +0000
@@ -2,6 +2,7 @@
#include <linux/sched.h>
@@ -5381,9 +5381,9 @@ diff -NurpP --minimal linux-3.10.27/fs/nfsd/auth.c linux-3.10.27-vs2.3.6.8/fs/nf
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-3.10.27/fs/nfsd/nfs3xdr.c linux-3.10.27-vs2.3.6.8/fs/nfsd/nfs3xdr.c
---- linux-3.10.27/fs/nfsd/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/nfsd/nfs3xdr.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/nfsd/nfs3xdr.c linux-3.10.33-vs2.3.6.8/fs/nfsd/nfs3xdr.c
+--- linux-3.10.33/fs/nfsd/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/nfsd/nfs3xdr.c 2013-08-22 20:29:59.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/namei.h>
@@ -5437,9 +5437,9 @@ diff -NurpP --minimal linux-3.10.27/fs/nfsd/nfs3xdr.c linux-3.10.27-vs2.3.6.8/fs
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-3.10.27/fs/nfsd/nfs4xdr.c linux-3.10.27-vs2.3.6.8/fs/nfsd/nfs4xdr.c
---- linux-3.10.27/fs/nfsd/nfs4xdr.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/nfsd/nfs4xdr.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/nfsd/nfs4xdr.c linux-3.10.33-vs2.3.6.8/fs/nfsd/nfs4xdr.c
+--- linux-3.10.33/fs/nfsd/nfs4xdr.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/nfsd/nfs4xdr.c 2013-11-13 17:17:16.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
@@ -5469,9 +5469,9 @@ diff -NurpP --minimal linux-3.10.27/fs/nfsd/nfs4xdr.c linux-3.10.27-vs2.3.6.8/fs
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-3.10.27/fs/nfsd/nfsxdr.c linux-3.10.27-vs2.3.6.8/fs/nfsd/nfsxdr.c
---- linux-3.10.27/fs/nfsd/nfsxdr.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/nfsd/nfsxdr.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/nfsd/nfsxdr.c linux-3.10.33-vs2.3.6.8/fs/nfsd/nfsxdr.c
+--- linux-3.10.33/fs/nfsd/nfsxdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/nfsd/nfsxdr.c 2013-08-22 20:29:59.000000000 +0000
@@ -7,6 +7,7 @@
#include "vfs.h"
#include "xdr.h"
@@ -5523,9 +5523,9 @@ diff -NurpP --minimal linux-3.10.27/fs/nfsd/nfsxdr.c linux-3.10.27-vs2.3.6.8/fs/
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.10.27/fs/ocfs2/dlmglue.c linux-3.10.27-vs2.3.6.8/fs/ocfs2/dlmglue.c
---- linux-3.10.27/fs/ocfs2/dlmglue.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ocfs2/dlmglue.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ocfs2/dlmglue.c linux-3.10.33-vs2.3.6.8/fs/ocfs2/dlmglue.c
+--- linux-3.10.33/fs/ocfs2/dlmglue.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ocfs2/dlmglue.c 2013-08-22 20:29:59.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(i_uid_read(inode));
@@ -5542,9 +5542,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ocfs2/dlmglue.c linux-3.10.27-vs2.3.6.8/f
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.10.27/fs/ocfs2/dlmglue.h linux-3.10.27-vs2.3.6.8/fs/ocfs2/dlmglue.h
---- linux-3.10.27/fs/ocfs2/dlmglue.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ocfs2/dlmglue.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ocfs2/dlmglue.h linux-3.10.33-vs2.3.6.8/fs/ocfs2/dlmglue.h
+--- linux-3.10.33/fs/ocfs2/dlmglue.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ocfs2/dlmglue.h 2013-08-22 20:29:59.000000000 +0000
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
@@ -5555,9 +5555,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ocfs2/dlmglue.h linux-3.10.27-vs2.3.6.8/f
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.10.27/fs/ocfs2/file.c linux-3.10.27-vs2.3.6.8/fs/ocfs2/file.c
---- linux-3.10.27/fs/ocfs2/file.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ocfs2/file.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ocfs2/file.c linux-3.10.33-vs2.3.6.8/fs/ocfs2/file.c
+--- linux-3.10.33/fs/ocfs2/file.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ocfs2/file.c 2013-08-22 20:29:59.000000000 +0000
@@ -1124,7 +1124,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
@@ -5567,9 +5567,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ocfs2/file.c linux-3.10.27-vs2.3.6.8/fs/o
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-3.10.27/fs/ocfs2/inode.c linux-3.10.27-vs2.3.6.8/fs/ocfs2/inode.c
---- linux-3.10.27/fs/ocfs2/inode.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ocfs2/inode.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ocfs2/inode.c linux-3.10.33-vs2.3.6.8/fs/ocfs2/inode.c
+--- linux-3.10.33/fs/ocfs2/inode.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ocfs2/inode.c 2013-08-22 20:29:59.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
@@ -5666,9 +5666,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ocfs2/inode.c linux-3.10.27-vs2.3.6.8/fs/
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
-diff -NurpP --minimal linux-3.10.27/fs/ocfs2/inode.h linux-3.10.27-vs2.3.6.8/fs/ocfs2/inode.h
---- linux-3.10.27/fs/ocfs2/inode.h 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ocfs2/inode.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ocfs2/inode.h linux-3.10.33-vs2.3.6.8/fs/ocfs2/inode.h
+--- linux-3.10.33/fs/ocfs2/inode.h 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ocfs2/inode.h 2013-08-22 20:29:59.000000000 +0000
@@ -152,6 +152,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
@@ -5677,9 +5677,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ocfs2/inode.h linux-3.10.27-vs2.3.6.8/fs/
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-3.10.27/fs/ocfs2/ioctl.c linux-3.10.27-vs2.3.6.8/fs/ocfs2/ioctl.c
---- linux-3.10.27/fs/ocfs2/ioctl.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ocfs2/ioctl.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ocfs2/ioctl.c linux-3.10.33-vs2.3.6.8/fs/ocfs2/ioctl.c
+--- linux-3.10.33/fs/ocfs2/ioctl.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ocfs2/ioctl.c 2013-08-22 20:29:59.000000000 +0000
@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
@@ -5743,9 +5743,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ocfs2/ioctl.c linux-3.10.27-vs2.3.6.8/fs/
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = file_inode(filp);
-diff -NurpP --minimal linux-3.10.27/fs/ocfs2/namei.c linux-3.10.27-vs2.3.6.8/fs/ocfs2/namei.c
---- linux-3.10.27/fs/ocfs2/namei.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ocfs2/namei.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ocfs2/namei.c linux-3.10.33-vs2.3.6.8/fs/ocfs2/namei.c
+--- linux-3.10.33/fs/ocfs2/namei.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ocfs2/namei.c 2013-08-22 20:29:59.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
@@ -5778,9 +5778,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ocfs2/namei.c linux-3.10.27-vs2.3.6.8/fs/
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.10.27/fs/ocfs2/ocfs2.h linux-3.10.27-vs2.3.6.8/fs/ocfs2/ocfs2.h
---- linux-3.10.27/fs/ocfs2/ocfs2.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ocfs2/ocfs2.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ocfs2/ocfs2.h linux-3.10.33-vs2.3.6.8/fs/ocfs2/ocfs2.h
+--- linux-3.10.33/fs/ocfs2/ocfs2.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ocfs2/ocfs2.h 2013-08-22 20:29:59.000000000 +0000
@@ -272,6 +272,7 @@ enum ocfs2_mount_options
writes */
OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
@@ -5789,9 +5789,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ocfs2/ocfs2.h linux-3.10.27-vs2.3.6.8/fs/
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-3.10.27/fs/ocfs2/ocfs2_fs.h linux-3.10.27-vs2.3.6.8/fs/ocfs2/ocfs2_fs.h
---- linux-3.10.27/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ocfs2/ocfs2_fs.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ocfs2/ocfs2_fs.h linux-3.10.33-vs2.3.6.8/fs/ocfs2/ocfs2_fs.h
+--- linux-3.10.33/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ocfs2/ocfs2_fs.h 2013-08-22 20:29:59.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 */
@@ -5804,9 +5804,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ocfs2/ocfs2_fs.h linux-3.10.27-vs2.3.6.8/
#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.10.27/fs/ocfs2/super.c linux-3.10.27-vs2.3.6.8/fs/ocfs2/super.c
---- linux-3.10.27/fs/ocfs2/super.c 2013-05-31 13:45:25.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/ocfs2/super.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/ocfs2/super.c linux-3.10.33-vs2.3.6.8/fs/ocfs2/super.c
+--- linux-3.10.33/fs/ocfs2/super.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/ocfs2/super.c 2013-08-22 20:29:59.000000000 +0000
@@ -185,6 +185,7 @@ enum {
Opt_coherency_full,
Opt_resv_level,
@@ -5870,9 +5870,9 @@ diff -NurpP --minimal linux-3.10.27/fs/ocfs2/super.c linux-3.10.27-vs2.3.6.8/fs/
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.10.27/fs/open.c linux-3.10.27-vs2.3.6.8/fs/open.c
---- linux-3.10.27/fs/open.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/open.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/open.c linux-3.10.33-vs2.3.6.8/fs/open.c
+--- linux-3.10.33/fs/open.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/open.c 2013-08-22 20:29:59.000000000 +0000
@@ -31,6 +31,11 @@
#include <linux/ima.h>
#include <linux/dnotify.h>
@@ -5948,9 +5948,9 @@ diff -NurpP --minimal linux-3.10.27/fs/open.c linux-3.10.27-vs2.3.6.8/fs/open.c
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-diff -NurpP --minimal linux-3.10.27/fs/proc/array.c linux-3.10.27-vs2.3.6.8/fs/proc/array.c
---- linux-3.10.27/fs/proc/array.c 2013-05-31 13:45:25.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/proc/array.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/proc/array.c linux-3.10.33-vs2.3.6.8/fs/proc/array.c
+--- linux-3.10.33/fs/proc/array.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/proc/array.c 2013-08-22 20:29:59.000000000 +0000
@@ -82,6 +82,8 @@
#include <linux/ptrace.h>
#include <linux/tracehook.h>
@@ -6064,9 +6064,9 @@ diff -NurpP --minimal linux-3.10.27/fs/proc/array.c linux-3.10.27-vs2.3.6.8/fs/p
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.10.27/fs/proc/base.c linux-3.10.27-vs2.3.6.8/fs/proc/base.c
---- linux-3.10.27/fs/proc/base.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/proc/base.c 2013-08-22 22:18:21.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/proc/base.c linux-3.10.33-vs2.3.6.8/fs/proc/base.c
+--- linux-3.10.33/fs/proc/base.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/proc/base.c 2013-08-22 22:18:21.000000000 +0000
@@ -87,6 +87,8 @@
#include <linux/slab.h>
#include <linux/flex_array.h>
@@ -6209,9 +6209,9 @@ diff -NurpP --minimal linux-3.10.27/fs/proc/base.c linux-3.10.27-vs2.3.6.8/fs/pr
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-3.10.27/fs/proc/generic.c linux-3.10.27-vs2.3.6.8/fs/proc/generic.c
---- linux-3.10.27/fs/proc/generic.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/proc/generic.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/proc/generic.c linux-3.10.33-vs2.3.6.8/fs/proc/generic.c
+--- linux-3.10.33/fs/proc/generic.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/proc/generic.c 2013-08-22 20:29:59.000000000 +0000
@@ -23,6 +23,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
@@ -6273,9 +6273,9 @@ diff -NurpP --minimal linux-3.10.27/fs/proc/generic.c linux-3.10.27-vs2.3.6.8/fs
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-3.10.27/fs/proc/inode.c linux-3.10.27-vs2.3.6.8/fs/proc/inode.c
---- linux-3.10.27/fs/proc/inode.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/proc/inode.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/proc/inode.c linux-3.10.33-vs2.3.6.8/fs/proc/inode.c
+--- linux-3.10.33/fs/proc/inode.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/proc/inode.c 2013-08-22 20:29:59.000000000 +0000
@@ -387,6 +387,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
@@ -6285,9 +6285,9 @@ diff -NurpP --minimal linux-3.10.27/fs/proc/inode.c linux-3.10.27-vs2.3.6.8/fs/p
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-3.10.27/fs/proc/internal.h linux-3.10.27-vs2.3.6.8/fs/proc/internal.h
---- linux-3.10.27/fs/proc/internal.h 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/proc/internal.h 2013-08-22 21:52:30.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/proc/internal.h linux-3.10.33-vs2.3.6.8/fs/proc/internal.h
+--- linux-3.10.33/fs/proc/internal.h 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/proc/internal.h 2013-08-22 21:52:30.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/spinlock.h>
#include <linux/atomic.h>
@@ -6355,9 +6355,9 @@ diff -NurpP --minimal linux-3.10.27/fs/proc/internal.h linux-3.10.27-vs2.3.6.8/f
/*
* base.c
-diff -NurpP --minimal linux-3.10.27/fs/proc/loadavg.c linux-3.10.27-vs2.3.6.8/fs/proc/loadavg.c
---- linux-3.10.27/fs/proc/loadavg.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/proc/loadavg.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/proc/loadavg.c linux-3.10.33-vs2.3.6.8/fs/proc/loadavg.c
+--- linux-3.10.33/fs/proc/loadavg.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/proc/loadavg.c 2013-08-22 20:30:00.000000000 +0000
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
@@ -6387,9 +6387,9 @@ diff -NurpP --minimal linux-3.10.27/fs/proc/loadavg.c linux-3.10.27-vs2.3.6.8/fs
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-3.10.27/fs/proc/meminfo.c linux-3.10.27-vs2.3.6.8/fs/proc/meminfo.c
---- linux-3.10.27/fs/proc/meminfo.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/proc/meminfo.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/proc/meminfo.c linux-3.10.33-vs2.3.6.8/fs/proc/meminfo.c
+--- linux-3.10.33/fs/proc/meminfo.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/proc/meminfo.c 2013-08-22 20:30:00.000000000 +0000
@@ -40,7 +40,8 @@ static int meminfo_proc_show(struct seq_
allowed = ((totalram_pages - hugetlb_total_pages())
* sysctl_overcommit_ratio / 100) + total_swap_pages;
@@ -6400,9 +6400,9 @@ diff -NurpP --minimal linux-3.10.27/fs/proc/meminfo.c linux-3.10.27-vs2.3.6.8/fs
total_swapcache_pages() - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-3.10.27/fs/proc/root.c linux-3.10.27-vs2.3.6.8/fs/proc/root.c
---- linux-3.10.27/fs/proc/root.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/proc/root.c 2013-11-13 17:19:37.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/proc/root.c linux-3.10.33-vs2.3.6.8/fs/proc/root.c
+--- linux-3.10.33/fs/proc/root.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/proc/root.c 2013-11-13 17:19:37.000000000 +0000
@@ -20,9 +20,14 @@
#include <linux/mount.h>
#include <linux/pid_namespace.h>
@@ -6444,9 +6444,9 @@ diff -NurpP --minimal linux-3.10.27/fs/proc/root.c linux-3.10.27-vs2.3.6.8/fs/pr
.name = "/proc",
};
-diff -NurpP --minimal linux-3.10.27/fs/proc/self.c linux-3.10.27-vs2.3.6.8/fs/proc/self.c
---- linux-3.10.27/fs/proc/self.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/proc/self.c 2013-08-23 00:07:45.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/proc/self.c linux-3.10.33-vs2.3.6.8/fs/proc/self.c
+--- linux-3.10.33/fs/proc/self.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/proc/self.c 2013-08-23 00:07:45.000000000 +0000
@@ -2,6 +2,7 @@
#include <linux/namei.h>
#include <linux/slab.h>
@@ -6464,9 +6464,9 @@ diff -NurpP --minimal linux-3.10.27/fs/proc/self.c linux-3.10.27-vs2.3.6.8/fs/pr
if (inode) {
inode->i_ino = self_inum;
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-3.10.27/fs/proc/stat.c linux-3.10.27-vs2.3.6.8/fs/proc/stat.c
---- linux-3.10.27/fs/proc/stat.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/proc/stat.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/proc/stat.c linux-3.10.33-vs2.3.6.8/fs/proc/stat.c
+--- linux-3.10.33/fs/proc/stat.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/proc/stat.c 2013-08-22 20:30:00.000000000 +0000
@@ -9,8 +9,10 @@
#include <linux/slab.h>
#include <linux/time.h>
@@ -6515,9 +6515,9 @@ diff -NurpP --minimal linux-3.10.27/fs/proc/stat.c linux-3.10.27-vs2.3.6.8/fs/pr
/* Copy values here to work around gcc-2.95.3, gcc-2.96 */
user = kcpustat_cpu(i).cpustat[CPUTIME_USER];
nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
-diff -NurpP --minimal linux-3.10.27/fs/proc/uptime.c linux-3.10.27-vs2.3.6.8/fs/proc/uptime.c
---- linux-3.10.27/fs/proc/uptime.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/proc/uptime.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/proc/uptime.c linux-3.10.33-vs2.3.6.8/fs/proc/uptime.c
+--- linux-3.10.33/fs/proc/uptime.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/proc/uptime.c 2013-08-22 20:30:00.000000000 +0000
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
@@ -6537,9 +6537,9 @@ diff -NurpP --minimal linux-3.10.27/fs/proc/uptime.c linux-3.10.27-vs2.3.6.8/fs/
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.10.27/fs/proc_namespace.c linux-3.10.27-vs2.3.6.8/fs/proc_namespace.c
---- linux-3.10.27/fs/proc_namespace.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/proc_namespace.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/proc_namespace.c linux-3.10.33-vs2.3.6.8/fs/proc_namespace.c
+--- linux-3.10.33/fs/proc_namespace.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/proc_namespace.c 2013-08-22 20:30:00.000000000 +0000
@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file
{ MS_SYNCHRONOUS, ",sync" },
{ MS_DIRSYNC, ",dirsync" },
@@ -6655,10 +6655,10 @@ diff -NurpP --minimal linux-3.10.27/fs/proc_namespace.c linux-3.10.27-vs2.3.6.8/
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-diff -NurpP --minimal linux-3.10.27/fs/quota/dquot.c linux-3.10.27-vs2.3.6.8/fs/quota/dquot.c
---- linux-3.10.27/fs/quota/dquot.c 2013-05-31 13:45:25.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/quota/dquot.c 2013-08-22 20:30:00.000000000 +0000
-@@ -1585,6 +1585,9 @@ int __dquot_alloc_space(struct inode *in
+diff -NurpP --minimal linux-3.10.33/fs/quota/dquot.c linux-3.10.33-vs2.3.6.8/fs/quota/dquot.c
+--- linux-3.10.33/fs/quota/dquot.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/quota/dquot.c 2014-03-12 13:18:32.000000000 +0000
+@@ -1593,6 +1593,9 @@ int __dquot_alloc_space(struct inode *in
struct dquot **dquots = inode->i_dquot;
int reserve = flags & DQUOT_SPACE_RESERVE;
@@ -6668,7 +6668,7 @@ diff -NurpP --minimal linux-3.10.27/fs/quota/dquot.c linux-3.10.27-vs2.3.6.8/fs/
/*
* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex
-@@ -1640,6 +1643,9 @@ int dquot_alloc_inode(const struct inode
+@@ -1648,6 +1651,9 @@ int dquot_alloc_inode(const struct inode
struct dquot_warn warn[MAXQUOTAS];
struct dquot * const *dquots = inode->i_dquot;
@@ -6678,7 +6678,7 @@ diff -NurpP --minimal linux-3.10.27/fs/quota/dquot.c linux-3.10.27-vs2.3.6.8/fs/
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!dquot_active(inode))
-@@ -1711,6 +1717,8 @@ void __dquot_free_space(struct inode *in
+@@ -1719,6 +1725,8 @@ void __dquot_free_space(struct inode *in
struct dquot **dquots = inode->i_dquot;
int reserve = flags & DQUOT_SPACE_RESERVE;
@@ -6687,7 +6687,7 @@ diff -NurpP --minimal linux-3.10.27/fs/quota/dquot.c linux-3.10.27-vs2.3.6.8/fs/
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!dquot_active(inode)) {
-@@ -1755,6 +1763,8 @@ void dquot_free_inode(const struct inode
+@@ -1763,6 +1771,8 @@ void dquot_free_inode(const struct inode
struct dquot_warn warn[MAXQUOTAS];
struct dquot * const *dquots = inode->i_dquot;
@@ -6696,9 +6696,9 @@ diff -NurpP --minimal linux-3.10.27/fs/quota/dquot.c linux-3.10.27-vs2.3.6.8/fs/
/* 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.10.27/fs/quota/quota.c linux-3.10.27-vs2.3.6.8/fs/quota/quota.c
---- linux-3.10.27/fs/quota/quota.c 2013-02-19 13:58:49.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/quota/quota.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/quota/quota.c linux-3.10.33-vs2.3.6.8/fs/quota/quota.c
+--- linux-3.10.33/fs/quota/quota.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/quota/quota.c 2013-08-22 20:30:00.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
@@ -6786,9 +6786,9 @@ diff -NurpP --minimal linux-3.10.27/fs/quota/quota.c linux-3.10.27-vs2.3.6.8/fs/
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-diff -NurpP --minimal linux-3.10.27/fs/stat.c linux-3.10.27-vs2.3.6.8/fs/stat.c
---- linux-3.10.27/fs/stat.c 2013-05-31 13:45:25.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/stat.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/stat.c linux-3.10.33-vs2.3.6.8/fs/stat.c
+--- linux-3.10.33/fs/stat.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/stat.c 2013-08-22 20:30:00.000000000 +0000
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
@@ -6797,9 +6797,9 @@ diff -NurpP --minimal linux-3.10.27/fs/stat.c linux-3.10.27-vs2.3.6.8/fs/stat.c
stat->rdev = inode->i_rdev;
stat->size = i_size_read(inode);
stat->atime = inode->i_atime;
-diff -NurpP --minimal linux-3.10.27/fs/statfs.c linux-3.10.27-vs2.3.6.8/fs/statfs.c
---- linux-3.10.27/fs/statfs.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/statfs.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/statfs.c linux-3.10.33-vs2.3.6.8/fs/statfs.c
+--- linux-3.10.33/fs/statfs.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/statfs.c 2013-11-13 17:17:16.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
@@ -6818,9 +6818,9 @@ diff -NurpP --minimal linux-3.10.27/fs/statfs.c linux-3.10.27-vs2.3.6.8/fs/statf
return retval;
}
-diff -NurpP --minimal linux-3.10.27/fs/super.c linux-3.10.27-vs2.3.6.8/fs/super.c
---- linux-3.10.27/fs/super.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/super.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/super.c linux-3.10.33-vs2.3.6.8/fs/super.c
+--- linux-3.10.33/fs/super.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/super.c 2013-11-13 17:17:16.000000000 +0000
@@ -34,6 +34,8 @@
#include <linux/cleancache.h>
#include <linux/fsnotify.h>
@@ -6844,9 +6844,9 @@ diff -NurpP --minimal linux-3.10.27/fs/super.c linux-3.10.27-vs2.3.6.8/fs/super.
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-3.10.27/fs/sysfs/mount.c linux-3.10.27-vs2.3.6.8/fs/sysfs/mount.c
---- linux-3.10.27/fs/sysfs/mount.c 2013-05-31 13:45:25.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/sysfs/mount.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/sysfs/mount.c linux-3.10.33-vs2.3.6.8/fs/sysfs/mount.c
+--- linux-3.10.33/fs/sysfs/mount.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/sysfs/mount.c 2013-08-22 20:30:00.000000000 +0000
@@ -48,7 +48,7 @@ static int sysfs_fill_super(struct super
sb->s_blocksize = PAGE_CACHE_SIZE;
@@ -6856,9 +6856,9 @@ diff -NurpP --minimal linux-3.10.27/fs/sysfs/mount.c linux-3.10.27-vs2.3.6.8/fs/
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-3.10.27/fs/utimes.c linux-3.10.27-vs2.3.6.8/fs/utimes.c
---- linux-3.10.27/fs/utimes.c 2013-02-19 13:58:49.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/utimes.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/utimes.c linux-3.10.33-vs2.3.6.8/fs/utimes.c
+--- linux-3.10.33/fs/utimes.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/utimes.c 2013-08-22 20:30:00.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
@@ -6888,9 +6888,9 @@ diff -NurpP --minimal linux-3.10.27/fs/utimes.c linux-3.10.27-vs2.3.6.8/fs/utime
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-3.10.27/fs/xattr.c linux-3.10.27-vs2.3.6.8/fs/xattr.c
---- linux-3.10.27/fs/xattr.c 2013-02-19 13:58:49.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/xattr.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/xattr.c linux-3.10.33-vs2.3.6.8/fs/xattr.c
+--- linux-3.10.33/fs/xattr.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/xattr.c 2013-08-22 20:30:00.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/audit.h>
#include <linux/vmalloc.h>
@@ -6908,9 +6908,9 @@ diff -NurpP --minimal linux-3.10.27/fs/xattr.c linux-3.10.27-vs2.3.6.8/fs/xattr.
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_dinode.h linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_dinode.h
---- linux-3.10.27/fs/xfs/xfs_dinode.h 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_dinode.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/xfs/xfs_dinode.h linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_dinode.h
+--- linux-3.10.33/fs/xfs/xfs_dinode.h 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_dinode.h 2013-08-22 20:30:00.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 */
@@ -6951,9 +6951,9 @@ diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_dinode.h linux-3.10.27-vs2.3.6.8/
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_fs.h linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_fs.h
---- linux-3.10.27/fs/xfs/xfs_fs.h 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_fs.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/xfs/xfs_fs.h linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_fs.h
+--- linux-3.10.33/fs/xfs/xfs_fs.h 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_fs.h 2013-08-22 20:30:00.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 */
@@ -6974,9 +6974,9 @@ diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_fs.h linux-3.10.27-vs2.3.6.8/fs/x
__u32 bs_dmevmask; /* DMIG event mask */
__u16 bs_dmstate; /* DMIG state info */
__u16 bs_aextents; /* attribute number of extents */
-diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_ialloc.c linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_ialloc.c
---- linux-3.10.27/fs/xfs/xfs_ialloc.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_ialloc.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/xfs/xfs_ialloc.c linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_ialloc.c
+--- linux-3.10.33/fs/xfs/xfs_ialloc.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_ialloc.c 2013-08-22 20:30:00.000000000 +0000
@@ -39,7 +39,6 @@
#include "xfs_cksum.h"
#include "xfs_buf_item.h"
@@ -6985,9 +6985,9 @@ diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_ialloc.c linux-3.10.27-vs2.3.6.8/
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_inode.c linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_inode.c
---- linux-3.10.27/fs/xfs/xfs_inode.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_inode.c 2013-08-22 21:50:34.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/xfs/xfs_inode.c linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_inode.c
+--- linux-3.10.33/fs/xfs/xfs_inode.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_inode.c 2013-08-22 21:50:34.000000000 +0000
@@ -16,6 +16,7 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -7165,9 +7165,9 @@ diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_inode.c linux-3.10.27-vs2.3.6.8/f
/* 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.10.27/fs/xfs/xfs_inode.h linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_inode.h
---- linux-3.10.27/fs/xfs/xfs_inode.h 2013-07-14 17:01:30.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_inode.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/xfs/xfs_inode.h linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_inode.h
+--- linux-3.10.33/fs/xfs/xfs_inode.h 2013-07-14 17:01:30.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_inode.h 2013-08-22 20:30:00.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 */
@@ -7188,9 +7188,9 @@ diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_inode.h linux-3.10.27-vs2.3.6.8/f
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.10.27/fs/xfs/xfs_ioctl.c linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_ioctl.c
---- linux-3.10.27/fs/xfs/xfs_ioctl.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_ioctl.c 2013-12-23 17:42:40.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/xfs/xfs_ioctl.c linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_ioctl.c
+--- linux-3.10.33/fs/xfs/xfs_ioctl.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_ioctl.c 2013-12-23 17:42:40.000000000 +0000
@@ -26,7 +26,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
@@ -7259,9 +7259,9 @@ diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_ioctl.c linux-3.10.27-vs2.3.6.8/f
return xfs_ioc_setxflags(ip, filp, arg);
case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_ioctl.h linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_ioctl.h
---- linux-3.10.27/fs/xfs/xfs_ioctl.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_ioctl.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/xfs/xfs_ioctl.h linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_ioctl.h
+--- linux-3.10.33/fs/xfs/xfs_ioctl.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_ioctl.h 2013-08-22 20:30:00.000000000 +0000
@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
void __user *uhandle,
u32 hlen);
@@ -7275,9 +7275,9 @@ diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_ioctl.h linux-3.10.27-vs2.3.6.8/f
extern long
xfs_file_ioctl(
struct file *filp,
-diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_iops.c linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_iops.c
---- linux-3.10.27/fs/xfs/xfs_iops.c 2013-07-14 17:01:30.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_iops.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/xfs/xfs_iops.c linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_iops.c
+--- linux-3.10.33/fs/xfs/xfs_iops.c 2013-07-14 17:01:30.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_iops.c 2013-08-22 20:30:00.000000000 +0000
@@ -28,6 +28,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
@@ -7353,9 +7353,9 @@ diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_iops.c linux-3.10.27-vs2.3.6.8/fs
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_itable.c linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_itable.c
---- linux-3.10.27/fs/xfs/xfs_itable.c 2013-02-19 13:58:49.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_itable.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/xfs/xfs_itable.c linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_itable.c
+--- linux-3.10.33/fs/xfs/xfs_itable.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_itable.c 2013-08-22 20:30:00.000000000 +0000
@@ -97,6 +97,7 @@ xfs_bulkstat_one_int(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
@@ -7364,9 +7364,9 @@ diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_itable.c linux-3.10.27-vs2.3.6.8/
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.10.27/fs/xfs/xfs_linux.h linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_linux.h
---- linux-3.10.27/fs/xfs/xfs_linux.h 2013-07-14 17:01:30.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_linux.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/xfs/xfs_linux.h linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_linux.h
+--- linux-3.10.33/fs/xfs/xfs_linux.h 2013-07-14 17:01:30.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_linux.h 2013-08-22 20:30:00.000000000 +0000
@@ -124,6 +124,7 @@
#define current_cpu() (raw_smp_processor_id())
@@ -7375,9 +7375,9 @@ diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_linux.h linux-3.10.27-vs2.3.6.8/f
#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.10.27/fs/xfs/xfs_log_recover.c linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_log_recover.c
---- linux-3.10.27/fs/xfs/xfs_log_recover.c 2013-07-14 17:01:31.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_log_recover.c 2013-08-22 21:48:01.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/xfs/xfs_log_recover.c linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_log_recover.c
+--- linux-3.10.33/fs/xfs/xfs_log_recover.c 2013-07-14 17:01:31.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_log_recover.c 2013-08-22 21:48:01.000000000 +0000
@@ -2662,7 +2662,7 @@ xlog_recover_inode_pass2(
}
@@ -7387,9 +7387,9 @@ diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_log_recover.c linux-3.10.27-vs2.3
/* the rest is in on-disk format */
if (item->ri_buf[1].i_len > isize) {
-diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_mount.h linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_mount.h
---- linux-3.10.27/fs/xfs/xfs_mount.h 2013-07-14 17:01:31.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_mount.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/xfs/xfs_mount.h linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_mount.h
+--- linux-3.10.33/fs/xfs/xfs_mount.h 2013-07-14 17:01:31.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_mount.h 2013-08-22 20:30:00.000000000 +0000
@@ -253,6 +253,7 @@ typedef struct xfs_mount {
allocator */
#define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */
@@ -7398,9 +7398,9 @@ diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_mount.h linux-3.10.27-vs2.3.6.8/f
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_super.c linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_super.c
---- linux-3.10.27/fs/xfs/xfs_super.c 2013-07-14 17:01:31.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_super.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/xfs/xfs_super.c linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_super.c
+--- linux-3.10.33/fs/xfs/xfs_super.c 2013-07-14 17:01:31.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_super.c 2013-08-22 20:30:00.000000000 +0000
@@ -114,6 +114,9 @@ mempool_t *xfs_ioend_pool;
#define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */
#define MNTOPT_DISCARD "discard" /* Discard unused blocks */
@@ -7477,9 +7477,9 @@ diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_super.c linux-3.10.27-vs2.3.6.8/f
/*
* 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.10.27/fs/xfs/xfs_vnodeops.c linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_vnodeops.c
---- linux-3.10.27/fs/xfs/xfs_vnodeops.c 2013-07-14 17:01:31.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/fs/xfs/xfs_vnodeops.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/fs/xfs/xfs_vnodeops.c linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_vnodeops.c
+--- linux-3.10.33/fs/xfs/xfs_vnodeops.c 2013-07-14 17:01:31.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/fs/xfs/xfs_vnodeops.c 2013-08-22 20:30:00.000000000 +0000
@@ -155,6 +155,77 @@ xfs_free_eofblocks(
return error;
}
@@ -7558,9 +7558,9 @@ diff -NurpP --minimal linux-3.10.27/fs/xfs/xfs_vnodeops.c linux-3.10.27-vs2.3.6.
int
xfs_release(
xfs_inode_t *ip)
-diff -NurpP --minimal linux-3.10.27/include/linux/cred.h linux-3.10.27-vs2.3.6.8/include/linux/cred.h
---- linux-3.10.27/include/linux/cred.h 2013-02-19 13:58:50.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/cred.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/cred.h linux-3.10.33-vs2.3.6.8/include/linux/cred.h
+--- linux-3.10.33/include/linux/cred.h 2013-02-19 13:58:50.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/cred.h 2013-08-22 20:30:00.000000000 +0000
@@ -143,6 +143,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 *);
@@ -7601,18 +7601,18 @@ diff -NurpP --minimal linux-3.10.27/include/linux/cred.h linux-3.10.27-vs2.3.6.8
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-3.10.27/include/linux/devpts_fs.h linux-3.10.27-vs2.3.6.8/include/linux/devpts_fs.h
---- linux-3.10.27/include/linux/devpts_fs.h 2013-02-19 13:58:50.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/devpts_fs.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/devpts_fs.h linux-3.10.33-vs2.3.6.8/include/linux/devpts_fs.h
+--- linux-3.10.33/include/linux/devpts_fs.h 2013-02-19 13:58:50.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/devpts_fs.h 2013-08-22 20:30:00.000000000 +0000
@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/fs.h linux-3.10.27-vs2.3.6.8/include/linux/fs.h
---- linux-3.10.27/include/linux/fs.h 2013-07-14 17:01:32.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/fs.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/fs.h linux-3.10.33-vs2.3.6.8/include/linux/fs.h
+--- linux-3.10.33/include/linux/fs.h 2013-07-14 17:01:32.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/fs.h 2013-08-22 20:30:00.000000000 +0000
@@ -211,6 +211,7 @@ typedef void (dio_iodone_t)(struct kiocb
#define ATTR_KILL_PRIV (1 << 14)
#define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
@@ -7778,9 +7778,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/fs.h linux-3.10.27-vs2.3.6.8/i
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.10.27/include/linux/init_task.h linux-3.10.27-vs2.3.6.8/include/linux/init_task.h
---- linux-3.10.27/include/linux/init_task.h 2013-05-31 13:45:27.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/init_task.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/init_task.h linux-3.10.33-vs2.3.6.8/include/linux/init_task.h
+--- linux-3.10.33/include/linux/init_task.h 2013-05-31 13:45:27.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/init_task.h 2013-08-22 20:30:00.000000000 +0000
@@ -222,6 +222,10 @@ extern struct task_group root_task_group
INIT_TASK_RCU_PREEMPT(tsk) \
INIT_CPUSET_SEQ \
@@ -7792,9 +7792,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/init_task.h linux-3.10.27-vs2.
}
-diff -NurpP --minimal linux-3.10.27/include/linux/ipc.h linux-3.10.27-vs2.3.6.8/include/linux/ipc.h
---- linux-3.10.27/include/linux/ipc.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/ipc.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/ipc.h linux-3.10.33-vs2.3.6.8/include/linux/ipc.h
+--- linux-3.10.33/include/linux/ipc.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/ipc.h 2013-08-22 20:30:00.000000000 +0000
@@ -16,6 +16,7 @@ struct kern_ipc_perm
key_t key;
kuid_t uid;
@@ -7803,9 +7803,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/ipc.h linux-3.10.27-vs2.3.6.8/
kuid_t cuid;
kgid_t cgid;
umode_t mode;
-diff -NurpP --minimal linux-3.10.27/include/linux/loop.h linux-3.10.27-vs2.3.6.8/include/linux/loop.h
---- linux-3.10.27/include/linux/loop.h 2013-02-19 13:58:51.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/loop.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/loop.h linux-3.10.33-vs2.3.6.8/include/linux/loop.h
+--- linux-3.10.33/include/linux/loop.h 2013-02-19 13:58:51.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/loop.h 2013-08-22 20:30:00.000000000 +0000
@@ -41,6 +41,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
@@ -7814,9 +7814,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/loop.h linux-3.10.27-vs2.3.6.8
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-3.10.27/include/linux/memcontrol.h linux-3.10.27-vs2.3.6.8/include/linux/memcontrol.h
---- linux-3.10.27/include/linux/memcontrol.h 2013-05-31 13:45:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/memcontrol.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/memcontrol.h linux-3.10.33-vs2.3.6.8/include/linux/memcontrol.h
+--- linux-3.10.33/include/linux/memcontrol.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/memcontrol.h 2013-08-22 20:30:00.000000000 +0000
@@ -86,6 +86,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);
@@ -7831,9 +7831,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/memcontrol.h linux-3.10.27-vs2
static inline
bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
{
-diff -NurpP --minimal linux-3.10.27/include/linux/mm_types.h linux-3.10.27-vs2.3.6.8/include/linux/mm_types.h
---- linux-3.10.27/include/linux/mm_types.h 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/mm_types.h 2014-01-22 19:00:34.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/mm_types.h linux-3.10.33-vs2.3.6.8/include/linux/mm_types.h
+--- linux-3.10.33/include/linux/mm_types.h 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/mm_types.h 2014-01-22 19:00:34.000000000 +0000
@@ -381,6 +381,7 @@ struct mm_struct {
/* Architecture-specific MM context */
@@ -7842,9 +7842,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/mm_types.h linux-3.10.27-vs2.3
unsigned long flags; /* Must use atomic bitops to access the bits */
-diff -NurpP --minimal linux-3.10.27/include/linux/mount.h linux-3.10.27-vs2.3.6.8/include/linux/mount.h
---- linux-3.10.27/include/linux/mount.h 2013-05-31 13:45:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/mount.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/mount.h linux-3.10.33-vs2.3.6.8/include/linux/mount.h
+--- linux-3.10.33/include/linux/mount.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/mount.h 2013-08-22 20:30:00.000000000 +0000
@@ -49,6 +49,9 @@ struct mnt_namespace;
#define MNT_LOCK_READONLY 0x400000
@@ -7855,9 +7855,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/mount.h linux-3.10.27-vs2.3.6.
struct vfsmount {
struct dentry *mnt_root; /* root of the mounted tree */
struct super_block *mnt_sb; /* pointer to superblock */
-diff -NurpP --minimal linux-3.10.27/include/linux/net.h linux-3.10.27-vs2.3.6.8/include/linux/net.h
---- linux-3.10.27/include/linux/net.h 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/net.h 2014-01-22 19:00:34.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/net.h linux-3.10.33-vs2.3.6.8/include/linux/net.h
+--- linux-3.10.33/include/linux/net.h 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/net.h 2014-01-22 19:00:34.000000000 +0000
@@ -38,6 +38,7 @@ struct net;
#define SOCK_PASSCRED 3
#define SOCK_PASSSEC 4
@@ -7866,9 +7866,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/net.h linux-3.10.27-vs2.3.6.8/
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-3.10.27/include/linux/netdevice.h linux-3.10.27-vs2.3.6.8/include/linux/netdevice.h
---- linux-3.10.27/include/linux/netdevice.h 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/netdevice.h 2014-01-22 19:00:34.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/netdevice.h linux-3.10.33-vs2.3.6.8/include/linux/netdevice.h
+--- linux-3.10.33/include/linux/netdevice.h 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/netdevice.h 2014-03-12 13:18:32.000000000 +0000
@@ -1694,6 +1694,7 @@ extern int init_dummy_netdev(struct net
extern struct net_device *dev_get_by_index(struct net *net, int ifindex);
@@ -7877,9 +7877,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/netdevice.h linux-3.10.27-vs2.
extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
extern int netdev_get_name(struct net *net, char *name, int ifindex);
extern int dev_restart(struct net_device *dev);
-diff -NurpP --minimal linux-3.10.27/include/linux/nsproxy.h linux-3.10.27-vs2.3.6.8/include/linux/nsproxy.h
---- linux-3.10.27/include/linux/nsproxy.h 2013-02-19 13:58:51.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/nsproxy.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/nsproxy.h linux-3.10.33-vs2.3.6.8/include/linux/nsproxy.h
+--- linux-3.10.33/include/linux/nsproxy.h 2013-02-19 13:58:51.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/nsproxy.h 2013-08-22 20:30:00.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -7929,9 +7929,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/nsproxy.h linux-3.10.27-vs2.3.
}
#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/pid.h linux-3.10.27-vs2.3.6.8/include/linux/pid.h
---- linux-3.10.27/include/linux/pid.h 2013-05-31 13:45:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/pid.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/pid.h linux-3.10.33-vs2.3.6.8/include/linux/pid.h
+--- linux-3.10.33/include/linux/pid.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/pid.h 2013-08-22 20:30:00.000000000 +0000
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
@@ -7950,9 +7950,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/pid.h linux-3.10.27-vs2.3.6.8/
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-3.10.27/include/linux/quotaops.h linux-3.10.27-vs2.3.6.8/include/linux/quotaops.h
---- linux-3.10.27/include/linux/quotaops.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/quotaops.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/quotaops.h linux-3.10.33-vs2.3.6.8/include/linux/quotaops.h
+--- linux-3.10.33/include/linux/quotaops.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/quotaops.h 2013-08-22 20:30:00.000000000 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -7994,9 +7994,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/quotaops.h linux-3.10.27-vs2.3
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.10.27/include/linux/sched.h linux-3.10.27-vs2.3.6.8/include/linux/sched.h
---- linux-3.10.27/include/linux/sched.h 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/sched.h 2013-11-30 07:53:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/sched.h linux-3.10.33-vs2.3.6.8/include/linux/sched.h
+--- linux-3.10.33/include/linux/sched.h 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/sched.h 2013-11-30 07:53:00.000000000 +0000
@@ -1237,6 +1237,14 @@ struct task_struct {
#endif
struct seccomp seccomp;
@@ -8043,9 +8043,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/sched.h linux-3.10.27-vs2.3.6.
}
-diff -NurpP --minimal linux-3.10.27/include/linux/shmem_fs.h linux-3.10.27-vs2.3.6.8/include/linux/shmem_fs.h
---- linux-3.10.27/include/linux/shmem_fs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/shmem_fs.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/shmem_fs.h linux-3.10.33-vs2.3.6.8/include/linux/shmem_fs.h
+--- linux-3.10.33/include/linux/shmem_fs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/shmem_fs.h 2013-08-22 20:30:00.000000000 +0000
@@ -9,6 +9,9 @@
/* inode in-kernel data */
@@ -8056,9 +8056,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/shmem_fs.h linux-3.10.27-vs2.3
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-3.10.27/include/linux/stat.h linux-3.10.27-vs2.3.6.8/include/linux/stat.h
---- linux-3.10.27/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/stat.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/stat.h linux-3.10.33-vs2.3.6.8/include/linux/stat.h
+--- linux-3.10.33/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/stat.h 2013-08-22 20:30:00.000000000 +0000
@@ -25,6 +25,7 @@ struct kstat {
unsigned int nlink;
kuid_t uid;
@@ -8067,9 +8067,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/stat.h linux-3.10.27-vs2.3.6.8
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-3.10.27/include/linux/sunrpc/auth.h linux-3.10.27-vs2.3.6.8/include/linux/sunrpc/auth.h
---- linux-3.10.27/include/linux/sunrpc/auth.h 2013-07-14 17:01:33.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/sunrpc/auth.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/sunrpc/auth.h linux-3.10.33-vs2.3.6.8/include/linux/sunrpc/auth.h
+--- linux-3.10.33/include/linux/sunrpc/auth.h 2013-07-14 17:01:33.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/sunrpc/auth.h 2013-08-22 20:30:00.000000000 +0000
@@ -28,6 +28,7 @@ struct rpcsec_gss_info;
struct auth_cred {
kuid_t uid;
@@ -8078,9 +8078,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/sunrpc/auth.h linux-3.10.27-vs
struct group_info *group_info;
const char *principal;
unsigned char machine_cred : 1;
-diff -NurpP --minimal linux-3.10.27/include/linux/sunrpc/clnt.h linux-3.10.27-vs2.3.6.8/include/linux/sunrpc/clnt.h
---- linux-3.10.27/include/linux/sunrpc/clnt.h 2013-07-14 17:01:33.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/sunrpc/clnt.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/sunrpc/clnt.h linux-3.10.33-vs2.3.6.8/include/linux/sunrpc/clnt.h
+--- linux-3.10.33/include/linux/sunrpc/clnt.h 2013-07-14 17:01:33.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/sunrpc/clnt.h 2013-08-22 20:30:00.000000000 +0000
@@ -49,7 +49,8 @@ struct rpc_clnt {
unsigned int cl_softrtry : 1,/* soft timeouts */
cl_discrtry : 1,/* disconnect before retry */
@@ -8091,9 +8091,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/sunrpc/clnt.h linux-3.10.27-vs
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-3.10.27/include/linux/sysfs.h linux-3.10.27-vs2.3.6.8/include/linux/sysfs.h
---- linux-3.10.27/include/linux/sysfs.h 2013-05-31 13:45:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/sysfs.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/sysfs.h linux-3.10.33-vs2.3.6.8/include/linux/sysfs.h
+--- linux-3.10.33/include/linux/sysfs.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/sysfs.h 2013-08-22 20:30:00.000000000 +0000
@@ -19,6 +19,8 @@
#include <linux/kobject_ns.h>
#include <linux/atomic.h>
@@ -8103,9 +8103,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/sysfs.h linux-3.10.27-vs2.3.6.
struct kobject;
struct module;
enum kobj_ns_type;
-diff -NurpP --minimal linux-3.10.27/include/linux/types.h linux-3.10.27-vs2.3.6.8/include/linux/types.h
---- linux-3.10.27/include/linux/types.h 2013-02-19 13:58:52.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/types.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/types.h linux-3.10.33-vs2.3.6.8/include/linux/types.h
+--- linux-3.10.33/include/linux/types.h 2013-02-19 13:58:52.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/types.h 2013-08-22 20:30:00.000000000 +0000
@@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
@@ -8116,9 +8116,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/types.h linux-3.10.27-vs2.3.6.
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-3.10.27/include/linux/uidgid.h linux-3.10.27-vs2.3.6.8/include/linux/uidgid.h
---- linux-3.10.27/include/linux/uidgid.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/uidgid.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/uidgid.h linux-3.10.33-vs2.3.6.8/include/linux/uidgid.h
+--- linux-3.10.33/include/linux/uidgid.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/uidgid.h 2013-08-22 20:30:00.000000000 +0000
@@ -23,13 +23,17 @@ typedef struct {
uid_t val;
} kuid_t;
@@ -8238,9 +8238,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/uidgid.h linux-3.10.27-vs2.3.6
static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid)
{
uid_t uid = from_kuid(to, kuid);
-diff -NurpP --minimal linux-3.10.27/include/linux/vroot.h linux-3.10.27-vs2.3.6.8/include/linux/vroot.h
---- linux-3.10.27/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vroot.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vroot.h linux-3.10.33-vs2.3.6.8/include/linux/vroot.h
+--- linux-3.10.33/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vroot.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
@@ -8293,9 +8293,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vroot.h linux-3.10.27-vs2.3.6.
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vs_base.h linux-3.10.27-vs2.3.6.8/include/linux/vs_base.h
---- linux-3.10.27/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vs_base.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vs_base.h linux-3.10.33-vs2.3.6.8/include/linux/vs_base.h
+--- linux-3.10.33/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vs_base.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
@@ -8307,9 +8307,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vs_base.h linux-3.10.27-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vs_context.h linux-3.10.27-vs2.3.6.8/include/linux/vs_context.h
---- linux-3.10.27/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vs_context.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vs_context.h linux-3.10.33-vs2.3.6.8/include/linux/vs_context.h
+--- linux-3.10.33/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vs_context.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
@@ -8553,9 +8553,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vs_context.h linux-3.10.27-vs2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vs_cowbl.h linux-3.10.27-vs2.3.6.8/include/linux/vs_cowbl.h
---- linux-3.10.27/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vs_cowbl.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vs_cowbl.h linux-3.10.33-vs2.3.6.8/include/linux/vs_cowbl.h
+--- linux-3.10.33/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vs_cowbl.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
@@ -8605,9 +8605,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vs_cowbl.h linux-3.10.27-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vs_cvirt.h linux-3.10.27-vs2.3.6.8/include/linux/vs_cvirt.h
---- linux-3.10.27/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vs_cvirt.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vs_cvirt.h linux-3.10.33-vs2.3.6.8/include/linux/vs_cvirt.h
+--- linux-3.10.33/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vs_cvirt.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
@@ -8659,9 +8659,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vs_cvirt.h linux-3.10.27-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vs_device.h linux-3.10.27-vs2.3.6.8/include/linux/vs_device.h
---- linux-3.10.27/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vs_device.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vs_device.h linux-3.10.33-vs2.3.6.8/include/linux/vs_device.h
+--- linux-3.10.33/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vs_device.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
@@ -8708,9 +8708,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vs_device.h linux-3.10.27-vs2.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vs_dlimit.h linux-3.10.27-vs2.3.6.8/include/linux/vs_dlimit.h
---- linux-3.10.27/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vs_dlimit.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vs_dlimit.h linux-3.10.33-vs2.3.6.8/include/linux/vs_dlimit.h
+--- linux-3.10.33/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vs_dlimit.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
@@ -8927,9 +8927,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vs_dlimit.h linux-3.10.27-vs2.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vs_inet.h linux-3.10.27-vs2.3.6.8/include/linux/vs_inet.h
---- linux-3.10.27/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vs_inet.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vs_inet.h linux-3.10.33-vs2.3.6.8/include/linux/vs_inet.h
+--- linux-3.10.33/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vs_inet.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,364 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
@@ -9295,9 +9295,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vs_inet.h linux-3.10.27-vs2.3.
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vs_inet6.h linux-3.10.27-vs2.3.6.8/include/linux/vs_inet6.h
---- linux-3.10.27/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vs_inet6.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vs_inet6.h linux-3.10.33-vs2.3.6.8/include/linux/vs_inet6.h
+--- linux-3.10.33/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vs_inet6.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,257 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
@@ -9556,9 +9556,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vs_inet6.h linux-3.10.27-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vs_limit.h linux-3.10.27-vs2.3.6.8/include/linux/vs_limit.h
---- linux-3.10.27/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vs_limit.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vs_limit.h linux-3.10.33-vs2.3.6.8/include/linux/vs_limit.h
+--- linux-3.10.33/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vs_limit.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
@@ -9700,9 +9700,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vs_limit.h linux-3.10.27-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vs_network.h linux-3.10.27-vs2.3.6.8/include/linux/vs_network.h
---- linux-3.10.27/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vs_network.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vs_network.h linux-3.10.33-vs2.3.6.8/include/linux/vs_network.h
+--- linux-3.10.33/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vs_network.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
@@ -9873,9 +9873,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vs_network.h linux-3.10.27-vs2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vs_pid.h linux-3.10.27-vs2.3.6.8/include/linux/vs_pid.h
---- linux-3.10.27/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vs_pid.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vs_pid.h linux-3.10.33-vs2.3.6.8/include/linux/vs_pid.h
+--- linux-3.10.33/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vs_pid.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
@@ -9927,9 +9927,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vs_pid.h linux-3.10.27-vs2.3.6
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vs_sched.h linux-3.10.27-vs2.3.6.8/include/linux/vs_sched.h
---- linux-3.10.27/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vs_sched.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vs_sched.h linux-3.10.33-vs2.3.6.8/include/linux/vs_sched.h
+--- linux-3.10.33/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vs_sched.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
@@ -9971,9 +9971,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vs_sched.h linux-3.10.27-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vs_socket.h linux-3.10.27-vs2.3.6.8/include/linux/vs_socket.h
---- linux-3.10.27/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vs_socket.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vs_socket.h linux-3.10.33-vs2.3.6.8/include/linux/vs_socket.h
+--- linux-3.10.33/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vs_socket.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
@@ -10042,9 +10042,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vs_socket.h linux-3.10.27-vs2.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vs_tag.h linux-3.10.27-vs2.3.6.8/include/linux/vs_tag.h
---- linux-3.10.27/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vs_tag.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vs_tag.h linux-3.10.33-vs2.3.6.8/include/linux/vs_tag.h
+--- linux-3.10.33/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vs_tag.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
@@ -10093,9 +10093,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vs_tag.h linux-3.10.27-vs2.3.6
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vs_time.h linux-3.10.27-vs2.3.6.8/include/linux/vs_time.h
---- linux-3.10.27/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vs_time.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vs_time.h linux-3.10.33-vs2.3.6.8/include/linux/vs_time.h
+--- linux-3.10.33/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vs_time.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
@@ -10116,9 +10116,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vs_time.h linux-3.10.27-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/base.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/base.h
---- linux-3.10.27/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/base.h 2013-10-27 03:40:46.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/base.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/base.h
+--- linux-3.10.33/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/base.h 2013-10-27 03:40:46.000000000 +0000
@@ -0,0 +1,184 @@
+#ifndef _VSERVER_BASE_H
+#define _VSERVER_BASE_H
@@ -10304,9 +10304,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/base.h linux-3.10.27-v
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/cacct.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/cacct.h
---- linux-3.10.27/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/cacct.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/cacct.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/cacct.h
+--- linux-3.10.33/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/cacct.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _VSERVER_CACCT_H
+#define _VSERVER_CACCT_H
@@ -10323,9 +10323,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/cacct.h linux-3.10.27-
+};
+
+#endif /* _VSERVER_CACCT_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/cacct_cmd.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/cacct_cmd.h
---- linux-3.10.27/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/cacct_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/cacct_cmd.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/cacct_cmd.h
+--- linux-3.10.33/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/cacct_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VSERVER_CACCT_CMD_H
+#define _VSERVER_CACCT_CMD_H
@@ -10337,9 +10337,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/cacct_cmd.h linux-3.10
+extern int vc_sock_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/cacct_def.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/cacct_def.h
---- linux-3.10.27/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/cacct_def.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/cacct_def.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/cacct_def.h
+--- linux-3.10.33/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/cacct_def.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,43 @@
+#ifndef _VSERVER_CACCT_DEF_H
+#define _VSERVER_CACCT_DEF_H
@@ -10384,9 +10384,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/cacct_def.h linux-3.10
+#endif
+
+#endif /* _VSERVER_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/cacct_int.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/cacct_int.h
---- linux-3.10.27/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/cacct_int.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/cacct_int.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/cacct_int.h
+--- linux-3.10.33/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/cacct_int.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_CACCT_INT_H
+#define _VSERVER_CACCT_INT_H
@@ -10405,9 +10405,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/cacct_int.h linux-3.10
+}
+
+#endif /* _VSERVER_CACCT_INT_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/check.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/check.h
---- linux-3.10.27/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/check.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/check.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/check.h
+--- linux-3.10.33/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/check.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,89 @@
+#ifndef _VSERVER_CHECK_H
+#define _VSERVER_CHECK_H
@@ -10498,9 +10498,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/check.h linux-3.10.27-
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/context.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/context.h
---- linux-3.10.27/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/context.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/context.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/context.h
+--- linux-3.10.33/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/context.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,110 @@
+#ifndef _VSERVER_CONTEXT_H
+#define _VSERVER_CONTEXT_H
@@ -10612,9 +10612,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/context.h linux-3.10.2
+
+
+#endif /* _VSERVER_CONTEXT_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/context_cmd.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/context_cmd.h
---- linux-3.10.27/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/context_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/context_cmd.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/context_cmd.h
+--- linux-3.10.33/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/context_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,33 @@
+#ifndef _VSERVER_CONTEXT_CMD_H
+#define _VSERVER_CONTEXT_CMD_H
@@ -10649,9 +10649,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/context_cmd.h linux-3.
+extern int vc_set_badness(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/cvirt.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/cvirt.h
---- linux-3.10.27/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/cvirt.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/cvirt.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/cvirt.h
+--- linux-3.10.33/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/cvirt.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,18 @@
+#ifndef _VSERVER_CVIRT_H
+#define _VSERVER_CVIRT_H
@@ -10671,9 +10671,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/cvirt.h linux-3.10.27-
+int vx_do_syslog(int, char __user *, int);
+
+#endif /* _VSERVER_CVIRT_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/cvirt_cmd.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/cvirt_cmd.h
---- linux-3.10.27/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/cvirt_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/cvirt_cmd.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/cvirt_cmd.h
+--- linux-3.10.33/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/cvirt_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _VSERVER_CVIRT_CMD_H
+#define _VSERVER_CVIRT_CMD_H
@@ -10688,9 +10688,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/cvirt_cmd.h linux-3.10
+extern int vc_virt_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/cvirt_def.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/cvirt_def.h
---- linux-3.10.27/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/cvirt_def.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/cvirt_def.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/cvirt_def.h
+--- linux-3.10.33/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/cvirt_def.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,80 @@
+#ifndef _VSERVER_CVIRT_DEF_H
+#define _VSERVER_CVIRT_DEF_H
@@ -10772,9 +10772,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/cvirt_def.h linux-3.10
+#endif
+
+#endif /* _VSERVER_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/debug.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/debug.h
---- linux-3.10.27/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/debug.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/debug.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/debug.h
+--- linux-3.10.33/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/debug.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,146 @@
+#ifndef _VSERVER_DEBUG_H
+#define _VSERVER_DEBUG_H
@@ -10922,9 +10922,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/debug.h linux-3.10.27-
+
+
+#endif /* _VSERVER_DEBUG_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/debug_cmd.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/debug_cmd.h
---- linux-3.10.27/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/debug_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/debug_cmd.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/debug_cmd.h
+--- linux-3.10.33/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/debug_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,37 @@
+#ifndef _VSERVER_DEBUG_CMD_H
+#define _VSERVER_DEBUG_CMD_H
@@ -10963,9 +10963,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/debug_cmd.h linux-3.10
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/device.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/device.h
---- linux-3.10.27/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/device.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/device.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/device.h
+--- linux-3.10.33/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/device.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,9 @@
+#ifndef _VSERVER_DEVICE_H
+#define _VSERVER_DEVICE_H
@@ -10976,9 +10976,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/device.h linux-3.10.27
+#else /* _VSERVER_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DEVICE_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/device_cmd.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/device_cmd.h
---- linux-3.10.27/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/device_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/device_cmd.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/device_cmd.h
+--- linux-3.10.33/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/device_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,31 @@
+#ifndef _VSERVER_DEVICE_CMD_H
+#define _VSERVER_DEVICE_CMD_H
@@ -11011,9 +11011,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/device_cmd.h linux-3.1
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/device_def.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/device_def.h
---- linux-3.10.27/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/device_def.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/device_def.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/device_def.h
+--- linux-3.10.33/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/device_def.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_DEVICE_DEF_H
+#define _VSERVER_DEVICE_DEF_H
@@ -11032,9 +11032,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/device_def.h linux-3.1
+};
+
+#endif /* _VSERVER_DEVICE_DEF_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/dlimit.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/dlimit.h
---- linux-3.10.27/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/dlimit.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/dlimit.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/dlimit.h
+--- linux-3.10.33/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/dlimit.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,54 @@
+#ifndef _VSERVER_DLIMIT_H
+#define _VSERVER_DLIMIT_H
@@ -11090,9 +11090,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/dlimit.h linux-3.10.27
+#else /* _VSERVER_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DLIMIT_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/dlimit_cmd.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/dlimit_cmd.h
---- linux-3.10.27/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/dlimit_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/dlimit_cmd.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/dlimit_cmd.h
+--- linux-3.10.33/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/dlimit_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,46 @@
+#ifndef _VSERVER_DLIMIT_CMD_H
+#define _VSERVER_DLIMIT_CMD_H
@@ -11140,9 +11140,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/dlimit_cmd.h linux-3.1
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/global.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/global.h
---- linux-3.10.27/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/global.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/global.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/global.h
+--- linux-3.10.33/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/global.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VSERVER_GLOBAL_H
+#define _VSERVER_GLOBAL_H
@@ -11163,9 +11163,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/global.h linux-3.10.27
+
+
+#endif /* _VSERVER_GLOBAL_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/history.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/history.h
---- linux-3.10.27/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/history.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/history.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/history.h
+--- linux-3.10.33/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/history.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,197 @@
+#ifndef _VSERVER_HISTORY_H
+#define _VSERVER_HISTORY_H
@@ -11364,9 +11364,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/history.h linux-3.10.2
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VSERVER_HISTORY_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/inode.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/inode.h
---- linux-3.10.27/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/inode.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/inode.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/inode.h
+--- linux-3.10.33/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/inode.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VSERVER_INODE_H
+#define _VSERVER_INODE_H
@@ -11387,9 +11387,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/inode.h linux-3.10.27-
+#else /* _VSERVER_INODE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_INODE_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/inode_cmd.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/inode_cmd.h
---- linux-3.10.27/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/inode_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/inode_cmd.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/inode_cmd.h
+--- linux-3.10.33/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/inode_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,36 @@
+#ifndef _VSERVER_INODE_CMD_H
+#define _VSERVER_INODE_CMD_H
@@ -11427,9 +11427,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/inode_cmd.h linux-3.10
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_INODE_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/limit.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/limit.h
---- linux-3.10.27/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/limit.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/limit.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/limit.h
+--- linux-3.10.33/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/limit.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,61 @@
+#ifndef _VSERVER_LIMIT_H
+#define _VSERVER_LIMIT_H
@@ -11492,9 +11492,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/limit.h linux-3.10.27-
+#define NUM_LIMITS 24
+
+#endif /* _VSERVER_LIMIT_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/limit_cmd.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/limit_cmd.h
---- linux-3.10.27/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/limit_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/limit_cmd.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/limit_cmd.h
+--- linux-3.10.33/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/limit_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,35 @@
+#ifndef _VSERVER_LIMIT_CMD_H
+#define _VSERVER_LIMIT_CMD_H
@@ -11531,9 +11531,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/limit_cmd.h linux-3.10
+#endif /* CONFIG_IA32_EMULATION */
+
+#endif /* _VSERVER_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/limit_def.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/limit_def.h
---- linux-3.10.27/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/limit_def.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/limit_def.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/limit_def.h
+--- linux-3.10.33/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/limit_def.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VSERVER_LIMIT_DEF_H
+#define _VSERVER_LIMIT_DEF_H
@@ -11582,9 +11582,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/limit_def.h linux-3.10
+#endif
+
+#endif /* _VSERVER_LIMIT_DEF_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/limit_int.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/limit_int.h
---- linux-3.10.27/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/limit_int.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/limit_int.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/limit_int.h
+--- linux-3.10.33/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/limit_int.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,193 @@
+#ifndef _VSERVER_LIMIT_INT_H
+#define _VSERVER_LIMIT_INT_H
@@ -11779,9 +11779,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/limit_int.h linux-3.10
+
+
+#endif /* _VSERVER_LIMIT_INT_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/monitor.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/monitor.h
---- linux-3.10.27/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/monitor.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/monitor.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/monitor.h
+--- linux-3.10.33/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/monitor.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,6 @@
+#ifndef _VSERVER_MONITOR_H
+#define _VSERVER_MONITOR_H
@@ -11789,9 +11789,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/monitor.h linux-3.10.2
+#include <uapi/vserver/monitor.h>
+
+#endif /* _VSERVER_MONITOR_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/network.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/network.h
---- linux-3.10.27/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/network.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/network.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/network.h
+--- linux-3.10.33/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/network.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,76 @@
+#ifndef _VSERVER_NETWORK_H
+#define _VSERVER_NETWORK_H
@@ -11869,9 +11869,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/network.h linux-3.10.2
+#endif
+
+#endif /* _VSERVER_NETWORK_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/network_cmd.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/network_cmd.h
---- linux-3.10.27/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/network_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/network_cmd.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/network_cmd.h
+--- linux-3.10.33/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/network_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,37 @@
+#ifndef _VSERVER_NETWORK_CMD_H
+#define _VSERVER_NETWORK_CMD_H
@@ -11910,9 +11910,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/network_cmd.h linux-3.
+extern int vc_set_ncaps(struct nx_info *, void __user *);
+
+#endif /* _VSERVER_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/percpu.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/percpu.h
---- linux-3.10.27/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/percpu.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/percpu.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/percpu.h
+--- linux-3.10.33/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/percpu.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_PERCPU_H
+#define _VSERVER_PERCPU_H
@@ -11928,9 +11928,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/percpu.h linux-3.10.27
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VSERVER_PERCPU_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/pid.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/pid.h
---- linux-3.10.27/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/pid.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/pid.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/pid.h
+--- linux-3.10.33/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/pid.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,51 @@
+#ifndef _VSERVER_PID_H
+#define _VSERVER_PID_H
@@ -11983,9 +11983,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/pid.h linux-3.10.27-vs
+}
+
+#endif
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/sched.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/sched.h
---- linux-3.10.27/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/sched.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/sched.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/sched.h
+--- linux-3.10.33/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/sched.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,23 @@
+#ifndef _VSERVER_SCHED_H
+#define _VSERVER_SCHED_H
@@ -12010,9 +12010,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/sched.h linux-3.10.27-
+#else /* _VSERVER_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SCHED_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/sched_cmd.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/sched_cmd.h
---- linux-3.10.27/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/sched_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/sched_cmd.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/sched_cmd.h
+--- linux-3.10.33/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/sched_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,11 @@
+#ifndef _VSERVER_SCHED_CMD_H
+#define _VSERVER_SCHED_CMD_H
@@ -12025,9 +12025,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/sched_cmd.h linux-3.10
+extern int vc_get_prio_bias(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/sched_def.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/sched_def.h
---- linux-3.10.27/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/sched_def.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/sched_def.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/sched_def.h
+--- linux-3.10.33/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/sched_def.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,38 @@
+#ifndef _VSERVER_SCHED_DEF_H
+#define _VSERVER_SCHED_DEF_H
@@ -12067,9 +12067,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/sched_def.h linux-3.10
+#endif
+
+#endif /* _VSERVER_SCHED_DEF_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/signal.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/signal.h
---- linux-3.10.27/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/signal.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/signal.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/signal.h
+--- linux-3.10.33/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/signal.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_SIGNAL_H
+#define _VSERVER_SIGNAL_H
@@ -12085,9 +12085,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/signal.h linux-3.10.27
+#else /* _VSERVER_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SIGNAL_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/signal_cmd.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/signal_cmd.h
---- linux-3.10.27/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/signal_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/signal_cmd.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/signal_cmd.h
+--- linux-3.10.33/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/signal_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_SIGNAL_CMD_H
+#define _VSERVER_SIGNAL_CMD_H
@@ -12103,9 +12103,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/signal_cmd.h linux-3.1
+extern int vc_set_pflags(uint32_t pid, void __user *);
+
+#endif /* _VSERVER_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/space.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/space.h
---- linux-3.10.27/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/space.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/space.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/space.h
+--- linux-3.10.33/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/space.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,12 @@
+#ifndef _VSERVER_SPACE_H
+#define _VSERVER_SPACE_H
@@ -12119,9 +12119,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/space.h linux-3.10.27-
+#else /* _VSERVER_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SPACE_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/space_cmd.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/space_cmd.h
---- linux-3.10.27/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/space_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/space_cmd.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/space_cmd.h
+--- linux-3.10.33/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/space_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _VSERVER_SPACE_CMD_H
+#define _VSERVER_SPACE_CMD_H
@@ -12136,9 +12136,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/space_cmd.h linux-3.10
+extern int vc_get_space_mask(void __user *, int);
+
+#endif /* _VSERVER_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/switch.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/switch.h
---- linux-3.10.27/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/switch.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/switch.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/switch.h
+--- linux-3.10.33/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/switch.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,8 @@
+#ifndef _VSERVER_SWITCH_H
+#define _VSERVER_SWITCH_H
@@ -12148,9 +12148,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/switch.h linux-3.10.27
+#include <uapi/vserver/switch.h>
+
+#endif /* _VSERVER_SWITCH_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/tag.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/tag.h
---- linux-3.10.27/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/tag.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/tag.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/tag.h
+--- linux-3.10.33/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/tag.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,160 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
@@ -12312,9 +12312,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/tag.h linux-3.10.27-vs
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-3.10.27/include/linux/vserver/tag_cmd.h linux-3.10.27-vs2.3.6.8/include/linux/vserver/tag_cmd.h
---- linux-3.10.27/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/linux/vserver/tag_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/linux/vserver/tag_cmd.h linux-3.10.33-vs2.3.6.8/include/linux/vserver/tag_cmd.h
+--- linux-3.10.33/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/linux/vserver/tag_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VSERVER_TAG_CMD_H
+#define _VSERVER_TAG_CMD_H
@@ -12326,9 +12326,9 @@ diff -NurpP --minimal linux-3.10.27/include/linux/vserver/tag_cmd.h linux-3.10.2
+extern int vc_tag_migrate(uint32_t);
+
+#endif /* _VSERVER_TAG_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/net/addrconf.h linux-3.10.27-vs2.3.6.8/include/net/addrconf.h
---- linux-3.10.27/include/net/addrconf.h 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/net/addrconf.h 2013-11-13 17:19:37.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/net/addrconf.h linux-3.10.33-vs2.3.6.8/include/net/addrconf.h
+--- linux-3.10.33/include/net/addrconf.h 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/net/addrconf.h 2013-11-13 17:19:37.000000000 +0000
@@ -89,7 +89,8 @@ extern int ipv6_dev_get_saddr(struct n
const struct net_device *dev,
const struct in6_addr *daddr,
@@ -12339,9 +12339,9 @@ diff -NurpP --minimal linux-3.10.27/include/net/addrconf.h linux-3.10.27-vs2.3.6
extern int __ipv6_get_lladdr(struct inet6_dev *idev,
struct in6_addr *addr,
unsigned char banned_flags);
-diff -NurpP --minimal linux-3.10.27/include/net/af_unix.h linux-3.10.27-vs2.3.6.8/include/net/af_unix.h
---- linux-3.10.27/include/net/af_unix.h 2013-07-14 17:01:33.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/net/af_unix.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/net/af_unix.h linux-3.10.33-vs2.3.6.8/include/net/af_unix.h
+--- linux-3.10.33/include/net/af_unix.h 2013-07-14 17:01:33.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/net/af_unix.h 2013-08-22 20:30:00.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
@@ -12350,9 +12350,9 @@ diff -NurpP --minimal linux-3.10.27/include/net/af_unix.h linux-3.10.27-vs2.3.6.
#include <net/sock.h>
extern void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-3.10.27/include/net/inet_timewait_sock.h linux-3.10.27-vs2.3.6.8/include/net/inet_timewait_sock.h
---- linux-3.10.27/include/net/inet_timewait_sock.h 2013-05-31 13:45:28.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/net/inet_timewait_sock.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/net/inet_timewait_sock.h linux-3.10.33-vs2.3.6.8/include/net/inet_timewait_sock.h
+--- linux-3.10.33/include/net/inet_timewait_sock.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/net/inet_timewait_sock.h 2013-08-22 20:30:00.000000000 +0000
@@ -116,6 +116,10 @@ struct inet_timewait_sock {
#define tw_dport __tw_common.skc_dport
#define tw_num __tw_common.skc_num
@@ -12364,9 +12364,9 @@ diff -NurpP --minimal linux-3.10.27/include/net/inet_timewait_sock.h linux-3.10.
int tw_timeout;
volatile unsigned char tw_substate;
-diff -NurpP --minimal linux-3.10.27/include/net/ip6_route.h linux-3.10.27-vs2.3.6.8/include/net/ip6_route.h
---- linux-3.10.27/include/net/ip6_route.h 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/net/ip6_route.h 2013-11-13 17:22:25.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/net/ip6_route.h linux-3.10.33-vs2.3.6.8/include/net/ip6_route.h
+--- linux-3.10.33/include/net/ip6_route.h 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/net/ip6_route.h 2013-11-13 17:22:25.000000000 +0000
@@ -95,7 +95,8 @@ extern int ip6_route_get_saddr(struct
struct rt6_info *rt,
const struct in6_addr *daddr,
@@ -12377,9 +12377,9 @@ diff -NurpP --minimal linux-3.10.27/include/net/ip6_route.h linux-3.10.27-vs2.3.
extern struct rt6_info *rt6_lookup(struct net *net,
const struct in6_addr *daddr,
-diff -NurpP --minimal linux-3.10.27/include/net/route.h linux-3.10.27-vs2.3.6.8/include/net/route.h
---- linux-3.10.27/include/net/route.h 2013-02-19 13:58:52.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/net/route.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/net/route.h linux-3.10.33-vs2.3.6.8/include/net/route.h
+--- linux-3.10.33/include/net/route.h 2013-02-19 13:58:52.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/net/route.h 2013-08-22 20:30:00.000000000 +0000
@@ -207,6 +207,9 @@ static inline void ip_rt_put(struct rtab
dst_release(&rt->dst);
}
@@ -12427,9 +12427,9 @@ diff -NurpP --minimal linux-3.10.27/include/net/route.h linux-3.10.27-vs2.3.6.8/
rt = __ip_route_output_key(net, fl4);
if (IS_ERR(rt))
return rt;
-diff -NurpP --minimal linux-3.10.27/include/net/sock.h linux-3.10.27-vs2.3.6.8/include/net/sock.h
---- linux-3.10.27/include/net/sock.h 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/net/sock.h 2013-11-13 17:22:25.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/net/sock.h linux-3.10.33-vs2.3.6.8/include/net/sock.h
+--- linux-3.10.33/include/net/sock.h 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/net/sock.h 2013-11-13 17:22:25.000000000 +0000
@@ -191,6 +191,10 @@ struct sock_common {
#ifdef CONFIG_NET_NS
struct net *skc_net;
@@ -12452,17 +12452,17 @@ diff -NurpP --minimal linux-3.10.27/include/net/sock.h linux-3.10.27-vs2.3.6.8/i
socket_lock_t sk_lock;
struct sk_buff_head sk_receive_queue;
/*
-diff -NurpP --minimal linux-3.10.27/include/uapi/Kbuild linux-3.10.27-vs2.3.6.8/include/uapi/Kbuild
---- linux-3.10.27/include/uapi/Kbuild 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/Kbuild 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/Kbuild linux-3.10.33-vs2.3.6.8/include/uapi/Kbuild
+--- linux-3.10.33/include/uapi/Kbuild 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/Kbuild 2013-08-22 20:30:00.000000000 +0000
@@ -12,3 +12,4 @@ header-y += video/
header-y += drm/
header-y += xen/
header-y += scsi/
+header-y += vserver/
-diff -NurpP --minimal linux-3.10.27/include/uapi/linux/capability.h linux-3.10.27-vs2.3.6.8/include/uapi/linux/capability.h
---- linux-3.10.27/include/uapi/linux/capability.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/linux/capability.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/linux/capability.h linux-3.10.33-vs2.3.6.8/include/uapi/linux/capability.h
+--- linux-3.10.33/include/uapi/linux/capability.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/linux/capability.h 2013-08-22 20:30:00.000000000 +0000
@@ -259,6 +259,7 @@ struct vfs_cap_data {
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
@@ -12485,9 +12485,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/linux/capability.h linux-3.10.2
/*
* Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-3.10.27/include/uapi/linux/fs.h linux-3.10.27-vs2.3.6.8/include/uapi/linux/fs.h
---- linux-3.10.27/include/uapi/linux/fs.h 2013-07-14 17:01:34.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/linux/fs.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/linux/fs.h linux-3.10.33-vs2.3.6.8/include/uapi/linux/fs.h
+--- linux-3.10.33/include/uapi/linux/fs.h 2013-07-14 17:01:34.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/linux/fs.h 2013-08-22 20:30:00.000000000 +0000
@@ -86,6 +86,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 */
@@ -12515,9 +12515,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/linux/fs.h linux-3.10.27-vs2.3.
#define SYNC_FILE_RANGE_WAIT_BEFORE 1
#define SYNC_FILE_RANGE_WRITE 2
-diff -NurpP --minimal linux-3.10.27/include/uapi/linux/gfs2_ondisk.h linux-3.10.27-vs2.3.6.8/include/uapi/linux/gfs2_ondisk.h
---- linux-3.10.27/include/uapi/linux/gfs2_ondisk.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/linux/gfs2_ondisk.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/linux/gfs2_ondisk.h linux-3.10.33-vs2.3.6.8/include/uapi/linux/gfs2_ondisk.h
+--- linux-3.10.33/include/uapi/linux/gfs2_ondisk.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/linux/gfs2_ondisk.h 2013-08-22 20:30:00.000000000 +0000
@@ -225,6 +225,9 @@ enum {
gfs2fl_Sync = 8,
gfs2fl_System = 9,
@@ -12538,9 +12538,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/linux/gfs2_ondisk.h linux-3.10.
#define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */
#define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 /* only in gfs1 */
#define GFS2_DIF_INHERIT_JDATA 0x80000000
-diff -NurpP --minimal linux-3.10.27/include/uapi/linux/if_tun.h linux-3.10.27-vs2.3.6.8/include/uapi/linux/if_tun.h
---- linux-3.10.27/include/uapi/linux/if_tun.h 2013-02-19 13:58:55.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/linux/if_tun.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/linux/if_tun.h linux-3.10.33-vs2.3.6.8/include/uapi/linux/if_tun.h
+--- linux-3.10.33/include/uapi/linux/if_tun.h 2013-02-19 13:58:55.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/linux/if_tun.h 2013-08-22 20:30:00.000000000 +0000
@@ -56,6 +56,7 @@
#define TUNGETVNETHDRSZ _IOR('T', 215, int)
#define TUNSETVNETHDRSZ _IOW('T', 216, int)
@@ -12549,9 +12549,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/linux/if_tun.h linux-3.10.27-vs
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-3.10.27/include/uapi/linux/major.h linux-3.10.27-vs2.3.6.8/include/uapi/linux/major.h
---- linux-3.10.27/include/uapi/linux/major.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/linux/major.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/linux/major.h linux-3.10.33-vs2.3.6.8/include/uapi/linux/major.h
+--- linux-3.10.33/include/uapi/linux/major.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/linux/major.h 2013-08-22 20:30:00.000000000 +0000
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
@@ -12560,9 +12560,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/linux/major.h linux-3.10.27-vs2
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-3.10.27/include/uapi/linux/nfs_mount.h linux-3.10.27-vs2.3.6.8/include/uapi/linux/nfs_mount.h
---- linux-3.10.27/include/uapi/linux/nfs_mount.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/linux/nfs_mount.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/linux/nfs_mount.h linux-3.10.33-vs2.3.6.8/include/uapi/linux/nfs_mount.h
+--- linux-3.10.33/include/uapi/linux/nfs_mount.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/linux/nfs_mount.h 2013-08-22 20:30:00.000000000 +0000
@@ -63,7 +63,8 @@ struct nfs_mount_data {
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
#define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
@@ -12573,9 +12573,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/linux/nfs_mount.h linux-3.10.27
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-3.10.27/include/uapi/linux/reboot.h linux-3.10.27-vs2.3.6.8/include/uapi/linux/reboot.h
---- linux-3.10.27/include/uapi/linux/reboot.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/linux/reboot.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/linux/reboot.h linux-3.10.33-vs2.3.6.8/include/uapi/linux/reboot.h
+--- linux-3.10.33/include/uapi/linux/reboot.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/linux/reboot.h 2013-08-22 20:30:00.000000000 +0000
@@ -33,7 +33,7 @@
#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
@@ -12585,9 +12585,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/linux/reboot.h linux-3.10.27-vs
#endif /* _UAPI_LINUX_REBOOT_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/linux/sysctl.h linux-3.10.27-vs2.3.6.8/include/uapi/linux/sysctl.h
---- linux-3.10.27/include/uapi/linux/sysctl.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/linux/sysctl.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/linux/sysctl.h linux-3.10.33-vs2.3.6.8/include/uapi/linux/sysctl.h
+--- linux-3.10.33/include/uapi/linux/sysctl.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/linux/sysctl.h 2013-08-22 20:30:00.000000000 +0000
@@ -60,6 +60,7 @@ enum
CTL_ABI=9, /* Binary emulation */
CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
@@ -12604,9 +12604,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/linux/sysctl.h linux-3.10.27-vs
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/Kbuild linux-3.10.27-vs2.3.6.8/include/uapi/vserver/Kbuild
---- linux-3.10.27/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/Kbuild 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/Kbuild linux-3.10.33-vs2.3.6.8/include/uapi/vserver/Kbuild
+--- linux-3.10.33/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/Kbuild 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,9 @@
+
+header-y += context_cmd.h network_cmd.h space_cmd.h \
@@ -12617,9 +12617,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/Kbuild linux-3.10.27-vs
+header-y += switch.h context.h network.h monitor.h \
+ limit.h inode.h device.h
+
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/cacct_cmd.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/cacct_cmd.h
---- linux-3.10.27/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/cacct_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/cacct_cmd.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/cacct_cmd.h
+--- linux-3.10.33/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/cacct_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _UAPI_VS_CACCT_CMD_H
+#define _UAPI_VS_CACCT_CMD_H
@@ -12636,9 +12636,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/cacct_cmd.h linux-3.10.
+};
+
+#endif /* _UAPI_VS_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/context.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/context.h
---- linux-3.10.27/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/context.h 2013-10-27 03:43:35.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/context.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/context.h
+--- linux-3.10.33/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/context.h 2013-10-27 03:43:35.000000000 +0000
@@ -0,0 +1,81 @@
+#ifndef _UAPI_VS_CONTEXT_H
+#define _UAPI_VS_CONTEXT_H
@@ -12721,9 +12721,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/context.h linux-3.10.27
+#define VXC_NAMESPACE 0x02000000
+
+#endif /* _UAPI_VS_CONTEXT_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/context_cmd.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/context_cmd.h
---- linux-3.10.27/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/context_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/context_cmd.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/context_cmd.h
+--- linux-3.10.33/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/context_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,115 @@
+#ifndef _UAPI_VS_CONTEXT_CMD_H
+#define _UAPI_VS_CONTEXT_CMD_H
@@ -12840,9 +12840,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/context_cmd.h linux-3.1
+};
+
+#endif /* _UAPI_VS_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/cvirt_cmd.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/cvirt_cmd.h
---- linux-3.10.27/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/cvirt_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/cvirt_cmd.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/cvirt_cmd.h
+--- linux-3.10.33/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/cvirt_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,41 @@
+#ifndef _UAPI_VS_CVIRT_CMD_H
+#define _UAPI_VS_CVIRT_CMD_H
@@ -12885,9 +12885,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/cvirt_cmd.h linux-3.10.
+};
+
+#endif /* _UAPI_VS_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/debug_cmd.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/debug_cmd.h
---- linux-3.10.27/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/debug_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/debug_cmd.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/debug_cmd.h
+--- linux-3.10.33/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/debug_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,24 @@
+#ifndef _UAPI_VS_DEBUG_CMD_H
+#define _UAPI_VS_DEBUG_CMD_H
@@ -12913,9 +12913,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/debug_cmd.h linux-3.10.
+};
+
+#endif /* _UAPI_VS_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/device.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/device.h
---- linux-3.10.27/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/device.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/device.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/device.h
+--- linux-3.10.33/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/device.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,12 @@
+#ifndef _UAPI_VS_DEVICE_H
+#define _UAPI_VS_DEVICE_H
@@ -12929,9 +12929,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/device.h linux-3.10.27-
+#define DATTR_MASK 0x00000013
+
+#endif /* _UAPI_VS_DEVICE_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/device_cmd.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/device_cmd.h
---- linux-3.10.27/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/device_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/device_cmd.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/device_cmd.h
+--- linux-3.10.33/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/device_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,16 @@
+#ifndef _UAPI_VS_DEVICE_CMD_H
+#define _UAPI_VS_DEVICE_CMD_H
@@ -12949,9 +12949,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/device_cmd.h linux-3.10
+};
+
+#endif /* _UAPI_VS_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/dlimit_cmd.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/dlimit_cmd.h
---- linux-3.10.27/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/dlimit_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/dlimit_cmd.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/dlimit_cmd.h
+--- linux-3.10.33/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/dlimit_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _UAPI_VS_DLIMIT_CMD_H
+#define _UAPI_VS_DLIMIT_CMD_H
@@ -13020,9 +13020,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/dlimit_cmd.h linux-3.10
+}
+
+#endif /* _UAPI_VS_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/inode.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/inode.h
---- linux-3.10.27/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/inode.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/inode.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/inode.h
+--- linux-3.10.33/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/inode.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,23 @@
+#ifndef _UAPI_VS_INODE_H
+#define _UAPI_VS_INODE_H
@@ -13047,9 +13047,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/inode.h linux-3.10.27-v
+#define FIOC_SETXFLG _IOW('x', 6, long)
+
+#endif /* _UAPI_VS_INODE_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/inode_cmd.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/inode_cmd.h
---- linux-3.10.27/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/inode_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/inode_cmd.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/inode_cmd.h
+--- linux-3.10.33/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/inode_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,26 @@
+#ifndef _UAPI_VS_INODE_CMD_H
+#define _UAPI_VS_INODE_CMD_H
@@ -13077,9 +13077,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/inode_cmd.h linux-3.10.
+};
+
+#endif /* _UAPI_VS_INODE_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/limit.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/limit.h
---- linux-3.10.27/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/limit.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/limit.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/limit.h
+--- linux-3.10.33/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/limit.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _UAPI_VS_LIMIT_H
+#define _UAPI_VS_LIMIT_H
@@ -13095,9 +13095,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/limit.h linux-3.10.27-v
+#define VLIMIT_MAPPED 23
+
+#endif /* _UAPI_VS_LIMIT_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/limit_cmd.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/limit_cmd.h
---- linux-3.10.27/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/limit_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/limit_cmd.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/limit_cmd.h
+--- linux-3.10.33/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/limit_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _UAPI_VS_LIMIT_CMD_H
+#define _UAPI_VS_LIMIT_CMD_H
@@ -13139,9 +13139,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/limit_cmd.h linux-3.10.
+#define CRLIM_KEEP (~1ULL)
+
+#endif /* _UAPI_VS_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/monitor.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/monitor.h
---- linux-3.10.27/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/monitor.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/monitor.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/monitor.h
+--- linux-3.10.33/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/monitor.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,96 @@
+#ifndef _UAPI_VS_MONITOR_H
+#define _UAPI_VS_MONITOR_H
@@ -13239,9 +13239,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/monitor.h linux-3.10.27
+};
+
+#endif /* _UAPI_VS_MONITOR_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/network.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/network.h
---- linux-3.10.27/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/network.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/network.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/network.h
+--- linux-3.10.33/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/network.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,76 @@
+#ifndef _UAPI_VS_NETWORK_H
+#define _UAPI_VS_NETWORK_H
@@ -13319,9 +13319,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/network.h linux-3.10.27
+#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
+
+#endif /* _UAPI_VS_NETWORK_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/network_cmd.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/network_cmd.h
---- linux-3.10.27/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/network_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/network_cmd.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/network_cmd.h
+--- linux-3.10.33/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/network_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,123 @@
+#ifndef _UAPI_VS_NETWORK_CMD_H
+#define _UAPI_VS_NETWORK_CMD_H
@@ -13446,9 +13446,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/network_cmd.h linux-3.1
+};
+
+#endif /* _UAPI_VS_NETWORK_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/sched_cmd.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/sched_cmd.h
---- linux-3.10.27/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/sched_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/sched_cmd.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/sched_cmd.h
+--- linux-3.10.33/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/sched_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _UAPI_VS_SCHED_CMD_H
+#define _UAPI_VS_SCHED_CMD_H
@@ -13463,9 +13463,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/sched_cmd.h linux-3.10.
+#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0)
+
+#endif /* _UAPI_VS_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/signal_cmd.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/signal_cmd.h
---- linux-3.10.27/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/signal_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/signal_cmd.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/signal_cmd.h
+--- linux-3.10.33/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/signal_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,31 @@
+#ifndef _UAPI_VS_SIGNAL_CMD_H
+#define _UAPI_VS_SIGNAL_CMD_H
@@ -13498,9 +13498,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/signal_cmd.h linux-3.10
+};
+
+#endif /* _UAPI_VS_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/space_cmd.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/space_cmd.h
---- linux-3.10.27/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/space_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/space_cmd.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/space_cmd.h
+--- linux-3.10.33/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/space_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,28 @@
+#ifndef _UAPI_VS_SPACE_CMD_H
+#define _UAPI_VS_SPACE_CMD_H
@@ -13530,9 +13530,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/space_cmd.h linux-3.10.
+};
+
+#endif /* _UAPI_VS_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/switch.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/switch.h
---- linux-3.10.27/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/switch.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/switch.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/switch.h
+--- linux-3.10.33/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/switch.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,90 @@
+#ifndef _UAPI_VS_SWITCH_H
+#define _UAPI_VS_SWITCH_H
@@ -13624,9 +13624,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/switch.h linux-3.10.27-
+#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
+
+#endif /* _UAPI_VS_SWITCH_H */
-diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/tag_cmd.h linux-3.10.27-vs2.3.6.8/include/uapi/vserver/tag_cmd.h
---- linux-3.10.27/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/include/uapi/vserver/tag_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/include/uapi/vserver/tag_cmd.h linux-3.10.33-vs2.3.6.8/include/uapi/vserver/tag_cmd.h
+--- linux-3.10.33/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/include/uapi/vserver/tag_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _UAPI_VS_TAG_CMD_H
+#define _UAPI_VS_TAG_CMD_H
@@ -13642,9 +13642,9 @@ diff -NurpP --minimal linux-3.10.27/include/uapi/vserver/tag_cmd.h linux-3.10.27
+#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0)
+
+#endif /* _UAPI_VS_TAG_CMD_H */
-diff -NurpP --minimal linux-3.10.27/init/Kconfig linux-3.10.27-vs2.3.6.8/init/Kconfig
---- linux-3.10.27/init/Kconfig 2013-07-14 17:01:34.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/init/Kconfig 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/init/Kconfig linux-3.10.33-vs2.3.6.8/init/Kconfig
+--- linux-3.10.33/init/Kconfig 2013-07-14 17:01:34.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/init/Kconfig 2013-08-22 20:30:00.000000000 +0000
@@ -805,6 +805,7 @@ config NUMA_BALANCING
menuconfig CGROUPS
boolean "Control Group support"
@@ -13661,9 +13661,9 @@ diff -NurpP --minimal linux-3.10.27/init/Kconfig linux-3.10.27-vs2.3.6.8/init/Kc
select UIDGID_STRICT_TYPE_CHECKS
default n
-diff -NurpP --minimal linux-3.10.27/init/main.c linux-3.10.27-vs2.3.6.8/init/main.c
---- linux-3.10.27/init/main.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/init/main.c 2013-11-13 17:19:37.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/init/main.c linux-3.10.33-vs2.3.6.8/init/main.c
+--- linux-3.10.33/init/main.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/init/main.c 2013-11-13 17:19:37.000000000 +0000
@@ -75,6 +75,7 @@
#include <linux/blkdev.h>
#include <linux/elevator.h>
@@ -13672,9 +13672,9 @@ diff -NurpP --minimal linux-3.10.27/init/main.c linux-3.10.27-vs2.3.6.8/init/mai
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-3.10.27/ipc/mqueue.c linux-3.10.27-vs2.3.6.8/ipc/mqueue.c
---- linux-3.10.27/ipc/mqueue.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/ipc/mqueue.c 2013-12-23 17:42:40.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/ipc/mqueue.c linux-3.10.33-vs2.3.6.8/ipc/mqueue.c
+--- linux-3.10.33/ipc/mqueue.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/ipc/mqueue.c 2014-03-12 13:18:33.000000000 +0000
@@ -35,6 +35,8 @@
#include <linux/ipc_namespace.h>
#include <linux/user_namespace.h>
@@ -13750,9 +13750,9 @@ diff -NurpP --minimal linux-3.10.27/ipc/mqueue.c linux-3.10.27-vs2.3.6.8/ipc/mqu
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-3.10.27/ipc/msg.c linux-3.10.27-vs2.3.6.8/ipc/msg.c
---- linux-3.10.27/ipc/msg.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/ipc/msg.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/ipc/msg.c linux-3.10.33-vs2.3.6.8/ipc/msg.c
+--- linux-3.10.33/ipc/msg.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/ipc/msg.c 2013-11-13 17:17:16.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
@@ -13769,9 +13769,9 @@ diff -NurpP --minimal linux-3.10.27/ipc/msg.c linux-3.10.27-vs2.3.6.8/ipc/msg.c
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-3.10.27/ipc/sem.c linux-3.10.27-vs2.3.6.8/ipc/sem.c
---- linux-3.10.27/ipc/sem.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/ipc/sem.c 2013-12-23 17:42:40.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/ipc/sem.c linux-3.10.33-vs2.3.6.8/ipc/sem.c
+--- linux-3.10.33/ipc/sem.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/ipc/sem.c 2013-12-23 17:42:40.000000000 +0000
@@ -86,6 +86,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
@@ -13809,9 +13809,9 @@ diff -NurpP --minimal linux-3.10.27/ipc/sem.c linux-3.10.27-vs2.3.6.8/ipc/sem.c
ipc_rcu_putref(sma, sem_rcu_free);
}
-diff -NurpP --minimal linux-3.10.27/ipc/shm.c linux-3.10.27-vs2.3.6.8/ipc/shm.c
---- linux-3.10.27/ipc/shm.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/ipc/shm.c 2013-11-30 07:55:52.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/ipc/shm.c linux-3.10.33-vs2.3.6.8/ipc/shm.c
+--- linux-3.10.33/ipc/shm.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/ipc/shm.c 2013-11-30 07:55:52.000000000 +0000
@@ -42,6 +42,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
@@ -13869,9 +13869,9 @@ diff -NurpP --minimal linux-3.10.27/ipc/shm.c linux-3.10.27-vs2.3.6.8/ipc/shm.c
return error;
no_id:
-diff -NurpP --minimal linux-3.10.27/kernel/Makefile linux-3.10.27-vs2.3.6.8/kernel/Makefile
---- linux-3.10.27/kernel/Makefile 2013-07-14 17:01:34.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/kernel/Makefile 2013-08-22 21:18:32.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/kernel/Makefile linux-3.10.33-vs2.3.6.8/kernel/Makefile
+--- linux-3.10.33/kernel/Makefile 2013-07-14 17:01:34.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/kernel/Makefile 2013-08-22 21:18:32.000000000 +0000
@@ -25,6 +25,7 @@ endif
obj-y += sched/
obj-y += power/
@@ -13880,9 +13880,9 @@ diff -NurpP --minimal linux-3.10.27/kernel/Makefile linux-3.10.27-vs2.3.6.8/kern
obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
obj-$(CONFIG_FREEZER) += freezer.o
-diff -NurpP --minimal linux-3.10.27/kernel/auditsc.c linux-3.10.27-vs2.3.6.8/kernel/auditsc.c
---- linux-3.10.27/kernel/auditsc.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/kernel/auditsc.c 2013-12-23 17:42:40.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/kernel/auditsc.c linux-3.10.33-vs2.3.6.8/kernel/auditsc.c
+--- linux-3.10.33/kernel/auditsc.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/kernel/auditsc.c 2013-12-23 17:42:40.000000000 +0000
@@ -1982,7 +1982,7 @@ int audit_set_loginuid(kuid_t loginuid)
if (audit_loginuid_set(task))
return -EPERM;
@@ -13892,9 +13892,9 @@ diff -NurpP --minimal linux-3.10.27/kernel/auditsc.c linux-3.10.27-vs2.3.6.8/ker
return -EPERM;
#endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
-diff -NurpP --minimal linux-3.10.27/kernel/capability.c linux-3.10.27-vs2.3.6.8/kernel/capability.c
---- linux-3.10.27/kernel/capability.c 2013-05-31 13:45:29.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/kernel/capability.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/kernel/capability.c linux-3.10.33-vs2.3.6.8/kernel/capability.c
+--- linux-3.10.33/kernel/capability.c 2013-05-31 13:45:29.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/kernel/capability.c 2013-08-22 20:30:00.000000000 +0000
@@ -15,6 +15,7 @@
#include <linux/syscalls.h>
#include <linux/pid_namespace.h>
@@ -13920,9 +13920,9 @@ diff -NurpP --minimal linux-3.10.27/kernel/capability.c linux-3.10.27-vs2.3.6.8/
/**
* has_capability_noaudit - Does a task have a capability (unaudited) in the
* initial user ns
-diff -NurpP --minimal linux-3.10.27/kernel/compat.c linux-3.10.27-vs2.3.6.8/kernel/compat.c
---- linux-3.10.27/kernel/compat.c 2013-07-14 17:01:34.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/kernel/compat.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/kernel/compat.c linux-3.10.33-vs2.3.6.8/kernel/compat.c
+--- linux-3.10.33/kernel/compat.c 2013-07-14 17:01:34.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/kernel/compat.c 2013-08-22 20:30:00.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/times.h>
#include <linux/ptrace.h>
@@ -13940,9 +13940,9 @@ diff -NurpP --minimal linux-3.10.27/kernel/compat.c linux-3.10.27-vs2.3.6.8/kern
return 0;
}
-diff -NurpP --minimal linux-3.10.27/kernel/cred.c linux-3.10.27-vs2.3.6.8/kernel/cred.c
---- linux-3.10.27/kernel/cred.c 2013-02-19 13:58:56.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/kernel/cred.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/kernel/cred.c linux-3.10.33-vs2.3.6.8/kernel/cred.c
+--- linux-3.10.33/kernel/cred.c 2013-02-19 13:58:56.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/kernel/cred.c 2013-08-22 20:30:00.000000000 +0000
@@ -56,31 +56,6 @@ struct cred init_cred = {
.group_info = &init_groups,
};
@@ -14012,9 +14012,9 @@ diff -NurpP --minimal linux-3.10.27/kernel/cred.c linux-3.10.27-vs2.3.6.8/kernel
EXPORT_SYMBOL(prepare_creds);
/*
-diff -NurpP --minimal linux-3.10.27/kernel/exit.c linux-3.10.27-vs2.3.6.8/kernel/exit.c
---- linux-3.10.27/kernel/exit.c 2013-07-14 17:01:35.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/kernel/exit.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/kernel/exit.c linux-3.10.33-vs2.3.6.8/kernel/exit.c
+--- linux-3.10.33/kernel/exit.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/kernel/exit.c 2013-08-22 20:30:00.000000000 +0000
@@ -48,6 +48,10 @@
#include <linux/fs_struct.h>
#include <linux/init_task.h>
@@ -14110,9 +14110,9 @@ diff -NurpP --minimal linux-3.10.27/kernel/exit.c linux-3.10.27-vs2.3.6.8/kernel
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-diff -NurpP --minimal linux-3.10.27/kernel/fork.c linux-3.10.27-vs2.3.6.8/kernel/fork.c
---- linux-3.10.27/kernel/fork.c 2014-01-22 18:40:01.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/kernel/fork.c 2014-01-22 19:00:34.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/kernel/fork.c linux-3.10.33-vs2.3.6.8/kernel/fork.c
+--- linux-3.10.33/kernel/fork.c 2014-03-12 13:16:02.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/kernel/fork.c 2014-01-22 19:00:34.000000000 +0000
@@ -71,6 +71,9 @@
#include <linux/signalfd.h>
#include <linux/uprobes.h>
@@ -14205,9 +14205,9 @@ diff -NurpP --minimal linux-3.10.27/kernel/fork.c linux-3.10.27-vs2.3.6.8/kernel
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
cgroup_post_fork(p);
-diff -NurpP --minimal linux-3.10.27/kernel/kthread.c linux-3.10.27-vs2.3.6.8/kernel/kthread.c
---- linux-3.10.27/kernel/kthread.c 2013-07-14 17:01:35.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/kernel/kthread.c 2013-08-22 21:14:28.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/kernel/kthread.c linux-3.10.33-vs2.3.6.8/kernel/kthread.c
+--- linux-3.10.33/kernel/kthread.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/kernel/kthread.c 2013-08-22 21:14:28.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/freezer.h>
#include <linux/ptrace.h>
@@ -14216,9 +14216,9 @@ diff -NurpP --minimal linux-3.10.27/kernel/kthread.c linux-3.10.27-vs2.3.6.8/ker
#include <trace/events/sched.h>
static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-3.10.27/kernel/nsproxy.c linux-3.10.27-vs2.3.6.8/kernel/nsproxy.c
---- linux-3.10.27/kernel/nsproxy.c 2013-07-14 17:01:35.000000000 +0000
-+++ linux-3.10.27-vs2.3.6.8/kernel/nsproxy.c 2013-08-22 21:09:55.000000000 +0000
+diff -NurpP --minimal linux-3.10.33/kernel/nsproxy.c linux-3.10.33-vs2.3.6.8/kernel/nsproxy.c
+--- linux-3.10.33/kernel/nsproxy.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.33-vs2.3.6.8/kernel/nsproxy.c 2013-08-22 21:09:55.000000000 +0000
@@ -20,11 +20,14 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
@@ -14404,9 +14404,9 @@ diff -NurpP --minimal linux-3.10.27/kernel/nsproxy.c linux-3.10.27-vs2.3.6.8/ker
return -EPERM;
<Skipped 1327 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/365e2173c62e5ffd0a45b81bc025715eb644babc
More information about the pld-cvs-commit
mailing list