[packages/kernel/LINUX_3_0] updated to patch-3.0.101-vs2.3.2.5 with EXTRAVERSION removed
glen
glen at pld-linux.org
Mon Nov 11 14:04:31 CET 2013
commit fd7d1f7c46e4b7950d93ee074368de1e12b6b98d
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Nov 6 12:57:37 2013 +0200
updated to patch-3.0.101-vs2.3.2.5 with EXTRAVERSION removed
http://vserver.13thfloor.at/Experimental/patch-3.0.101-vs2.3.2.5.diff
kernel-vserver-2.3.patch | 2942 +++++++++++++++++++++++++---------------------
1 file changed, 1627 insertions(+), 1315 deletions(-)
---
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index a59c885..1a8d5d7 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-3.0.67/Documentation/vserver/debug.txt linux-3.0.67-vs2.3.2.5/Documentation/vserver/debug.txt
---- linux-3.0.67/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/Documentation/vserver/debug.txt 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/Documentation/vserver/debug.txt linux-3.0.101-vs2.3.2.5/Documentation/vserver/debug.txt
+--- linux-3.0.101/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/Documentation/vserver/debug.txt 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -156,9 +156,9 @@ diff -NurpP --minimal linux-3.0.67/Documentation/vserver/debug.txt linux-3.0.67-
+ 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.0.67/arch/alpha/Kconfig linux-3.0.67-vs2.3.2.5/arch/alpha/Kconfig
---- linux-3.0.67/arch/alpha/Kconfig 2011-07-22 09:17:32.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/alpha/Kconfig 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/alpha/Kconfig linux-3.0.101-vs2.3.2.5/arch/alpha/Kconfig
+--- linux-3.0.101/arch/alpha/Kconfig 2011-07-22 09:17:32.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/alpha/Kconfig 2011-06-10 20:11:24.000000000 +0000
@@ -668,6 +668,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -168,9 +168,9 @@ diff -NurpP --minimal linux-3.0.67/arch/alpha/Kconfig linux-3.0.67-vs2.3.2.5/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.67/arch/alpha/kernel/entry.S linux-3.0.67-vs2.3.2.5/arch/alpha/kernel/entry.S
---- linux-3.0.67/arch/alpha/kernel/entry.S 2010-10-21 11:06:45.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/alpha/kernel/entry.S 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/alpha/kernel/entry.S linux-3.0.101-vs2.3.2.5/arch/alpha/kernel/entry.S
+--- linux-3.0.101/arch/alpha/kernel/entry.S 2010-10-21 11:06:45.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/alpha/kernel/entry.S 2011-06-10 20:11:24.000000000 +0000
@@ -860,24 +860,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
@@ -203,9 +203,9 @@ diff -NurpP --minimal linux-3.0.67/arch/alpha/kernel/entry.S linux-3.0.67-vs2.3.
ret
.end sys_getxpid
-diff -NurpP --minimal linux-3.0.67/arch/alpha/kernel/ptrace.c linux-3.0.67-vs2.3.2.5/arch/alpha/kernel/ptrace.c
---- linux-3.0.67/arch/alpha/kernel/ptrace.c 2011-01-05 20:48:40.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/alpha/kernel/ptrace.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/alpha/kernel/ptrace.c linux-3.0.101-vs2.3.2.5/arch/alpha/kernel/ptrace.c
+--- linux-3.0.101/arch/alpha/kernel/ptrace.c 2011-01-05 20:48:40.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/alpha/kernel/ptrace.c 2011-06-10 20:11:24.000000000 +0000
@@ -13,6 +13,7 @@
#include <linux/user.h>
#include <linux/security.h>
@@ -214,9 +214,9 @@ diff -NurpP --minimal linux-3.0.67/arch/alpha/kernel/ptrace.c linux-3.0.67-vs2.3
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.0.67/arch/alpha/kernel/systbls.S linux-3.0.67-vs2.3.2.5/arch/alpha/kernel/systbls.S
---- linux-3.0.67/arch/alpha/kernel/systbls.S 2011-07-22 09:17:32.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/alpha/kernel/systbls.S 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/alpha/kernel/systbls.S linux-3.0.101-vs2.3.2.5/arch/alpha/kernel/systbls.S
+--- linux-3.0.101/arch/alpha/kernel/systbls.S 2011-07-22 09:17:32.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/alpha/kernel/systbls.S 2011-06-10 20:11:24.000000000 +0000
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -226,9 +226,9 @@ diff -NurpP --minimal linux-3.0.67/arch/alpha/kernel/systbls.S linux-3.0.67-vs2.
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-3.0.67/arch/alpha/kernel/traps.c linux-3.0.67-vs2.3.2.5/arch/alpha/kernel/traps.c
---- linux-3.0.67/arch/alpha/kernel/traps.c 2010-10-21 11:06:46.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/alpha/kernel/traps.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/alpha/kernel/traps.c linux-3.0.101-vs2.3.2.5/arch/alpha/kernel/traps.c
+--- linux-3.0.101/arch/alpha/kernel/traps.c 2010-10-21 11:06:46.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/alpha/kernel/traps.c 2011-06-10 20:11:24.000000000 +0000
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -239,9 +239,9 @@ diff -NurpP --minimal linux-3.0.67/arch/alpha/kernel/traps.c linux-3.0.67-vs2.3.
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.0.67/arch/arm/Kconfig linux-3.0.67-vs2.3.2.5/arch/arm/Kconfig
---- linux-3.0.67/arch/arm/Kconfig 2013-03-02 15:23:31.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/arm/Kconfig 2012-11-18 20:07:02.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/arm/Kconfig linux-3.0.101-vs2.3.2.5/arch/arm/Kconfig
+--- linux-3.0.101/arch/arm/Kconfig 2013-10-22 12:13:58.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/arm/Kconfig 2012-11-18 20:07:02.000000000 +0000
@@ -2072,6 +2072,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -251,9 +251,9 @@ diff -NurpP --minimal linux-3.0.67/arch/arm/Kconfig linux-3.0.67-vs2.3.2.5/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.67/arch/arm/kernel/calls.S linux-3.0.67-vs2.3.2.5/arch/arm/kernel/calls.S
---- linux-3.0.67/arch/arm/kernel/calls.S 2011-07-22 09:17:32.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/arm/kernel/calls.S 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/arm/kernel/calls.S linux-3.0.101-vs2.3.2.5/arch/arm/kernel/calls.S
+--- linux-3.0.101/arch/arm/kernel/calls.S 2011-07-22 09:17:32.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/arm/kernel/calls.S 2011-06-10 20:11:24.000000000 +0000
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -263,9 +263,9 @@ diff -NurpP --minimal linux-3.0.67/arch/arm/kernel/calls.S linux-3.0.67-vs2.3.2.
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.0.67/arch/arm/kernel/process.c linux-3.0.67-vs2.3.2.5/arch/arm/kernel/process.c
---- linux-3.0.67/arch/arm/kernel/process.c 2013-03-02 15:23:32.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/arm/kernel/process.c 2011-12-19 14:55:53.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/arm/kernel/process.c linux-3.0.101-vs2.3.2.5/arch/arm/kernel/process.c
+--- linux-3.0.101/arch/arm/kernel/process.c 2013-10-22 12:13:58.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/arm/kernel/process.c 2011-12-19 14:55:53.000000000 +0000
@@ -318,7 +318,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
@@ -276,9 +276,9 @@ diff -NurpP --minimal linux-3.0.67/arch/arm/kernel/process.c linux-3.0.67-vs2.3.
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-3.0.67/arch/arm/kernel/traps.c linux-3.0.67-vs2.3.2.5/arch/arm/kernel/traps.c
---- linux-3.0.67/arch/arm/kernel/traps.c 2013-03-02 15:23:32.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/arm/kernel/traps.c 2012-06-08 13:28:23.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/arm/kernel/traps.c linux-3.0.101-vs2.3.2.5/arch/arm/kernel/traps.c
+--- linux-3.0.101/arch/arm/kernel/traps.c 2013-10-22 12:13:58.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/arm/kernel/traps.c 2012-06-08 13:28:23.000000000 +0000
@@ -242,8 +242,8 @@ static int __die(const char *str, int er
print_modules();
@@ -290,9 +290,9 @@ diff -NurpP --minimal linux-3.0.67/arch/arm/kernel/traps.c linux-3.0.67-vs2.3.2.
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.0.67/arch/cris/Kconfig linux-3.0.67-vs2.3.2.5/arch/cris/Kconfig
---- linux-3.0.67/arch/cris/Kconfig 2011-07-22 09:17:35.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/cris/Kconfig 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/cris/Kconfig linux-3.0.101-vs2.3.2.5/arch/cris/Kconfig
+--- linux-3.0.101/arch/cris/Kconfig 2011-07-22 09:17:35.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/cris/Kconfig 2011-06-10 20:11:24.000000000 +0000
@@ -678,6 +678,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -302,9 +302,9 @@ diff -NurpP --minimal linux-3.0.67/arch/cris/Kconfig linux-3.0.67-vs2.3.2.5/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.67/arch/frv/kernel/kernel_thread.S linux-3.0.67-vs2.3.2.5/arch/frv/kernel/kernel_thread.S
---- linux-3.0.67/arch/frv/kernel/kernel_thread.S 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/frv/kernel/kernel_thread.S 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/frv/kernel/kernel_thread.S linux-3.0.101-vs2.3.2.5/arch/frv/kernel/kernel_thread.S
+--- linux-3.0.101/arch/frv/kernel/kernel_thread.S 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/frv/kernel/kernel_thread.S 2011-06-10 20:11:24.000000000 +0000
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
@@ -314,9 +314,9 @@ diff -NurpP --minimal linux-3.0.67/arch/frv/kernel/kernel_thread.S linux-3.0.67-
sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
setlo #0xe4e4,gr9
setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
-diff -NurpP --minimal linux-3.0.67/arch/h8300/Kconfig linux-3.0.67-vs2.3.2.5/arch/h8300/Kconfig
---- linux-3.0.67/arch/h8300/Kconfig 2011-07-22 09:17:35.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/h8300/Kconfig 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/h8300/Kconfig linux-3.0.101-vs2.3.2.5/arch/h8300/Kconfig
+--- linux-3.0.101/arch/h8300/Kconfig 2011-07-22 09:17:35.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/h8300/Kconfig 2011-06-10 20:11:24.000000000 +0000
@@ -213,6 +213,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -326,9 +326,9 @@ diff -NurpP --minimal linux-3.0.67/arch/h8300/Kconfig linux-3.0.67-vs2.3.2.5/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.67/arch/ia64/Kconfig linux-3.0.67-vs2.3.2.5/arch/ia64/Kconfig
---- linux-3.0.67/arch/ia64/Kconfig 2011-07-22 09:17:35.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/ia64/Kconfig 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/ia64/Kconfig linux-3.0.101-vs2.3.2.5/arch/ia64/Kconfig
+--- linux-3.0.101/arch/ia64/Kconfig 2011-07-22 09:17:35.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/ia64/Kconfig 2011-06-10 20:11:24.000000000 +0000
@@ -671,6 +671,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -338,9 +338,9 @@ diff -NurpP --minimal linux-3.0.67/arch/ia64/Kconfig linux-3.0.67-vs2.3.2.5/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.67/arch/ia64/include/asm/tlb.h linux-3.0.67-vs2.3.2.5/arch/ia64/include/asm/tlb.h
---- linux-3.0.67/arch/ia64/include/asm/tlb.h 2011-07-22 09:17:35.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/ia64/include/asm/tlb.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/ia64/include/asm/tlb.h linux-3.0.101-vs2.3.2.5/arch/ia64/include/asm/tlb.h
+--- linux-3.0.101/arch/ia64/include/asm/tlb.h 2011-07-22 09:17:35.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/ia64/include/asm/tlb.h 2011-06-10 20:11:24.000000000 +0000
@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -349,9 +349,9 @@ diff -NurpP --minimal linux-3.0.67/arch/ia64/include/asm/tlb.h linux-3.0.67-vs2.
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.67/arch/ia64/kernel/entry.S linux-3.0.67-vs2.3.2.5/arch/ia64/kernel/entry.S
---- linux-3.0.67/arch/ia64/kernel/entry.S 2013-03-02 15:23:32.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/ia64/kernel/entry.S 2012-06-08 13:28:23.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/ia64/kernel/entry.S linux-3.0.101-vs2.3.2.5/arch/ia64/kernel/entry.S
+--- linux-3.0.101/arch/ia64/kernel/entry.S 2013-10-22 12:14:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/ia64/kernel/entry.S 2012-06-08 13:28:23.000000000 +0000
@@ -1714,7 +1714,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -361,9 +361,9 @@ diff -NurpP --minimal linux-3.0.67/arch/ia64/kernel/entry.S linux-3.0.67-vs2.3.2
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-3.0.67/arch/ia64/kernel/perfmon.c linux-3.0.67-vs2.3.2.5/arch/ia64/kernel/perfmon.c
---- linux-3.0.67/arch/ia64/kernel/perfmon.c 2011-03-15 17:06:39.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/ia64/kernel/perfmon.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/ia64/kernel/perfmon.c linux-3.0.101-vs2.3.2.5/arch/ia64/kernel/perfmon.c
+--- linux-3.0.101/arch/ia64/kernel/perfmon.c 2011-03-15 17:06:39.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/ia64/kernel/perfmon.c 2011-06-10 20:11:24.000000000 +0000
@@ -42,6 +42,7 @@
#include <linux/completion.h>
#include <linux/tracehook.h>
@@ -372,9 +372,9 @@ diff -NurpP --minimal linux-3.0.67/arch/ia64/kernel/perfmon.c linux-3.0.67-vs2.3
#include <asm/errno.h>
#include <asm/intrinsics.h>
-diff -NurpP --minimal linux-3.0.67/arch/ia64/kernel/process.c linux-3.0.67-vs2.3.2.5/arch/ia64/kernel/process.c
---- linux-3.0.67/arch/ia64/kernel/process.c 2011-03-15 17:06:39.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/ia64/kernel/process.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/ia64/kernel/process.c linux-3.0.101-vs2.3.2.5/arch/ia64/kernel/process.c
+--- linux-3.0.101/arch/ia64/kernel/process.c 2011-03-15 17:06:39.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/ia64/kernel/process.c 2011-06-10 20:11:24.000000000 +0000
@@ -109,8 +109,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -386,9 +386,9 @@ diff -NurpP --minimal linux-3.0.67/arch/ia64/kernel/process.c linux-3.0.67-vs2.3
printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
init_utsname()->release);
-diff -NurpP --minimal linux-3.0.67/arch/ia64/kernel/ptrace.c linux-3.0.67-vs2.3.2.5/arch/ia64/kernel/ptrace.c
---- linux-3.0.67/arch/ia64/kernel/ptrace.c 2011-01-05 20:48:59.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/ia64/kernel/ptrace.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/ia64/kernel/ptrace.c linux-3.0.101-vs2.3.2.5/arch/ia64/kernel/ptrace.c
+--- linux-3.0.101/arch/ia64/kernel/ptrace.c 2011-01-05 20:48:59.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/ia64/kernel/ptrace.c 2011-06-10 20:11:24.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -397,9 +397,9 @@ diff -NurpP --minimal linux-3.0.67/arch/ia64/kernel/ptrace.c linux-3.0.67-vs2.3.
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.67/arch/ia64/kernel/traps.c linux-3.0.67-vs2.3.2.5/arch/ia64/kernel/traps.c
---- linux-3.0.67/arch/ia64/kernel/traps.c 2010-07-07 16:31:01.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/ia64/kernel/traps.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/ia64/kernel/traps.c linux-3.0.101-vs2.3.2.5/arch/ia64/kernel/traps.c
+--- linux-3.0.101/arch/ia64/kernel/traps.c 2010-07-07 16:31:01.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/ia64/kernel/traps.c 2011-06-10 20:11:24.000000000 +0000
@@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -424,9 +424,9 @@ diff -NurpP --minimal linux-3.0.67/arch/ia64/kernel/traps.c linux-3.0.67-vs2.3.2
}
}
}
-diff -NurpP --minimal linux-3.0.67/arch/ia64/mm/fault.c linux-3.0.67-vs2.3.2.5/arch/ia64/mm/fault.c
---- linux-3.0.67/arch/ia64/mm/fault.c 2011-07-22 09:17:35.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/ia64/mm/fault.c 2011-06-10 20:28:23.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/ia64/mm/fault.c linux-3.0.101-vs2.3.2.5/arch/ia64/mm/fault.c
+--- linux-3.0.101/arch/ia64/mm/fault.c 2011-07-22 09:17:35.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/ia64/mm/fault.c 2011-06-10 20:28:23.000000000 +0000
@@ -11,6 +11,7 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -435,9 +435,9 @@ diff -NurpP --minimal linux-3.0.67/arch/ia64/mm/fault.c linux-3.0.67-vs2.3.2.5/a
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.67/arch/m32r/kernel/traps.c linux-3.0.67-vs2.3.2.5/arch/m32r/kernel/traps.c
---- linux-3.0.67/arch/m32r/kernel/traps.c 2009-12-03 19:01:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/m32r/kernel/traps.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/m32r/kernel/traps.c linux-3.0.101-vs2.3.2.5/arch/m32r/kernel/traps.c
+--- linux-3.0.101/arch/m32r/kernel/traps.c 2009-12-03 19:01:57.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/m32r/kernel/traps.c 2011-06-10 20:11:24.000000000 +0000
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -450,9 +450,9 @@ diff -NurpP --minimal linux-3.0.67/arch/m32r/kernel/traps.c linux-3.0.67-vs2.3.2
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.0.67/arch/m68k/Kconfig linux-3.0.67-vs2.3.2.5/arch/m68k/Kconfig
---- linux-3.0.67/arch/m68k/Kconfig 2011-07-22 09:17:35.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/m68k/Kconfig 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/m68k/Kconfig linux-3.0.101-vs2.3.2.5/arch/m68k/Kconfig
+--- linux-3.0.101/arch/m68k/Kconfig 2011-07-22 09:17:35.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/m68k/Kconfig 2011-06-10 20:11:24.000000000 +0000
@@ -241,6 +241,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -462,9 +462,9 @@ diff -NurpP --minimal linux-3.0.67/arch/m68k/Kconfig linux-3.0.67-vs2.3.2.5/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.67/arch/mips/Kconfig linux-3.0.67-vs2.3.2.5/arch/mips/Kconfig
---- linux-3.0.67/arch/mips/Kconfig 2011-07-22 09:17:35.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/mips/Kconfig 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/mips/Kconfig linux-3.0.101-vs2.3.2.5/arch/mips/Kconfig
+--- linux-3.0.101/arch/mips/Kconfig 2011-07-22 09:17:35.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/mips/Kconfig 2011-06-10 20:11:24.000000000 +0000
@@ -2485,6 +2485,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -474,9 +474,9 @@ diff -NurpP --minimal linux-3.0.67/arch/mips/Kconfig linux-3.0.67-vs2.3.2.5/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.67/arch/mips/kernel/ptrace.c linux-3.0.67-vs2.3.2.5/arch/mips/kernel/ptrace.c
---- linux-3.0.67/arch/mips/kernel/ptrace.c 2011-07-22 09:17:36.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/mips/kernel/ptrace.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/mips/kernel/ptrace.c linux-3.0.101-vs2.3.2.5/arch/mips/kernel/ptrace.c
+--- linux-3.0.101/arch/mips/kernel/ptrace.c 2011-07-22 09:17:36.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/mips/kernel/ptrace.c 2011-06-10 20:11:24.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -495,9 +495,9 @@ diff -NurpP --minimal linux-3.0.67/arch/mips/kernel/ptrace.c linux-3.0.67-vs2.3.
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-3.0.67/arch/mips/kernel/scall32-o32.S linux-3.0.67-vs2.3.2.5/arch/mips/kernel/scall32-o32.S
---- linux-3.0.67/arch/mips/kernel/scall32-o32.S 2011-07-22 09:17:36.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/mips/kernel/scall32-o32.S 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/mips/kernel/scall32-o32.S linux-3.0.101-vs2.3.2.5/arch/mips/kernel/scall32-o32.S
+--- linux-3.0.101/arch/mips/kernel/scall32-o32.S 2011-07-22 09:17:36.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/mips/kernel/scall32-o32.S 2011-06-10 20:11:24.000000000 +0000
@@ -523,7 +523,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
@@ -507,9 +507,9 @@ diff -NurpP --minimal linux-3.0.67/arch/mips/kernel/scall32-o32.S linux-3.0.67-v
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-3.0.67/arch/mips/kernel/scall64-64.S linux-3.0.67-vs2.3.2.5/arch/mips/kernel/scall64-64.S
---- linux-3.0.67/arch/mips/kernel/scall64-64.S 2011-07-22 09:17:36.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/mips/kernel/scall64-64.S 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/mips/kernel/scall64-64.S linux-3.0.101-vs2.3.2.5/arch/mips/kernel/scall64-64.S
+--- linux-3.0.101/arch/mips/kernel/scall64-64.S 2011-07-22 09:17:36.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/mips/kernel/scall64-64.S 2011-06-10 20:11:24.000000000 +0000
@@ -362,7 +362,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -519,9 +519,9 @@ diff -NurpP --minimal linux-3.0.67/arch/mips/kernel/scall64-64.S linux-3.0.67-vs
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.0.67/arch/mips/kernel/scall64-n32.S linux-3.0.67-vs2.3.2.5/arch/mips/kernel/scall64-n32.S
---- linux-3.0.67/arch/mips/kernel/scall64-n32.S 2011-07-22 09:17:36.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/mips/kernel/scall64-n32.S 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/mips/kernel/scall64-n32.S linux-3.0.101-vs2.3.2.5/arch/mips/kernel/scall64-n32.S
+--- linux-3.0.101/arch/mips/kernel/scall64-n32.S 2011-07-22 09:17:36.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/mips/kernel/scall64-n32.S 2011-06-10 20:11:24.000000000 +0000
@@ -361,7 +361,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -531,9 +531,9 @@ diff -NurpP --minimal linux-3.0.67/arch/mips/kernel/scall64-n32.S linux-3.0.67-v
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.0.67/arch/mips/kernel/scall64-o32.S linux-3.0.67-vs2.3.2.5/arch/mips/kernel/scall64-o32.S
---- linux-3.0.67/arch/mips/kernel/scall64-o32.S 2011-07-22 09:17:36.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/mips/kernel/scall64-o32.S 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/mips/kernel/scall64-o32.S linux-3.0.101-vs2.3.2.5/arch/mips/kernel/scall64-o32.S
+--- linux-3.0.101/arch/mips/kernel/scall64-o32.S 2011-07-22 09:17:36.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/mips/kernel/scall64-o32.S 2011-06-10 20:11:24.000000000 +0000
@@ -480,7 +480,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -543,9 +543,9 @@ diff -NurpP --minimal linux-3.0.67/arch/mips/kernel/scall64-o32.S linux-3.0.67-v
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.0.67/arch/mips/kernel/traps.c linux-3.0.67-vs2.3.2.5/arch/mips/kernel/traps.c
---- linux-3.0.67/arch/mips/kernel/traps.c 2011-05-22 14:17:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/mips/kernel/traps.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/mips/kernel/traps.c linux-3.0.101-vs2.3.2.5/arch/mips/kernel/traps.c
+--- linux-3.0.101/arch/mips/kernel/traps.c 2011-05-22 14:17:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/mips/kernel/traps.c 2011-06-10 20:11:24.000000000 +0000
@@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
@@ -560,9 +560,9 @@ diff -NurpP --minimal linux-3.0.67/arch/mips/kernel/traps.c linux-3.0.67-vs2.3.2
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-3.0.67/arch/parisc/Kconfig linux-3.0.67-vs2.3.2.5/arch/parisc/Kconfig
---- linux-3.0.67/arch/parisc/Kconfig 2011-07-22 09:17:36.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/parisc/Kconfig 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/parisc/Kconfig linux-3.0.101-vs2.3.2.5/arch/parisc/Kconfig
+--- linux-3.0.101/arch/parisc/Kconfig 2011-07-22 09:17:36.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/parisc/Kconfig 2011-06-10 20:11:24.000000000 +0000
@@ -279,6 +279,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -572,9 +572,9 @@ diff -NurpP --minimal linux-3.0.67/arch/parisc/Kconfig linux-3.0.67-vs2.3.2.5/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.67/arch/parisc/kernel/syscall_table.S linux-3.0.67-vs2.3.2.5/arch/parisc/kernel/syscall_table.S
---- linux-3.0.67/arch/parisc/kernel/syscall_table.S 2013-03-02 15:23:33.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/parisc/kernel/syscall_table.S 2011-08-29 01:45:07.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/parisc/kernel/syscall_table.S linux-3.0.101-vs2.3.2.5/arch/parisc/kernel/syscall_table.S
+--- linux-3.0.101/arch/parisc/kernel/syscall_table.S 2013-10-22 12:14:01.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/parisc/kernel/syscall_table.S 2011-08-29 01:45:07.000000000 +0000
@@ -361,7 +361,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -584,9 +584,9 @@ diff -NurpP --minimal linux-3.0.67/arch/parisc/kernel/syscall_table.S linux-3.0.
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-3.0.67/arch/parisc/kernel/traps.c linux-3.0.67-vs2.3.2.5/arch/parisc/kernel/traps.c
---- linux-3.0.67/arch/parisc/kernel/traps.c 2009-09-10 13:25:40.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/parisc/kernel/traps.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/parisc/kernel/traps.c linux-3.0.101-vs2.3.2.5/arch/parisc/kernel/traps.c
+--- linux-3.0.101/arch/parisc/kernel/traps.c 2013-10-22 12:14:01.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/parisc/kernel/traps.c 2013-10-22 12:25:41.000000000 +0000
@@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
@@ -610,9 +610,9 @@ diff -NurpP --minimal linux-3.0.67/arch/parisc/kernel/traps.c linux-3.0.67-vs2.3
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.0.67/arch/parisc/mm/fault.c linux-3.0.67-vs2.3.2.5/arch/parisc/mm/fault.c
---- linux-3.0.67/arch/parisc/mm/fault.c 2010-08-02 14:52:06.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/parisc/mm/fault.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/parisc/mm/fault.c linux-3.0.101-vs2.3.2.5/arch/parisc/mm/fault.c
+--- linux-3.0.101/arch/parisc/mm/fault.c 2010-08-02 14:52:06.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/parisc/mm/fault.c 2011-06-10 20:11:24.000000000 +0000
@@ -237,8 +237,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
@@ -625,9 +625,9 @@ diff -NurpP --minimal linux-3.0.67/arch/parisc/mm/fault.c linux-3.0.67-vs2.3.2.5
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.0.67/arch/powerpc/Kconfig linux-3.0.67-vs2.3.2.5/arch/powerpc/Kconfig
---- linux-3.0.67/arch/powerpc/Kconfig 2011-07-22 09:17:36.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/powerpc/Kconfig 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/powerpc/Kconfig linux-3.0.101-vs2.3.2.5/arch/powerpc/Kconfig
+--- linux-3.0.101/arch/powerpc/Kconfig 2011-07-22 09:17:36.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/powerpc/Kconfig 2011-06-10 20:11:24.000000000 +0000
@@ -978,6 +978,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -637,9 +637,9 @@ diff -NurpP --minimal linux-3.0.67/arch/powerpc/Kconfig linux-3.0.67-vs2.3.2.5/a
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-3.0.67/arch/powerpc/include/asm/unistd.h linux-3.0.67-vs2.3.2.5/arch/powerpc/include/asm/unistd.h
---- linux-3.0.67/arch/powerpc/include/asm/unistd.h 2011-07-22 09:17:40.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/powerpc/include/asm/unistd.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/powerpc/include/asm/unistd.h linux-3.0.101-vs2.3.2.5/arch/powerpc/include/asm/unistd.h
+--- linux-3.0.101/arch/powerpc/include/asm/unistd.h 2011-07-22 09:17:40.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/powerpc/include/asm/unistd.h 2011-06-10 20:11:24.000000000 +0000
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -649,9 +649,9 @@ diff -NurpP --minimal linux-3.0.67/arch/powerpc/include/asm/unistd.h linux-3.0.6
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-3.0.67/arch/powerpc/kernel/process.c linux-3.0.67-vs2.3.2.5/arch/powerpc/kernel/process.c
---- linux-3.0.67/arch/powerpc/kernel/process.c 2013-03-02 15:23:33.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/powerpc/kernel/process.c 2012-09-16 16:24:54.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/powerpc/kernel/process.c linux-3.0.101-vs2.3.2.5/arch/powerpc/kernel/process.c
+--- linux-3.0.101/arch/powerpc/kernel/process.c 2013-10-22 12:14:01.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/powerpc/kernel/process.c 2012-09-16 16:24:54.000000000 +0000
@@ -656,8 +656,9 @@ void show_regs(struct pt_regs * regs)
#else
printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
@@ -664,9 +664,9 @@ diff -NurpP --minimal linux-3.0.67/arch/powerpc/kernel/process.c linux-3.0.67-vs
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-3.0.67/arch/powerpc/kernel/traps.c linux-3.0.67-vs2.3.2.5/arch/powerpc/kernel/traps.c
---- linux-3.0.67/arch/powerpc/kernel/traps.c 2013-03-02 15:23:33.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/powerpc/kernel/traps.c 2012-12-18 14:07:30.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/powerpc/kernel/traps.c linux-3.0.101-vs2.3.2.5/arch/powerpc/kernel/traps.c
+--- linux-3.0.101/arch/powerpc/kernel/traps.c 2013-10-22 12:14:01.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/powerpc/kernel/traps.c 2012-12-18 14:07:30.000000000 +0000
@@ -1076,8 +1076,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
@@ -679,9 +679,9 @@ diff -NurpP --minimal linux-3.0.67/arch/powerpc/kernel/traps.c linux-3.0.67-vs2.
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-3.0.67/arch/powerpc/kernel/vdso.c linux-3.0.67-vs2.3.2.5/arch/powerpc/kernel/vdso.c
---- linux-3.0.67/arch/powerpc/kernel/vdso.c 2011-05-22 14:17:02.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/powerpc/kernel/vdso.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/powerpc/kernel/vdso.c linux-3.0.101-vs2.3.2.5/arch/powerpc/kernel/vdso.c
+--- linux-3.0.101/arch/powerpc/kernel/vdso.c 2011-05-22 14:17:02.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/powerpc/kernel/vdso.c 2011-06-10 20:11:24.000000000 +0000
@@ -23,6 +23,7 @@
#include <linux/security.h>
#include <linux/bootmem.h>
@@ -690,9 +690,9 @@ diff -NurpP --minimal linux-3.0.67/arch/powerpc/kernel/vdso.c linux-3.0.67-vs2.3
#include <asm/pgtable.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-3.0.67/arch/s390/Kconfig linux-3.0.67-vs2.3.2.5/arch/s390/Kconfig
---- linux-3.0.67/arch/s390/Kconfig 2013-03-02 15:23:33.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/s390/Kconfig 2012-06-08 13:28:23.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/s390/Kconfig linux-3.0.101-vs2.3.2.5/arch/s390/Kconfig
+--- linux-3.0.101/arch/s390/Kconfig 2013-10-22 12:14:01.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/s390/Kconfig 2012-06-08 13:28:23.000000000 +0000
@@ -630,6 +630,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -702,9 +702,9 @@ diff -NurpP --minimal linux-3.0.67/arch/s390/Kconfig linux-3.0.67-vs2.3.2.5/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.67/arch/s390/include/asm/tlb.h linux-3.0.67-vs2.3.2.5/arch/s390/include/asm/tlb.h
---- linux-3.0.67/arch/s390/include/asm/tlb.h 2013-03-02 15:23:33.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/s390/include/asm/tlb.h 2012-06-08 13:28:23.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/s390/include/asm/tlb.h linux-3.0.101-vs2.3.2.5/arch/s390/include/asm/tlb.h
+--- linux-3.0.101/arch/s390/include/asm/tlb.h 2013-10-22 12:14:01.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/s390/include/asm/tlb.h 2012-06-08 13:28:23.000000000 +0000
@@ -24,6 +24,8 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -714,9 +714,9 @@ diff -NurpP --minimal linux-3.0.67/arch/s390/include/asm/tlb.h linux-3.0.67-vs2.
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.0.67/arch/s390/include/asm/unistd.h linux-3.0.67-vs2.3.2.5/arch/s390/include/asm/unistd.h
---- linux-3.0.67/arch/s390/include/asm/unistd.h 2011-07-22 09:17:41.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/s390/include/asm/unistd.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/s390/include/asm/unistd.h linux-3.0.101-vs2.3.2.5/arch/s390/include/asm/unistd.h
+--- linux-3.0.101/arch/s390/include/asm/unistd.h 2011-07-22 09:17:41.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/s390/include/asm/unistd.h 2011-06-10 20:11:24.000000000 +0000
@@ -202,7 +202,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
@@ -726,9 +726,9 @@ diff -NurpP --minimal linux-3.0.67/arch/s390/include/asm/unistd.h linux-3.0.67-v
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-3.0.67/arch/s390/kernel/ptrace.c linux-3.0.67-vs2.3.2.5/arch/s390/kernel/ptrace.c
---- linux-3.0.67/arch/s390/kernel/ptrace.c 2013-03-02 15:23:33.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/s390/kernel/ptrace.c 2012-03-15 12:33:10.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/s390/kernel/ptrace.c linux-3.0.101-vs2.3.2.5/arch/s390/kernel/ptrace.c
+--- linux-3.0.101/arch/s390/kernel/ptrace.c 2013-10-22 12:14:02.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/s390/kernel/ptrace.c 2012-03-15 12:33:10.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
@@ -737,9 +737,9 @@ diff -NurpP --minimal linux-3.0.67/arch/s390/kernel/ptrace.c linux-3.0.67-vs2.3.
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-3.0.67/arch/s390/kernel/syscalls.S linux-3.0.67-vs2.3.2.5/arch/s390/kernel/syscalls.S
---- linux-3.0.67/arch/s390/kernel/syscalls.S 2011-07-22 09:17:41.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/s390/kernel/syscalls.S 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/s390/kernel/syscalls.S linux-3.0.101-vs2.3.2.5/arch/s390/kernel/syscalls.S
+--- linux-3.0.101/arch/s390/kernel/syscalls.S 2011-07-22 09:17:41.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/s390/kernel/syscalls.S 2011-06-10 20:11:24.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)
@@ -749,9 +749,9 @@ diff -NurpP --minimal linux-3.0.67/arch/s390/kernel/syscalls.S linux-3.0.67-vs2.
SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
-diff -NurpP --minimal linux-3.0.67/arch/sh/Kconfig linux-3.0.67-vs2.3.2.5/arch/sh/Kconfig
---- linux-3.0.67/arch/sh/Kconfig 2011-07-22 09:17:41.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/sh/Kconfig 2011-07-18 22:44:39.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/sh/Kconfig linux-3.0.101-vs2.3.2.5/arch/sh/Kconfig
+--- linux-3.0.101/arch/sh/Kconfig 2011-07-22 09:17:41.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/sh/Kconfig 2011-07-18 22:44:39.000000000 +0000
@@ -893,6 +893,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -761,9 +761,9 @@ diff -NurpP --minimal linux-3.0.67/arch/sh/Kconfig linux-3.0.67-vs2.3.2.5/arch/s
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.67/arch/sh/kernel/irq.c linux-3.0.67-vs2.3.2.5/arch/sh/kernel/irq.c
---- linux-3.0.67/arch/sh/kernel/irq.c 2011-07-22 09:17:41.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/sh/kernel/irq.c 2011-07-18 22:45:06.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/sh/kernel/irq.c linux-3.0.101-vs2.3.2.5/arch/sh/kernel/irq.c
+--- linux-3.0.101/arch/sh/kernel/irq.c 2011-07-22 09:17:41.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/sh/kernel/irq.c 2011-07-18 22:45:06.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
@@ -772,9 +772,9 @@ diff -NurpP --minimal linux-3.0.67/arch/sh/kernel/irq.c linux-3.0.67-vs2.3.2.5/a
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.0.67/arch/sh/kernel/vsyscall/vsyscall.c linux-3.0.67-vs2.3.2.5/arch/sh/kernel/vsyscall/vsyscall.c
---- linux-3.0.67/arch/sh/kernel/vsyscall/vsyscall.c 2011-05-22 14:17:07.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/sh/kernel/vsyscall/vsyscall.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/sh/kernel/vsyscall/vsyscall.c linux-3.0.101-vs2.3.2.5/arch/sh/kernel/vsyscall/vsyscall.c
+--- linux-3.0.101/arch/sh/kernel/vsyscall/vsyscall.c 2011-05-22 14:17:07.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/sh/kernel/vsyscall/vsyscall.c 2011-06-10 20:11:24.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/elf.h>
#include <linux/sched.h>
@@ -783,10 +783,10 @@ diff -NurpP --minimal linux-3.0.67/arch/sh/kernel/vsyscall/vsyscall.c linux-3.0.
/*
* Should the kernel map a VDSO page into processes and pass its
-diff -NurpP --minimal linux-3.0.67/arch/sparc/Kconfig linux-3.0.67-vs2.3.2.5/arch/sparc/Kconfig
---- linux-3.0.67/arch/sparc/Kconfig 2013-03-02 15:23:34.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/sparc/Kconfig 2012-06-08 13:28:23.000000000 +0000
-@@ -605,6 +605,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.0.101/arch/sparc/Kconfig linux-3.0.101-vs2.3.2.5/arch/sparc/Kconfig
+--- linux-3.0.101/arch/sparc/Kconfig 2013-10-22 12:14:02.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/sparc/Kconfig 2013-05-13 18:25:04.000000000 +0000
+@@ -606,6 +606,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
@@ -795,9 +795,9 @@ diff -NurpP --minimal linux-3.0.67/arch/sparc/Kconfig linux-3.0.67-vs2.3.2.5/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.67/arch/sparc/include/asm/tlb_64.h linux-3.0.67-vs2.3.2.5/arch/sparc/include/asm/tlb_64.h
---- linux-3.0.67/arch/sparc/include/asm/tlb_64.h 2011-07-22 09:17:42.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/sparc/include/asm/tlb_64.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/sparc/include/asm/tlb_64.h linux-3.0.101-vs2.3.2.5/arch/sparc/include/asm/tlb_64.h
+--- linux-3.0.101/arch/sparc/include/asm/tlb_64.h 2011-07-22 09:17:42.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/sparc/include/asm/tlb_64.h 2011-06-10 20:11:24.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/swap.h>
@@ -806,9 +806,9 @@ diff -NurpP --minimal linux-3.0.67/arch/sparc/include/asm/tlb_64.h linux-3.0.67-
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
-diff -NurpP --minimal linux-3.0.67/arch/sparc/include/asm/unistd.h linux-3.0.67-vs2.3.2.5/arch/sparc/include/asm/unistd.h
---- linux-3.0.67/arch/sparc/include/asm/unistd.h 2011-07-22 09:17:42.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/sparc/include/asm/unistd.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/sparc/include/asm/unistd.h linux-3.0.101-vs2.3.2.5/arch/sparc/include/asm/unistd.h
+--- linux-3.0.101/arch/sparc/include/asm/unistd.h 2011-07-22 09:17:42.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/sparc/include/asm/unistd.h 2011-06-10 20:11:24.000000000 +0000
@@ -335,7 +335,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -818,9 +818,9 @@ diff -NurpP --minimal linux-3.0.67/arch/sparc/include/asm/unistd.h linux-3.0.67-
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-3.0.67/arch/sparc/kernel/systbls_32.S linux-3.0.67-vs2.3.2.5/arch/sparc/kernel/systbls_32.S
---- linux-3.0.67/arch/sparc/kernel/systbls_32.S 2011-07-22 09:17:42.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/sparc/kernel/systbls_32.S 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/sparc/kernel/systbls_32.S linux-3.0.101-vs2.3.2.5/arch/sparc/kernel/systbls_32.S
+--- linux-3.0.101/arch/sparc/kernel/systbls_32.S 2011-07-22 09:17:42.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/sparc/kernel/systbls_32.S 2011-06-10 20:11:24.000000000 +0000
@@ -70,7 +70,7 @@ sys_call_table:
/*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
/*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
@@ -830,9 +830,9 @@ diff -NurpP --minimal linux-3.0.67/arch/sparc/kernel/systbls_32.S linux-3.0.67-v
/*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
/*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-3.0.67/arch/sparc/kernel/systbls_64.S linux-3.0.67-vs2.3.2.5/arch/sparc/kernel/systbls_64.S
---- linux-3.0.67/arch/sparc/kernel/systbls_64.S 2013-03-02 15:23:34.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/sparc/kernel/systbls_64.S 2012-06-08 13:28:23.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/sparc/kernel/systbls_64.S linux-3.0.101-vs2.3.2.5/arch/sparc/kernel/systbls_64.S
+--- linux-3.0.101/arch/sparc/kernel/systbls_64.S 2013-10-22 12:14:03.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/sparc/kernel/systbls_64.S 2012-06-08 13:28:23.000000000 +0000
@@ -71,7 +71,7 @@ sys_call_table32:
/*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
.word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
@@ -851,9 +851,9 @@ diff -NurpP --minimal linux-3.0.67/arch/sparc/kernel/systbls_64.S linux-3.0.67-v
/*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
.word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-3.0.67/arch/um/Kconfig.rest linux-3.0.67-vs2.3.2.5/arch/um/Kconfig.rest
---- linux-3.0.67/arch/um/Kconfig.rest 2009-06-11 15:12:19.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/um/Kconfig.rest 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/um/Kconfig.rest linux-3.0.101-vs2.3.2.5/arch/um/Kconfig.rest
+--- linux-3.0.101/arch/um/Kconfig.rest 2009-06-11 15:12:19.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/um/Kconfig.rest 2011-06-10 20:11:24.000000000 +0000
@@ -18,6 +18,8 @@ source "drivers/connector/Kconfig"
source "fs/Kconfig"
@@ -863,9 +863,9 @@ diff -NurpP --minimal linux-3.0.67/arch/um/Kconfig.rest linux-3.0.67-vs2.3.2.5/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.67/arch/um/include/asm/tlb.h linux-3.0.67-vs2.3.2.5/arch/um/include/asm/tlb.h
---- linux-3.0.67/arch/um/include/asm/tlb.h 2011-07-22 09:17:42.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/um/include/asm/tlb.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/um/include/asm/tlb.h linux-3.0.101-vs2.3.2.5/arch/um/include/asm/tlb.h
+--- linux-3.0.101/arch/um/include/asm/tlb.h 2011-07-22 09:17:42.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/um/include/asm/tlb.h 2011-06-10 20:11:24.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/pagemap.h>
@@ -874,10 +874,10 @@ diff -NurpP --minimal linux-3.0.67/arch/um/include/asm/tlb.h linux-3.0.67-vs2.3.
#include <asm/percpu.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.0.67/arch/x86/Kconfig linux-3.0.67-vs2.3.2.5/arch/x86/Kconfig
---- linux-3.0.67/arch/x86/Kconfig 2013-03-02 15:23:34.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/x86/Kconfig 2012-11-18 20:07:02.000000000 +0000
-@@ -2168,6 +2168,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.0.101/arch/x86/Kconfig linux-3.0.101-vs2.3.2.5/arch/x86/Kconfig
+--- linux-3.0.101/arch/x86/Kconfig 2013-10-22 12:14:04.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/x86/Kconfig 2013-05-13 18:25:04.000000000 +0000
+@@ -2164,6 +2164,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
@@ -886,9 +886,9 @@ diff -NurpP --minimal linux-3.0.67/arch/x86/Kconfig linux-3.0.67-vs2.3.2.5/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.67/arch/x86/ia32/ia32entry.S linux-3.0.67-vs2.3.2.5/arch/x86/ia32/ia32entry.S
---- linux-3.0.67/arch/x86/ia32/ia32entry.S 2013-03-02 15:23:34.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/x86/ia32/ia32entry.S 2013-02-11 23:45:59.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/x86/ia32/ia32entry.S linux-3.0.101-vs2.3.2.5/arch/x86/ia32/ia32entry.S
+--- linux-3.0.101/arch/x86/ia32/ia32entry.S 2013-10-22 12:14:04.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/x86/ia32/ia32entry.S 2013-02-11 23:45:59.000000000 +0000
@@ -776,7 +776,7 @@ ia32_sys_call_table:
.quad sys_tgkill /* 270 */
.quad compat_sys_utimes
@@ -898,9 +898,9 @@ diff -NurpP --minimal linux-3.0.67/arch/x86/ia32/ia32entry.S linux-3.0.67-vs2.3.
.quad sys_mbind
.quad compat_sys_get_mempolicy /* 275 */
.quad sys_set_mempolicy
-diff -NurpP --minimal linux-3.0.67/arch/x86/include/asm/unistd_64.h linux-3.0.67-vs2.3.2.5/arch/x86/include/asm/unistd_64.h
---- linux-3.0.67/arch/x86/include/asm/unistd_64.h 2011-07-22 09:17:43.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/x86/include/asm/unistd_64.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/x86/include/asm/unistd_64.h linux-3.0.101-vs2.3.2.5/arch/x86/include/asm/unistd_64.h
+--- linux-3.0.101/arch/x86/include/asm/unistd_64.h 2011-07-22 09:17:43.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/x86/include/asm/unistd_64.h 2011-06-10 20:11:24.000000000 +0000
@@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
#define __NR_utimes 235
__SYSCALL(__NR_utimes, sys_utimes)
@@ -910,9 +910,9 @@ diff -NurpP --minimal linux-3.0.67/arch/x86/include/asm/unistd_64.h linux-3.0.67
#define __NR_mbind 237
__SYSCALL(__NR_mbind, sys_mbind)
#define __NR_set_mempolicy 238
-diff -NurpP --minimal linux-3.0.67/arch/x86/kernel/syscall_table_32.S linux-3.0.67-vs2.3.2.5/arch/x86/kernel/syscall_table_32.S
---- linux-3.0.67/arch/x86/kernel/syscall_table_32.S 2011-07-22 09:17:43.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/arch/x86/kernel/syscall_table_32.S 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/arch/x86/kernel/syscall_table_32.S linux-3.0.101-vs2.3.2.5/arch/x86/kernel/syscall_table_32.S
+--- linux-3.0.101/arch/x86/kernel/syscall_table_32.S 2011-07-22 09:17:43.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/arch/x86/kernel/syscall_table_32.S 2011-06-10 20:11:24.000000000 +0000
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
@@ -922,9 +922,9 @@ diff -NurpP --minimal linux-3.0.67/arch/x86/kernel/syscall_table_32.S linux-3.0.
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-3.0.67/block/genhd.c linux-3.0.67-vs2.3.2.5/block/genhd.c
---- linux-3.0.67/block/genhd.c 2013-03-02 15:23:36.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/block/genhd.c 2012-06-08 13:28:23.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/block/genhd.c linux-3.0.101-vs2.3.2.5/block/genhd.c
+--- linux-3.0.101/block/genhd.c 2013-10-22 12:14:05.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/block/genhd.c 2013-07-14 13:47:13.000000000 +0000
@@ -1167,17 +1167,17 @@ static int diskstats_show(struct seq_fil
cpu = part_stat_lock();
part_round_stats(cpu, hd);
@@ -947,9 +947,9 @@ diff -NurpP --minimal linux-3.0.67/block/genhd.c linux-3.0.67-vs2.3.2.5/block/ge
jiffies_to_msecs(part_stat_read(hd, ticks[WRITE])),
part_in_flight(hd),
jiffies_to_msecs(part_stat_read(hd, io_ticks)),
-diff -NurpP --minimal linux-3.0.67/drivers/block/Kconfig linux-3.0.67-vs2.3.2.5/drivers/block/Kconfig
---- linux-3.0.67/drivers/block/Kconfig 2011-07-22 09:17:44.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/drivers/block/Kconfig 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/drivers/block/Kconfig linux-3.0.101-vs2.3.2.5/drivers/block/Kconfig
+--- linux-3.0.101/drivers/block/Kconfig 2011-07-22 09:17:44.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/block/Kconfig 2011-06-10 20:11:24.000000000 +0000
@@ -273,6 +273,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
@@ -964,9 +964,9 @@ diff -NurpP --minimal linux-3.0.67/drivers/block/Kconfig linux-3.0.67-vs2.3.2.5/
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-3.0.67/drivers/block/Makefile linux-3.0.67-vs2.3.2.5/drivers/block/Makefile
---- linux-3.0.67/drivers/block/Makefile 2011-07-22 09:17:44.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/drivers/block/Makefile 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/drivers/block/Makefile linux-3.0.101-vs2.3.2.5/drivers/block/Makefile
+--- linux-3.0.101/drivers/block/Makefile 2011-07-22 09:17:44.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/block/Makefile 2011-06-10 20:11:24.000000000 +0000
@@ -34,6 +34,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_BLK_DEV_UB) += ub.o
@@ -975,9 +975,9 @@ diff -NurpP --minimal linux-3.0.67/drivers/block/Makefile linux-3.0.67-vs2.3.2.5
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
-diff -NurpP --minimal linux-3.0.67/drivers/block/loop.c linux-3.0.67-vs2.3.2.5/drivers/block/loop.c
---- linux-3.0.67/drivers/block/loop.c 2013-03-02 15:23:37.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/drivers/block/loop.c 2011-08-31 17:37:44.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/drivers/block/loop.c linux-3.0.101-vs2.3.2.5/drivers/block/loop.c
+--- linux-3.0.101/drivers/block/loop.c 2013-10-22 12:14:06.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/block/loop.c 2013-05-13 18:25:04.000000000 +0000
@@ -75,6 +75,7 @@
#include <linux/kthread.h>
#include <linux/splice.h>
@@ -994,7 +994,7 @@ diff -NurpP --minimal linux-3.0.67/drivers/block/loop.c linux-3.0.67-vs2.3.2.5/d
lo->lo_backing_file = file;
lo->transfer = transfer_none;
lo->ioctl = NULL;
-@@ -1021,6 +1023,7 @@ static int loop_clr_fd(struct loop_devic
+@@ -1026,6 +1028,7 @@ static int loop_clr_fd(struct loop_devic
lo->lo_encrypt_key_size = 0;
lo->lo_flags = 0;
lo->lo_thread = NULL;
@@ -1002,7 +1002,7 @@ diff -NurpP --minimal linux-3.0.67/drivers/block/loop.c linux-3.0.67-vs2.3.2.5/d
memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
memset(lo->lo_file_name, 0, LO_NAME_SIZE);
-@@ -1059,7 +1062,7 @@ loop_set_status(struct loop_device *lo,
+@@ -1066,7 +1069,7 @@ loop_set_status(struct loop_device *lo,
if (lo->lo_encrypt_key_size &&
lo->lo_key_owner != uid &&
@@ -1011,7 +1011,7 @@ diff -NurpP --minimal linux-3.0.67/drivers/block/loop.c linux-3.0.67-vs2.3.2.5/d
return -EPERM;
if (lo->lo_state != Lo_bound)
return -ENXIO;
-@@ -1143,7 +1146,8 @@ loop_get_status(struct loop_device *lo,
+@@ -1150,7 +1153,8 @@ loop_get_status(struct loop_device *lo,
memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
info->lo_encrypt_type =
lo->lo_encryption ? lo->lo_encryption->number : 0;
@@ -1021,7 +1021,7 @@ diff -NurpP --minimal linux-3.0.67/drivers/block/loop.c linux-3.0.67-vs2.3.2.5/d
info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
lo->lo_encrypt_key_size);
-@@ -1489,6 +1493,9 @@ static int lo_open(struct block_device *
+@@ -1494,6 +1498,9 @@ static int lo_open(struct block_device *
{
struct loop_device *lo = bdev->bd_disk->private_data;
@@ -1031,9 +1031,9 @@ diff -NurpP --minimal linux-3.0.67/drivers/block/loop.c linux-3.0.67-vs2.3.2.5/d
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-3.0.67/drivers/block/vroot.c linux-3.0.67-vs2.3.2.5/drivers/block/vroot.c
---- linux-3.0.67/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/drivers/block/vroot.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/drivers/block/vroot.c linux-3.0.101-vs2.3.2.5/drivers/block/vroot.c
+--- linux-3.0.101/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/block/vroot.c 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,292 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -1327,9 +1327,319 @@ diff -NurpP --minimal linux-3.0.67/drivers/block/vroot.c linux-3.0.67-vs2.3.2.5/
+
+#endif
+
-diff -NurpP --minimal linux-3.0.67/drivers/infiniband/Kconfig linux-3.0.67-vs2.3.2.5/drivers/infiniband/Kconfig
---- linux-3.0.67/drivers/infiniband/Kconfig 2011-07-22 09:17:45.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/drivers/infiniband/Kconfig 2012-02-15 04:19:42.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/drivers/gpu/drm/radeon/r100_reg_safe.h linux-3.0.101-vs2.3.2.5/drivers/gpu/drm/radeon/r100_reg_safe.h
+--- linux-3.0.101/drivers/gpu/drm/radeon/r100_reg_safe.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/gpu/drm/radeon/r100_reg_safe.h 2011-06-10 20:11:24.000000000 +0000
+@@ -0,0 +1,28 @@
++static const unsigned r100_reg_safe_bm[102] = {
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
++ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
++ 0xFFFFFFCF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFF9F, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0x38E7FE1F, 0xFFC3FF8E, 0x7FF8FFFF, 0xFFFF803C,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEFFFF, 0xFFFFFFFF,
++ 0x00000000, 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFCFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFEF,
++};
+diff -NurpP --minimal linux-3.0.101/drivers/gpu/drm/radeon/r200_reg_safe.h linux-3.0.101-vs2.3.2.5/drivers/gpu/drm/radeon/r200_reg_safe.h
+--- linux-3.0.101/drivers/gpu/drm/radeon/r200_reg_safe.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/gpu/drm/radeon/r200_reg_safe.h 2011-06-10 20:11:24.000000000 +0000
+@@ -0,0 +1,28 @@
++static const unsigned r200_reg_safe_bm[102] = {
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
++ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFE7FE1F, 0xF003FFFF, 0x7EFFFFFF, 0xFFFF803C,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFEFCE, 0xFFFEFFFF, 0xFFFFFFFE,
++ 0x020E0FF0, 0xFFCC83FD, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFBFFFF, 0xEFFCFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xDFDFDFDF, 0x3FFDDFDF, 0xFFFFFFFF, 0xFFFFFF7F,
++ 0xFFFFFFFF, 0x00FFFFFF, 0x00000000, 0x00000000,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFE3F, 0xFFFFFFEF,
++};
+diff -NurpP --minimal linux-3.0.101/drivers/gpu/drm/radeon/r300_reg_safe.h linux-3.0.101-vs2.3.2.5/drivers/gpu/drm/radeon/r300_reg_safe.h
+--- linux-3.0.101/drivers/gpu/drm/radeon/r300_reg_safe.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/gpu/drm/radeon/r300_reg_safe.h 2011-06-10 20:11:24.000000000 +0000
+@@ -0,0 +1,42 @@
++static const unsigned r300_reg_safe_bm[159] = {
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
++ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000,
++ 0xF0000078, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFC78, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF,
++ 0x38FF8F50, 0xFFF88082, 0xF000000C, 0xFAE009FF,
++ 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
++ 0x00000000, 0x0000C100, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0xFFFF0000, 0xFFFFFFFF, 0xFF80FFFF,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x0003FC01, 0xFFFFFCF8, 0xFF800B19,
++};
+diff -NurpP --minimal linux-3.0.101/drivers/gpu/drm/radeon/r420_reg_safe.h linux-3.0.101-vs2.3.2.5/drivers/gpu/drm/radeon/r420_reg_safe.h
+--- linux-3.0.101/drivers/gpu/drm/radeon/r420_reg_safe.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/gpu/drm/radeon/r420_reg_safe.h 2011-06-10 20:11:24.000000000 +0000
+@@ -0,0 +1,42 @@
++static const unsigned r420_reg_safe_bm[159] = {
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
++ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000,
++ 0xF0000078, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFC78, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF,
++ 0x38FF8F50, 0xFFF88082, 0xF000000C, 0xFAE009FF,
++ 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
++ 0x00000000, 0x00000100, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0xFF800000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x0003FC01, 0xFFFFFCF8, 0xFF800B19,
++};
+diff -NurpP --minimal linux-3.0.101/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-3.0.101-vs2.3.2.5/drivers/gpu/drm/radeon/rn50_reg_safe.h
+--- linux-3.0.101/drivers/gpu/drm/radeon/rn50_reg_safe.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/gpu/drm/radeon/rn50_reg_safe.h 2011-06-10 20:11:24.000000000 +0000
+@@ -0,0 +1,28 @@
++static const unsigned rn50_reg_safe_bm[102] = {
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
++ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF,
++};
+diff -NurpP --minimal linux-3.0.101/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-3.0.101-vs2.3.2.5/drivers/gpu/drm/radeon/rs600_reg_safe.h
+--- linux-3.0.101/drivers/gpu/drm/radeon/rs600_reg_safe.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/gpu/drm/radeon/rs600_reg_safe.h 2011-06-10 20:11:24.000000000 +0000
+@@ -0,0 +1,57 @@
++static const unsigned rs600_reg_safe_bm[219] = {
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
++ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000,
++ 0xF0000078, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFC78, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF,
++ 0x38FF8F50, 0xFFF88082, 0xF000000C, 0xFAE009FF,
++ 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
++ 0x00000000, 0x00000100, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x00000000, 0x00000000, 0x00000000, 0xFF800000,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x0003FC01, 0xFFFFFCF8, 0xFF800B19, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++};
+diff -NurpP --minimal linux-3.0.101/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-3.0.101-vs2.3.2.5/drivers/gpu/drm/radeon/rv515_reg_safe.h
+--- linux-3.0.101/drivers/gpu/drm/radeon/rv515_reg_safe.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/gpu/drm/radeon/rv515_reg_safe.h 2011-06-10 20:11:24.000000000 +0000
+@@ -0,0 +1,57 @@
++static const unsigned rv515_reg_safe_bm[219] = {
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
++ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000,
++ 0xF0000038, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0x1FFFF878, 0xFFFFE000, 0xFFFFFE1E, 0xFFFFFFFF,
++ 0x388F8F50, 0xFFF88082, 0xFF0000FC, 0xFAE009FF,
++ 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
++ 0xFFFF8CFC, 0xFFFFC1FF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFF80FFFF,
++ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++ 0x0003FC01, 0x3FFFFCF8, 0xFF800B19, 0xFFDFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
++};
+diff -NurpP --minimal linux-3.0.101/drivers/infiniband/Kconfig linux-3.0.101-vs2.3.2.5/drivers/infiniband/Kconfig
+--- linux-3.0.101/drivers/infiniband/Kconfig 2011-07-22 09:17:45.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/infiniband/Kconfig 2012-02-15 04:19:42.000000000 +0000
@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
config INFINIBAND_ADDR_TRANS
bool
@@ -1339,9 +1649,9 @@ diff -NurpP --minimal linux-3.0.67/drivers/infiniband/Kconfig linux-3.0.67-vs2.3
default y
source "drivers/infiniband/hw/mthca/Kconfig"
-diff -NurpP --minimal linux-3.0.67/drivers/infiniband/core/addr.c linux-3.0.67-vs2.3.2.5/drivers/infiniband/core/addr.c
---- linux-3.0.67/drivers/infiniband/core/addr.c 2013-03-02 15:23:38.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/drivers/infiniband/core/addr.c 2012-02-15 04:20:43.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/drivers/infiniband/core/addr.c linux-3.0.101-vs2.3.2.5/drivers/infiniband/core/addr.c
+--- linux-3.0.101/drivers/infiniband/core/addr.c 2013-10-22 12:14:11.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/infiniband/core/addr.c 2012-02-15 04:20:43.000000000 +0000
@@ -254,7 +254,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl6.saddr)) {
@@ -1351,9 +1661,9 @@ diff -NurpP --minimal linux-3.0.67/drivers/infiniband/core/addr.c linux-3.0.67-v
if (ret)
goto put;
-diff -NurpP --minimal linux-3.0.67/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-3.0.67-vs2.3.2.5/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-3.0.67/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-05-22 14:17:16.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-3.0.101-vs2.3.2.5/drivers/infiniband/hw/ipath/ipath_user_pages.c
+--- linux-3.0.101/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-05-22 14:17:16.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-06-10 20:11:24.000000000 +0000
@@ -35,6 +35,7 @@
#include <linux/device.h>
#include <linux/slab.h>
@@ -1362,9 +1672,9 @@ diff -NurpP --minimal linux-3.0.67/drivers/infiniband/hw/ipath/ipath_user_pages.
#include "ipath_kernel.h"
-diff -NurpP --minimal linux-3.0.67/drivers/md/dm-ioctl.c linux-3.0.67-vs2.3.2.5/drivers/md/dm-ioctl.c
---- linux-3.0.67/drivers/md/dm-ioctl.c 2013-03-02 15:23:39.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/drivers/md/dm-ioctl.c 2013-02-11 23:46:00.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/drivers/md/dm-ioctl.c linux-3.0.101-vs2.3.2.5/drivers/md/dm-ioctl.c
+--- linux-3.0.101/drivers/md/dm-ioctl.c 2013-10-22 12:14:12.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/md/dm-ioctl.c 2013-02-11 23:46:00.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
@@ -1446,9 +1756,9 @@ diff -NurpP --minimal linux-3.0.67/drivers/md/dm-ioctl.c linux-3.0.67-vs2.3.2.5/
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.0.67/drivers/md/dm.c linux-3.0.67-vs2.3.2.5/drivers/md/dm.c
---- linux-3.0.67/drivers/md/dm.c 2013-03-02 15:23:39.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/drivers/md/dm.c 2012-12-08 00:58:08.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/drivers/md/dm.c linux-3.0.101-vs2.3.2.5/drivers/md/dm.c
+--- linux-3.0.101/drivers/md/dm.c 2013-10-22 12:14:12.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/md/dm.c 2012-12-08 00:58:08.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
@@ -1522,9 +1832,9 @@ diff -NurpP --minimal linux-3.0.67/drivers/md/dm.c linux-3.0.67-vs2.3.2.5/driver
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-3.0.67/drivers/md/dm.h linux-3.0.67-vs2.3.2.5/drivers/md/dm.h
---- linux-3.0.67/drivers/md/dm.h 2011-05-22 14:17:18.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/drivers/md/dm.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/drivers/md/dm.h linux-3.0.101-vs2.3.2.5/drivers/md/dm.h
+--- linux-3.0.101/drivers/md/dm.h 2011-05-22 14:17:18.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/md/dm.h 2011-06-10 20:11:24.000000000 +0000
@@ -41,6 +41,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
@@ -1534,9 +1844,9 @@ diff -NurpP --minimal linux-3.0.67/drivers/md/dm.h linux-3.0.67-vs2.3.2.5/driver
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.0.67/drivers/net/tun.c linux-3.0.67-vs2.3.2.5/drivers/net/tun.c
---- linux-3.0.67/drivers/net/tun.c 2013-03-02 15:23:45.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/drivers/net/tun.c 2012-09-01 09:37:46.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/drivers/net/tun.c linux-3.0.101-vs2.3.2.5/drivers/net/tun.c
+--- linux-3.0.101/drivers/net/tun.c 2013-10-22 12:14:17.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/net/tun.c 2013-10-22 12:25:41.000000000 +0000
@@ -64,6 +64,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
@@ -1553,7 +1863,7 @@ diff -NurpP --minimal linux-3.0.67/drivers/net/tun.c linux-3.0.67-vs2.3.2.5/driv
struct net_device *dev;
u32 set_features;
-@@ -905,6 +907,7 @@ static void tun_setup(struct net_device
+@@ -909,6 +911,7 @@ static void tun_setup(struct net_device
tun->owner = -1;
tun->group = -1;
@@ -1561,7 +1871,7 @@ diff -NurpP --minimal linux-3.0.67/drivers/net/tun.c linux-3.0.67-vs2.3.2.5/driv
dev->ethtool_ops = &tun_ethtool_ops;
dev->destructor = tun_free_netdev;
-@@ -1055,7 +1058,7 @@ static int tun_set_iff(struct net *net,
+@@ -1059,7 +1062,7 @@ static int tun_set_iff(struct net *net,
if (((tun->owner != -1 && cred->euid != tun->owner) ||
(tun->group != -1 && !in_egroup_p(tun->group))) &&
@@ -1570,7 +1880,7 @@ diff -NurpP --minimal linux-3.0.67/drivers/net/tun.c linux-3.0.67-vs2.3.2.5/driv
return -EPERM;
err = security_tun_dev_attach(tun->socket.sk);
if (err < 0)
-@@ -1069,7 +1072,7 @@ static int tun_set_iff(struct net *net,
+@@ -1073,7 +1076,7 @@ static int tun_set_iff(struct net *net,
char *name;
unsigned long flags = 0;
@@ -1579,7 +1889,7 @@ diff -NurpP --minimal linux-3.0.67/drivers/net/tun.c linux-3.0.67-vs2.3.2.5/driv
return -EPERM;
err = security_tun_dev_create();
if (err < 0)
-@@ -1137,6 +1140,9 @@ static int tun_set_iff(struct net *net,
+@@ -1141,6 +1144,9 @@ static int tun_set_iff(struct net *net,
sk->sk_destruct = tun_sock_destruct;
@@ -1589,7 +1899,7 @@ diff -NurpP --minimal linux-3.0.67/drivers/net/tun.c linux-3.0.67-vs2.3.2.5/driv
err = tun_attach(tun, file);
if (err < 0)
goto failed;
-@@ -1320,6 +1326,16 @@ static long __tun_chr_ioctl(struct file
+@@ -1324,6 +1330,16 @@ static long __tun_chr_ioctl(struct file
tun_debug(KERN_INFO, tun, "group set to %d\n", tun->group);
break;
@@ -1606,9 +1916,9 @@ diff -NurpP --minimal linux-3.0.67/drivers/net/tun.c linux-3.0.67-vs2.3.2.5/driv
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.0.67/drivers/tty/sysrq.c linux-3.0.67-vs2.3.2.5/drivers/tty/sysrq.c
---- linux-3.0.67/drivers/tty/sysrq.c 2011-05-22 14:17:44.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/drivers/tty/sysrq.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/drivers/tty/sysrq.c linux-3.0.101-vs2.3.2.5/drivers/tty/sysrq.c
+--- linux-3.0.101/drivers/tty/sysrq.c 2011-05-22 14:17:44.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/tty/sysrq.c 2011-06-10 20:11:24.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/oom.h>
#include <linux/slab.h>
@@ -1660,9 +1970,9 @@ diff -NurpP --minimal linux-3.0.67/drivers/tty/sysrq.c linux-3.0.67-vs2.3.2.5/dr
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-3.0.67/drivers/tty/tty_io.c linux-3.0.67-vs2.3.2.5/drivers/tty/tty_io.c
---- linux-3.0.67/drivers/tty/tty_io.c 2013-03-02 15:23:51.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/drivers/tty/tty_io.c 2011-11-15 16:37:05.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/drivers/tty/tty_io.c linux-3.0.101-vs2.3.2.5/drivers/tty/tty_io.c
+--- linux-3.0.101/drivers/tty/tty_io.c 2013-10-22 12:14:26.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/drivers/tty/tty_io.c 2013-05-13 18:25:05.000000000 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
@@ -1671,7 +1981,7 @@ diff -NurpP --minimal linux-3.0.67/drivers/tty/tty_io.c linux-3.0.67-vs2.3.2.5/d
#undef TTY_DEBUG_HANGUP
-@@ -2080,7 +2081,8 @@ static int tiocsti(struct tty_struct *tt
+@@ -2090,7 +2091,8 @@ static int tiocsti(struct tty_struct *tt
char ch, mbz = 0;
struct tty_ldisc *ld;
@@ -1681,7 +1991,7 @@ diff -NurpP --minimal linux-3.0.67/drivers/tty/tty_io.c linux-3.0.67-vs2.3.2.5/d
return -EPERM;
if (get_user(ch, p))
return -EFAULT;
-@@ -2368,6 +2370,7 @@ static int tiocspgrp(struct tty_struct *
+@@ -2378,6 +2380,7 @@ static int tiocspgrp(struct tty_struct *
return -ENOTTY;
if (get_user(pgrp_nr, p))
return -EFAULT;
@@ -1689,9 +1999,9 @@ diff -NurpP --minimal linux-3.0.67/drivers/tty/tty_io.c linux-3.0.67-vs2.3.2.5/d
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-3.0.67/fs/attr.c linux-3.0.67-vs2.3.2.5/fs/attr.c
---- linux-3.0.67/fs/attr.c 2011-07-22 09:18:05.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/attr.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/attr.c linux-3.0.101-vs2.3.2.5/fs/attr.c
+--- linux-3.0.101/fs/attr.c 2011-07-22 09:18:05.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/attr.c 2011-06-10 20:11:24.000000000 +0000
@@ -13,6 +13,9 @@
#include <linux/fsnotify.h>
#include <linux/fcntl.h>
@@ -1732,9 +2042,9 @@ diff -NurpP --minimal linux-3.0.67/fs/attr.c linux-3.0.67-vs2.3.2.5/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-3.0.67/fs/binfmt_aout.c linux-3.0.67-vs2.3.2.5/fs/binfmt_aout.c
---- linux-3.0.67/fs/binfmt_aout.c 2010-10-21 11:07:47.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/binfmt_aout.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/binfmt_aout.c linux-3.0.101-vs2.3.2.5/fs/binfmt_aout.c
+--- linux-3.0.101/fs/binfmt_aout.c 2010-10-21 11:07:47.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/binfmt_aout.c 2011-06-10 20:11:24.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/init.h>
#include <linux/coredump.h>
@@ -1743,9 +2053,9 @@ diff -NurpP --minimal linux-3.0.67/fs/binfmt_aout.c linux-3.0.67-vs2.3.2.5/fs/bi
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.0.67/fs/binfmt_elf.c linux-3.0.67-vs2.3.2.5/fs/binfmt_elf.c
---- linux-3.0.67/fs/binfmt_elf.c 2013-03-02 15:23:54.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/binfmt_elf.c 2012-10-20 17:57:21.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/binfmt_elf.c linux-3.0.101-vs2.3.2.5/fs/binfmt_elf.c
+--- linux-3.0.101/fs/binfmt_elf.c 2013-10-22 12:14:30.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/binfmt_elf.c 2012-10-20 17:57:21.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/elf.h>
#include <linux/utsname.h>
@@ -1754,9 +2064,9 @@ diff -NurpP --minimal linux-3.0.67/fs/binfmt_elf.c linux-3.0.67-vs2.3.2.5/fs/bin
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-3.0.67/fs/binfmt_flat.c linux-3.0.67-vs2.3.2.5/fs/binfmt_flat.c
---- linux-3.0.67/fs/binfmt_flat.c 2011-07-22 09:18:05.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/binfmt_flat.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/binfmt_flat.c linux-3.0.101-vs2.3.2.5/fs/binfmt_flat.c
+--- linux-3.0.101/fs/binfmt_flat.c 2011-07-22 09:18:05.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/binfmt_flat.c 2011-06-10 20:11:24.000000000 +0000
@@ -35,6 +35,7 @@
#include <linux/init.h>
#include <linux/flat.h>
@@ -1765,9 +2075,9 @@ diff -NurpP --minimal linux-3.0.67/fs/binfmt_flat.c linux-3.0.67-vs2.3.2.5/fs/bi
#include <asm/byteorder.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-3.0.67/fs/binfmt_som.c linux-3.0.67-vs2.3.2.5/fs/binfmt_som.c
---- linux-3.0.67/fs/binfmt_som.c 2010-02-25 10:52:04.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/binfmt_som.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/binfmt_som.c linux-3.0.101-vs2.3.2.5/fs/binfmt_som.c
+--- linux-3.0.101/fs/binfmt_som.c 2010-02-25 10:52:04.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/binfmt_som.c 2011-06-10 20:11:24.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/personality.h>
@@ -1776,9 +2086,9 @@ diff -NurpP --minimal linux-3.0.67/fs/binfmt_som.c linux-3.0.67-vs2.3.2.5/fs/bin
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.0.67/fs/block_dev.c linux-3.0.67-vs2.3.2.5/fs/block_dev.c
---- linux-3.0.67/fs/block_dev.c 2013-03-02 15:23:54.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/block_dev.c 2012-06-08 13:28:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/block_dev.c linux-3.0.101-vs2.3.2.5/fs/block_dev.c
+--- linux-3.0.101/fs/block_dev.c 2013-10-22 12:14:30.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/block_dev.c 2013-08-13 17:02:28.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
@@ -1787,7 +2097,7 @@ diff -NurpP --minimal linux-3.0.67/fs/block_dev.c linux-3.0.67-vs2.3.2.5/fs/bloc
#include <asm/uaccess.h>
#include "internal.h"
-@@ -553,6 +554,7 @@ struct block_device *bdget(dev_t dev)
+@@ -561,6 +562,7 @@ struct block_device *bdget(dev_t dev)
bdev->bd_invalidated = 0;
inode->i_mode = S_IFBLK;
inode->i_rdev = dev;
@@ -1795,7 +2105,7 @@ diff -NurpP --minimal linux-3.0.67/fs/block_dev.c linux-3.0.67-vs2.3.2.5/fs/bloc
inode->i_bdev = bdev;
inode->i_data.a_ops = &def_blk_aops;
mapping_set_gfp_mask(&inode->i_data, GFP_USER);
-@@ -599,6 +601,11 @@ EXPORT_SYMBOL(bdput);
+@@ -608,6 +610,11 @@ EXPORT_SYMBOL(bdput);
static struct block_device *bd_acquire(struct inode *inode)
{
struct block_device *bdev;
@@ -1807,7 +2117,7 @@ diff -NurpP --minimal linux-3.0.67/fs/block_dev.c linux-3.0.67-vs2.3.2.5/fs/bloc
spin_lock(&bdev_lock);
bdev = inode->i_bdev;
-@@ -609,7 +616,7 @@ static struct block_device *bd_acquire(s
+@@ -618,7 +625,7 @@ static struct block_device *bd_acquire(s
}
spin_unlock(&bdev_lock);
@@ -1816,9 +2126,9 @@ diff -NurpP --minimal linux-3.0.67/fs/block_dev.c linux-3.0.67-vs2.3.2.5/fs/bloc
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.0.67/fs/btrfs/ctree.h linux-3.0.67-vs2.3.2.5/fs/btrfs/ctree.h
---- linux-3.0.67/fs/btrfs/ctree.h 2013-03-02 15:23:54.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/btrfs/ctree.h 2012-06-08 13:28:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/btrfs/ctree.h linux-3.0.101-vs2.3.2.5/fs/btrfs/ctree.h
+--- linux-3.0.101/fs/btrfs/ctree.h 2013-10-22 12:14:30.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/btrfs/ctree.h 2012-06-08 13:28:24.000000000 +0000
@@ -600,11 +600,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
@@ -1871,9 +2181,9 @@ diff -NurpP --minimal linux-3.0.67/fs/btrfs/ctree.h linux-3.0.67-vs2.3.2.5/fs/bt
int btrfs_defrag_file(struct inode *inode, struct file *file,
struct btrfs_ioctl_defrag_range_args *range,
u64 newer_than, unsigned long max_pages);
-diff -NurpP --minimal linux-3.0.67/fs/btrfs/disk-io.c linux-3.0.67-vs2.3.2.5/fs/btrfs/disk-io.c
---- linux-3.0.67/fs/btrfs/disk-io.c 2013-03-02 15:23:54.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/btrfs/disk-io.c 2012-09-01 09:37:47.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/btrfs/disk-io.c linux-3.0.101-vs2.3.2.5/fs/btrfs/disk-io.c
+--- linux-3.0.101/fs/btrfs/disk-io.c 2013-10-22 12:14:30.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/btrfs/disk-io.c 2012-09-01 09:37:47.000000000 +0000
@@ -1766,6 +1766,9 @@ struct btrfs_root *open_ctree(struct sup
goto fail_alloc;
}
@@ -1884,9 +2194,9 @@ diff -NurpP --minimal linux-3.0.67/fs/btrfs/disk-io.c linux-3.0.67-vs2.3.2.5/fs/
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-3.0.67/fs/btrfs/inode.c linux-3.0.67-vs2.3.2.5/fs/btrfs/inode.c
---- linux-3.0.67/fs/btrfs/inode.c 2013-03-02 15:23:54.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/btrfs/inode.c 2011-10-18 11:51:13.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/btrfs/inode.c linux-3.0.101-vs2.3.2.5/fs/btrfs/inode.c
+--- linux-3.0.101/fs/btrfs/inode.c 2013-10-22 12:14:30.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/btrfs/inode.c 2011-10-18 11:51:13.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/falloc.h>
#include <linux/slab.h>
@@ -1960,9 +2270,9 @@ diff -NurpP --minimal linux-3.0.67/fs/btrfs/inode.c linux-3.0.67-vs2.3.2.5/fs/bt
};
static const struct inode_operations btrfs_special_inode_operations = {
.getattr = btrfs_getattr,
-diff -NurpP --minimal linux-3.0.67/fs/btrfs/ioctl.c linux-3.0.67-vs2.3.2.5/fs/btrfs/ioctl.c
---- linux-3.0.67/fs/btrfs/ioctl.c 2011-07-22 09:18:05.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/btrfs/ioctl.c 2011-06-22 10:39:15.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/btrfs/ioctl.c linux-3.0.101-vs2.3.2.5/fs/btrfs/ioctl.c
+--- linux-3.0.101/fs/btrfs/ioctl.c 2013-10-22 12:14:30.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/btrfs/ioctl.c 2013-06-13 10:45:20.000000000 +0000
@@ -70,10 +70,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
@@ -2136,9 +2446,9 @@ diff -NurpP --minimal linux-3.0.67/fs/btrfs/ioctl.c linux-3.0.67-vs2.3.2.5/fs/bt
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-3.0.67/fs/btrfs/super.c linux-3.0.67-vs2.3.2.5/fs/btrfs/super.c
---- linux-3.0.67/fs/btrfs/super.c 2011-07-22 09:18:05.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/btrfs/super.c 2011-07-18 22:44:39.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/btrfs/super.c linux-3.0.101-vs2.3.2.5/fs/btrfs/super.c
+--- linux-3.0.101/fs/btrfs/super.c 2011-07-22 09:18:05.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/btrfs/super.c 2011-07-18 22:44:39.000000000 +0000
@@ -162,7 +162,7 @@ enum {
Opt_notreelog, Opt_ratio, Opt_flushoncommit, Opt_discard,
Opt_space_cache, Opt_clear_cache, Opt_user_subvol_rm_allowed,
@@ -2194,9 +2504,9 @@ diff -NurpP --minimal linux-3.0.67/fs/btrfs/super.c linux-3.0.67-vs2.3.2.5/fs/bt
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
-diff -NurpP --minimal linux-3.0.67/fs/char_dev.c linux-3.0.67-vs2.3.2.5/fs/char_dev.c
---- linux-3.0.67/fs/char_dev.c 2011-03-15 17:07:31.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/char_dev.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/char_dev.c linux-3.0.101-vs2.3.2.5/fs/char_dev.c
+--- linux-3.0.101/fs/char_dev.c 2011-03-15 17:07:31.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/char_dev.c 2011-06-10 20:11:24.000000000 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
@@ -2229,9 +2539,9 @@ diff -NurpP --minimal linux-3.0.67/fs/char_dev.c linux-3.0.67-vs2.3.2.5/fs/char_
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.0.67/fs/dcache.c linux-3.0.67-vs2.3.2.5/fs/dcache.c
---- linux-3.0.67/fs/dcache.c 2013-03-02 15:23:55.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/dcache.c 2012-10-20 17:57:21.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/dcache.c linux-3.0.101-vs2.3.2.5/fs/dcache.c
+--- linux-3.0.101/fs/dcache.c 2013-10-22 12:14:31.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/dcache.c 2013-10-22 12:25:41.000000000 +0000
@@ -36,6 +36,7 @@
#include <linux/bit_spinlock.h>
#include <linux/rculist_bl.h>
@@ -2283,9 +2593,9 @@ diff -NurpP --minimal linux-3.0.67/fs/dcache.c linux-3.0.67-vs2.3.2.5/fs/dcache.
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-3.0.67/fs/devpts/inode.c linux-3.0.67-vs2.3.2.5/fs/devpts/inode.c
---- linux-3.0.67/fs/devpts/inode.c 2011-05-22 14:17:50.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/devpts/inode.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/devpts/inode.c linux-3.0.101-vs2.3.2.5/fs/devpts/inode.c
+--- linux-3.0.101/fs/devpts/inode.c 2011-05-22 14:17:50.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/devpts/inode.c 2011-06-10 20:11:24.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
@@ -2377,9 +2687,9 @@ diff -NurpP --minimal linux-3.0.67/fs/devpts/inode.c linux-3.0.67-vs2.3.2.5/fs/d
inode->i_private = tty;
tty->driver_data = inode;
-diff -NurpP --minimal linux-3.0.67/fs/ext2/balloc.c linux-3.0.67-vs2.3.2.5/fs/ext2/balloc.c
---- linux-3.0.67/fs/ext2/balloc.c 2011-05-22 14:17:51.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext2/balloc.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext2/balloc.c linux-3.0.101-vs2.3.2.5/fs/ext2/balloc.c
+--- linux-3.0.101/fs/ext2/balloc.c 2011-05-22 14:17:51.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext2/balloc.c 2011-06-10 20:11:24.000000000 +0000
@@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
@@ -2388,9 +2698,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext2/balloc.c linux-3.0.67-vs2.3.2.5/fs/ex
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-3.0.67/fs/ext2/ext2.h linux-3.0.67-vs2.3.2.5/fs/ext2/ext2.h
---- linux-3.0.67/fs/ext2/ext2.h 2011-05-22 14:17:51.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext2/ext2.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext2/ext2.h linux-3.0.101-vs2.3.2.5/fs/ext2/ext2.h
+--- linux-3.0.101/fs/ext2/ext2.h 2011-05-22 14:17:51.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext2/ext2.h 2011-06-10 20:11:24.000000000 +0000
@@ -126,6 +126,7 @@ extern void ext2_set_inode_flags(struct
extern void ext2_get_inode_flags(struct ext2_inode_info *);
extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
@@ -2399,18 +2709,18 @@ diff -NurpP --minimal linux-3.0.67/fs/ext2/ext2.h linux-3.0.67-vs2.3.2.5/fs/ext2
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.0.67/fs/ext2/file.c linux-3.0.67-vs2.3.2.5/fs/ext2/file.c
---- linux-3.0.67/fs/ext2/file.c 2010-08-02 14:52:48.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext2/file.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext2/file.c linux-3.0.101-vs2.3.2.5/fs/ext2/file.c
+--- linux-3.0.101/fs/ext2/file.c 2010-08-02 14:52:48.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext2/file.c 2011-06-10 20:11:24.000000000 +0000
@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
.setattr = ext2_setattr,
.check_acl = ext2_check_acl,
.fiemap = ext2_fiemap,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-3.0.67/fs/ext2/ialloc.c linux-3.0.67-vs2.3.2.5/fs/ext2/ialloc.c
---- linux-3.0.67/fs/ext2/ialloc.c 2011-05-22 14:17:51.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext2/ialloc.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext2/ialloc.c linux-3.0.101-vs2.3.2.5/fs/ext2/ialloc.c
+--- linux-3.0.101/fs/ext2/ialloc.c 2011-05-22 14:17:51.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext2/ialloc.c 2011-06-10 20:11:24.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
@@ -2427,9 +2737,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext2/ialloc.c linux-3.0.67-vs2.3.2.5/fs/ex
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.0.67/fs/ext2/inode.c linux-3.0.67-vs2.3.2.5/fs/ext2/inode.c
---- linux-3.0.67/fs/ext2/inode.c 2011-05-22 14:17:51.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext2/inode.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext2/inode.c linux-3.0.101-vs2.3.2.5/fs/ext2/inode.c
+--- linux-3.0.101/fs/ext2/inode.c 2011-05-22 14:17:51.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext2/inode.c 2011-06-10 20:11:24.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/mpage.h>
#include <linux/fiemap.h>
@@ -2578,9 +2888,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext2/inode.c linux-3.0.67-vs2.3.2.5/fs/ext
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-3.0.67/fs/ext2/ioctl.c linux-3.0.67-vs2.3.2.5/fs/ext2/ioctl.c
---- linux-3.0.67/fs/ext2/ioctl.c 2011-05-22 14:17:51.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext2/ioctl.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext2/ioctl.c linux-3.0.101-vs2.3.2.5/fs/ext2/ioctl.c
+--- linux-3.0.101/fs/ext2/ioctl.c 2011-05-22 14:17:51.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext2/ioctl.c 2011-06-10 20:11:24.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
@@ -2630,9 +2940,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext2/ioctl.c linux-3.0.67-vs2.3.2.5/fs/ext
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
mutex_unlock(&inode->i_mutex);
-diff -NurpP --minimal linux-3.0.67/fs/ext2/namei.c linux-3.0.67-vs2.3.2.5/fs/ext2/namei.c
---- linux-3.0.67/fs/ext2/namei.c 2011-05-22 14:17:51.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext2/namei.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext2/namei.c linux-3.0.101-vs2.3.2.5/fs/ext2/namei.c
+--- linux-3.0.101/fs/ext2/namei.c 2011-05-22 14:17:51.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext2/namei.c 2011-06-10 20:11:24.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
@@ -2657,9 +2967,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext2/namei.c linux-3.0.67-vs2.3.2.5/fs/ext
};
const struct inode_operations ext2_special_inode_operations = {
-diff -NurpP --minimal linux-3.0.67/fs/ext2/super.c linux-3.0.67-vs2.3.2.5/fs/ext2/super.c
---- linux-3.0.67/fs/ext2/super.c 2011-07-22 09:18:05.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext2/super.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext2/super.c linux-3.0.101-vs2.3.2.5/fs/ext2/super.c
+--- linux-3.0.101/fs/ext2/super.c 2011-07-22 09:18:05.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext2/super.c 2011-06-10 20:11:24.000000000 +0000
@@ -394,7 +394,8 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
@@ -2725,9 +3035,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext2/super.c linux-3.0.67-vs2.3.2.5/fs/ext
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.0.67/fs/ext3/file.c linux-3.0.67-vs2.3.2.5/fs/ext3/file.c
---- linux-3.0.67/fs/ext3/file.c 2010-07-07 16:31:51.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext3/file.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext3/file.c linux-3.0.101-vs2.3.2.5/fs/ext3/file.c
+--- linux-3.0.101/fs/ext3/file.c 2010-07-07 16:31:51.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext3/file.c 2011-06-10 20:11:24.000000000 +0000
@@ -81,5 +81,6 @@ const struct inode_operations ext3_file_
#endif
.check_acl = ext3_check_acl,
@@ -2735,9 +3045,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext3/file.c linux-3.0.67-vs2.3.2.5/fs/ext3
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-3.0.67/fs/ext3/ialloc.c linux-3.0.67-vs2.3.2.5/fs/ext3/ialloc.c
---- linux-3.0.67/fs/ext3/ialloc.c 2013-03-02 15:23:55.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext3/ialloc.c 2012-06-08 13:28:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext3/ialloc.c linux-3.0.101-vs2.3.2.5/fs/ext3/ialloc.c
+--- linux-3.0.101/fs/ext3/ialloc.c 2013-10-22 12:14:31.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext3/ialloc.c 2012-06-08 13:28:24.000000000 +0000
@@ -23,6 +23,7 @@
#include <linux/buffer_head.h>
#include <linux/random.h>
@@ -2754,9 +3064,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext3/ialloc.c linux-3.0.67-vs2.3.2.5/fs/ex
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.0.67/fs/ext3/inode.c linux-3.0.67-vs2.3.2.5/fs/ext3/inode.c
---- linux-3.0.67/fs/ext3/inode.c 2013-03-02 15:23:55.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext3/inode.c 2012-09-16 16:24:54.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext3/inode.c linux-3.0.101-vs2.3.2.5/fs/ext3/inode.c
+--- linux-3.0.101/fs/ext3/inode.c 2013-10-22 12:14:31.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext3/inode.c 2012-09-16 16:24:54.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/bio.h>
#include <linux/fiemap.h>
@@ -2940,9 +3250,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext3/inode.c linux-3.0.67-vs2.3.2.5/fs/ext
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.0.67/fs/ext3/ioctl.c linux-3.0.67-vs2.3.2.5/fs/ext3/ioctl.c
---- linux-3.0.67/fs/ext3/ioctl.c 2011-05-22 14:17:52.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext3/ioctl.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext3/ioctl.c linux-3.0.101-vs2.3.2.5/fs/ext3/ioctl.c
+--- linux-3.0.101/fs/ext3/ioctl.c 2011-05-22 14:17:52.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext3/ioctl.c 2011-06-10 20:11:24.000000000 +0000
@@ -8,6 +8,7 @@
*/
@@ -3018,9 +3328,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext3/ioctl.c linux-3.0.67-vs2.3.2.5/fs/ext
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.0.67/fs/ext3/namei.c linux-3.0.67-vs2.3.2.5/fs/ext3/namei.c
---- linux-3.0.67/fs/ext3/namei.c 2013-03-02 15:23:55.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext3/namei.c 2011-08-29 01:45:09.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext3/namei.c linux-3.0.101-vs2.3.2.5/fs/ext3/namei.c
+--- linux-3.0.101/fs/ext3/namei.c 2013-10-22 12:14:31.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext3/namei.c 2013-08-13 17:02:28.000000000 +0000
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3029,7 +3339,7 @@ diff -NurpP --minimal linux-3.0.67/fs/ext3/namei.c linux-3.0.67-vs2.3.2.5/fs/ext
#include "namei.h"
#include "xattr.h"
-@@ -923,6 +924,7 @@ restart:
+@@ -920,6 +921,7 @@ restart:
if (bh)
ll_rw_block(READ_META, 1, &bh);
}
@@ -3037,7 +3347,7 @@ diff -NurpP --minimal linux-3.0.67/fs/ext3/namei.c linux-3.0.67-vs2.3.2.5/fs/ext
}
if ((bh = bh_use[ra_ptr++]) == NULL)
goto next;
-@@ -2536,6 +2538,7 @@ const struct inode_operations ext3_dir_i
+@@ -2533,6 +2535,7 @@ const struct inode_operations ext3_dir_i
.removexattr = generic_removexattr,
#endif
.check_acl = ext3_check_acl,
@@ -3045,9 +3355,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext3/namei.c linux-3.0.67-vs2.3.2.5/fs/ext
};
const struct inode_operations ext3_special_inode_operations = {
-diff -NurpP --minimal linux-3.0.67/fs/ext3/super.c linux-3.0.67-vs2.3.2.5/fs/ext3/super.c
---- linux-3.0.67/fs/ext3/super.c 2011-07-22 09:18:05.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext3/super.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext3/super.c linux-3.0.101-vs2.3.2.5/fs/ext3/super.c
+--- linux-3.0.101/fs/ext3/super.c 2013-10-22 12:14:31.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext3/super.c 2013-05-13 18:25:05.000000000 +0000
@@ -821,7 +821,8 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
@@ -3114,9 +3424,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext3/super.c linux-3.0.67-vs2.3.2.5/fs/ext
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.0.67/fs/ext4/ext4.h linux-3.0.67-vs2.3.2.5/fs/ext4/ext4.h
---- linux-3.0.67/fs/ext4/ext4.h 2013-03-02 15:23:55.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext4/ext4.h 2012-09-01 09:37:48.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext4/ext4.h linux-3.0.101-vs2.3.2.5/fs/ext4/ext4.h
+--- linux-3.0.101/fs/ext4/ext4.h 2013-10-22 12:14:31.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext4/ext4.h 2013-05-13 18:25:05.000000000 +0000
@@ -351,8 +351,12 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
@@ -3164,9 +3474,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext4/ext4.h linux-3.0.67-vs2.3.2.5/fs/ext4
/* move_extent.c */
extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
__u64 start_orig, __u64 start_donor,
-diff -NurpP --minimal linux-3.0.67/fs/ext4/file.c linux-3.0.67-vs2.3.2.5/fs/ext4/file.c
---- linux-3.0.67/fs/ext4/file.c 2011-07-22 09:18:05.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext4/file.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext4/file.c linux-3.0.101-vs2.3.2.5/fs/ext4/file.c
+--- linux-3.0.101/fs/ext4/file.c 2011-07-22 09:18:05.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext4/file.c 2011-06-10 20:11:24.000000000 +0000
@@ -282,5 +282,6 @@ const struct inode_operations ext4_file_
#endif
.check_acl = ext4_check_acl,
@@ -3174,8 +3484,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext4/file.c linux-3.0.67-vs2.3.2.5/fs/ext4
+ .sync_flags = ext4_sync_flags,
};
---- linux-3.0.91/fs/ext4/ialloc.c~ 2013-08-17 00:56:44.000000000 +0300
-+++ linux-3.0.91/fs/ext4/ialloc.c 2013-08-18 12:56:42.440436248 +0300
+diff -NurpP --minimal linux-3.0.101/fs/ext4/ialloc.c linux-3.0.101-vs2.3.2.5/fs/ext4/ialloc.c
+--- linux-3.0.101/fs/ext4/ialloc.c 2013-10-22 12:14:32.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext4/ialloc.c 2013-05-13 18:25:32.000000000 +0000
@@ -23,6 +23,7 @@
#include <linux/bitops.h>
#include <linux/blkdev.h>
@@ -3184,7 +3495,7 @@ diff -NurpP --minimal linux-3.0.67/fs/ext4/file.c linux-3.0.67-vs2.3.2.5/fs/ext4
#include <asm/byteorder.h>
#include "ext4.h"
-@@ -532,6 +533,7 @@ got:
+@@ -993,6 +994,7 @@ got:
inode->i_mode = mode;
inode->i_uid = current_fsuid();
inode->i_gid = dir->i_gid;
@@ -3192,9 +3503,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext4/file.c linux-3.0.67-vs2.3.2.5/fs/ext4
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.0.67/fs/ext4/inode.c linux-3.0.67-vs2.3.2.5/fs/ext4/inode.c
---- linux-3.0.67/fs/ext4/inode.c 2013-03-02 15:23:55.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext4/inode.c 2013-02-11 23:46:00.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext4/inode.c linux-3.0.101-vs2.3.2.5/fs/ext4/inode.c
+--- linux-3.0.101/fs/ext4/inode.c 2013-10-22 12:14:32.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext4/inode.c 2013-08-13 17:02:28.000000000 +0000
@@ -42,6 +42,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
@@ -3372,9 +3683,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext4/inode.c linux-3.0.67-vs2.3.2.5/fs/ext
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.0.67/fs/ext4/ioctl.c linux-3.0.67-vs2.3.2.5/fs/ext4/ioctl.c
---- linux-3.0.67/fs/ext4/ioctl.c 2013-03-02 15:23:55.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext4/ioctl.c 2012-06-22 17:02:22.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext4/ioctl.c linux-3.0.101-vs2.3.2.5/fs/ext4/ioctl.c
+--- linux-3.0.101/fs/ext4/ioctl.c 2013-10-22 12:14:32.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext4/ioctl.c 2012-06-22 17:02:22.000000000 +0000
@@ -14,10 +14,39 @@
#include <linux/compat.h>
#include <linux/mount.h>
@@ -3438,9 +3749,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext4/ioctl.c linux-3.0.67-vs2.3.2.5/fs/ext
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-3.0.67/fs/ext4/namei.c linux-3.0.67-vs2.3.2.5/fs/ext4/namei.c
---- linux-3.0.67/fs/ext4/namei.c 2013-03-02 15:23:55.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext4/namei.c 2012-10-20 17:57:22.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext4/namei.c linux-3.0.101-vs2.3.2.5/fs/ext4/namei.c
+--- linux-3.0.101/fs/ext4/namei.c 2013-10-22 12:14:32.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext4/namei.c 2013-10-22 12:25:41.000000000 +0000
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3449,7 +3760,7 @@ diff -NurpP --minimal linux-3.0.67/fs/ext4/namei.c linux-3.0.67-vs2.3.2.5/fs/ext
#include "ext4.h"
#include "ext4_jbd2.h"
-@@ -924,6 +925,7 @@ restart:
+@@ -921,6 +922,7 @@ restart:
if (bh)
ll_rw_block(READ_META, 1, &bh);
}
@@ -3457,7 +3768,7 @@ diff -NurpP --minimal linux-3.0.67/fs/ext4/namei.c linux-3.0.67-vs2.3.2.5/fs/ext
}
if ((bh = bh_use[ra_ptr++]) == NULL)
goto next;
-@@ -2596,6 +2598,7 @@ const struct inode_operations ext4_dir_i
+@@ -2594,6 +2596,7 @@ const struct inode_operations ext4_dir_i
#endif
.check_acl = ext4_check_acl,
.fiemap = ext4_fiemap,
@@ -3465,9 +3776,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext4/namei.c linux-3.0.67-vs2.3.2.5/fs/ext
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.0.67/fs/ext4/super.c linux-3.0.67-vs2.3.2.5/fs/ext4/super.c
---- linux-3.0.67/fs/ext4/super.c 2013-03-02 15:23:55.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ext4/super.c 2013-03-02 15:28:07.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ext4/super.c linux-3.0.101-vs2.3.2.5/fs/ext4/super.c
+--- linux-3.0.101/fs/ext4/super.c 2013-10-22 12:14:32.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ext4/super.c 2013-05-13 18:25:05.000000000 +0000
@@ -1294,6 +1294,7 @@ enum {
Opt_inode_readahead_blks, Opt_journal_ioprio,
Opt_dioread_nolock, Opt_dioread_lock,
@@ -3532,9 +3843,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ext4/super.c linux-3.0.67-vs2.3.2.5/fs/ext
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.0.67/fs/fcntl.c linux-3.0.67-vs2.3.2.5/fs/fcntl.c
---- linux-3.0.67/fs/fcntl.c 2011-05-22 14:17:52.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/fcntl.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/fcntl.c linux-3.0.101-vs2.3.2.5/fs/fcntl.c
+--- linux-3.0.101/fs/fcntl.c 2011-05-22 14:17:52.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/fcntl.c 2011-06-10 20:11:24.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/signal.h>
#include <linux/rcupdate.h>
@@ -3561,9 +3872,9 @@ diff -NurpP --minimal linux-3.0.67/fs/fcntl.c linux-3.0.67-vs2.3.2.5/fs/fcntl.c
if (unlikely(filp->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd)) {
-diff -NurpP --minimal linux-3.0.67/fs/file.c linux-3.0.67-vs2.3.2.5/fs/file.c
---- linux-3.0.67/fs/file.c 2011-05-22 14:17:52.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/file.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/file.c linux-3.0.101-vs2.3.2.5/fs/file.c
+--- linux-3.0.101/fs/file.c 2011-05-22 14:17:52.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/file.c 2011-06-10 20:11:24.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -3589,9 +3900,9 @@ diff -NurpP --minimal linux-3.0.67/fs/file.c linux-3.0.67-vs2.3.2.5/fs/file.c
#if 1
/* Sanity check */
if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
-diff -NurpP --minimal linux-3.0.67/fs/file_table.c linux-3.0.67-vs2.3.2.5/fs/file_table.c
---- linux-3.0.67/fs/file_table.c 2011-05-22 14:17:52.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/file_table.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/file_table.c linux-3.0.101-vs2.3.2.5/fs/file_table.c
+--- linux-3.0.101/fs/file_table.c 2011-05-22 14:17:52.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/file_table.c 2011-06-10 20:11:24.000000000 +0000
@@ -24,6 +24,8 @@
#include <linux/percpu_counter.h>
#include <linux/percpu.h>
@@ -3628,9 +3939,9 @@ diff -NurpP --minimal linux-3.0.67/fs/file_table.c linux-3.0.67-vs2.3.2.5/fs/fil
file_sb_list_del(file);
file_free(file);
}
-diff -NurpP --minimal linux-3.0.67/fs/fs_struct.c linux-3.0.67-vs2.3.2.5/fs/fs_struct.c
---- linux-3.0.67/fs/fs_struct.c 2011-03-15 17:07:31.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/fs_struct.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/fs_struct.c linux-3.0.101-vs2.3.2.5/fs/fs_struct.c
+--- linux-3.0.101/fs/fs_struct.c 2011-03-15 17:07:31.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/fs_struct.c 2011-06-10 20:11:24.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -3655,9 +3966,9 @@ diff -NurpP --minimal linux-3.0.67/fs/fs_struct.c linux-3.0.67-vs2.3.2.5/fs/fs_s
}
return fs;
}
-diff -NurpP --minimal linux-3.0.67/fs/gfs2/file.c linux-3.0.67-vs2.3.2.5/fs/gfs2/file.c
---- linux-3.0.67/fs/gfs2/file.c 2011-07-22 09:18:05.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/gfs2/file.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/gfs2/file.c linux-3.0.101-vs2.3.2.5/fs/gfs2/file.c
+--- linux-3.0.101/fs/gfs2/file.c 2011-07-22 09:18:05.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/gfs2/file.c 2011-06-10 20:11:24.000000000 +0000
@@ -134,6 +134,9 @@ static const u32 fsflags_to_gfs2[32] = {
[7] = GFS2_DIF_NOATIME,
[12] = GFS2_DIF_EXHASH,
@@ -3778,9 +4089,9 @@ diff -NurpP --minimal linux-3.0.67/fs/gfs2/file.c linux-3.0.67-vs2.3.2.5/fs/gfs2
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-3.0.67/fs/gfs2/inode.h linux-3.0.67-vs2.3.2.5/fs/gfs2/inode.h
---- linux-3.0.67/fs/gfs2/inode.h 2011-07-22 09:18:05.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/gfs2/inode.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/gfs2/inode.h linux-3.0.101-vs2.3.2.5/fs/gfs2/inode.h
+--- linux-3.0.101/fs/gfs2/inode.h 2011-07-22 09:18:05.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/gfs2/inode.h 2011-06-10 20:11:24.000000000 +0000
@@ -120,6 +120,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
@@ -3789,9 +4100,9 @@ diff -NurpP --minimal linux-3.0.67/fs/gfs2/inode.h linux-3.0.67-vs2.3.2.5/fs/gfs
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-3.0.67/fs/inode.c linux-3.0.67-vs2.3.2.5/fs/inode.c
---- linux-3.0.67/fs/inode.c 2011-07-22 09:18:05.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/inode.c 2011-07-01 09:35:34.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/inode.c linux-3.0.101-vs2.3.2.5/fs/inode.c
+--- linux-3.0.101/fs/inode.c 2011-07-22 09:18:05.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/inode.c 2011-07-01 09:35:34.000000000 +0000
@@ -26,6 +26,7 @@
#include <linux/ima.h>
#include <linux/cred.h>
@@ -3847,9 +4158,9 @@ diff -NurpP --minimal linux-3.0.67/fs/inode.c linux-3.0.67-vs2.3.2.5/fs/inode.c
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-3.0.67/fs/ioctl.c linux-3.0.67-vs2.3.2.5/fs/ioctl.c
---- linux-3.0.67/fs/ioctl.c 2011-05-22 14:17:52.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ioctl.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ioctl.c linux-3.0.101-vs2.3.2.5/fs/ioctl.c
+--- linux-3.0.101/fs/ioctl.c 2011-05-22 14:17:52.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ioctl.c 2011-06-10 20:11:24.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -3860,9 +4171,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ioctl.c linux-3.0.67-vs2.3.2.5/fs/ioctl.c
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-3.0.67/fs/ioprio.c linux-3.0.67-vs2.3.2.5/fs/ioprio.c
---- linux-3.0.67/fs/ioprio.c 2011-01-05 20:50:24.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ioprio.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ioprio.c linux-3.0.101-vs2.3.2.5/fs/ioprio.c
+--- linux-3.0.101/fs/ioprio.c 2011-01-05 20:50:24.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ioprio.c 2011-06-10 20:11:24.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
@@ -3889,9 +4200,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ioprio.c linux-3.0.67-vs2.3.2.5/fs/ioprio.
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-3.0.67/fs/jfs/file.c linux-3.0.67-vs2.3.2.5/fs/jfs/file.c
---- linux-3.0.67/fs/jfs/file.c 2011-07-22 09:18:05.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/jfs/file.c 2011-07-01 09:35:34.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/jfs/file.c linux-3.0.101-vs2.3.2.5/fs/jfs/file.c
+--- linux-3.0.101/fs/jfs/file.c 2011-07-22 09:18:05.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/jfs/file.c 2011-07-01 09:35:34.000000000 +0000
@@ -102,7 +102,8 @@ int jfs_setattr(struct dentry *dentry, s
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
@@ -3910,9 +4221,9 @@ diff -NurpP --minimal linux-3.0.67/fs/jfs/file.c linux-3.0.67-vs2.3.2.5/fs/jfs/f
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.0.67/fs/jfs/ioctl.c linux-3.0.67-vs2.3.2.5/fs/jfs/ioctl.c
---- linux-3.0.67/fs/jfs/ioctl.c 2011-05-22 14:17:52.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/jfs/ioctl.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/jfs/ioctl.c linux-3.0.101-vs2.3.2.5/fs/jfs/ioctl.c
+--- linux-3.0.101/fs/jfs/ioctl.c 2011-05-22 14:17:52.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/jfs/ioctl.c 2011-06-10 20:11:24.000000000 +0000
@@ -11,6 +11,7 @@
#include <linux/mount.h>
#include <linux/time.h>
@@ -3970,9 +4281,9 @@ diff -NurpP --minimal linux-3.0.67/fs/jfs/ioctl.c linux-3.0.67-vs2.3.2.5/fs/jfs/
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-3.0.67/fs/jfs/jfs_dinode.h linux-3.0.67-vs2.3.2.5/fs/jfs/jfs_dinode.h
---- linux-3.0.67/fs/jfs/jfs_dinode.h 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/jfs/jfs_dinode.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/jfs/jfs_dinode.h linux-3.0.101-vs2.3.2.5/fs/jfs/jfs_dinode.h
+--- linux-3.0.101/fs/jfs/jfs_dinode.h 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/jfs/jfs_dinode.h 2011-06-10 20:11:24.000000000 +0000
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
@@ -3989,9 +4300,9 @@ diff -NurpP --minimal linux-3.0.67/fs/jfs/jfs_dinode.h linux-3.0.67-vs2.3.2.5/fs
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-3.0.67/fs/jfs/jfs_filsys.h linux-3.0.67-vs2.3.2.5/fs/jfs/jfs_filsys.h
---- linux-3.0.67/fs/jfs/jfs_filsys.h 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/jfs/jfs_filsys.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/jfs/jfs_filsys.h linux-3.0.101-vs2.3.2.5/fs/jfs/jfs_filsys.h
+--- linux-3.0.101/fs/jfs/jfs_filsys.h 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/jfs/jfs_filsys.h 2011-06-10 20:11:24.000000000 +0000
@@ -263,6 +263,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
@@ -4000,9 +4311,9 @@ diff -NurpP --minimal linux-3.0.67/fs/jfs/jfs_filsys.h linux-3.0.67-vs2.3.2.5/fs
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-3.0.67/fs/jfs/jfs_imap.c linux-3.0.67-vs2.3.2.5/fs/jfs/jfs_imap.c
---- linux-3.0.67/fs/jfs/jfs_imap.c 2011-07-22 09:18:05.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/jfs/jfs_imap.c 2011-07-01 09:35:34.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/jfs/jfs_imap.c linux-3.0.101-vs2.3.2.5/fs/jfs/jfs_imap.c
+--- linux-3.0.101/fs/jfs/jfs_imap.c 2011-07-22 09:18:05.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/jfs/jfs_imap.c 2011-07-01 09:35:34.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
@@ -4062,9 +4373,9 @@ diff -NurpP --minimal linux-3.0.67/fs/jfs/jfs_imap.c linux-3.0.67-vs2.3.2.5/fs/j
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-3.0.67/fs/jfs/jfs_inode.c linux-3.0.67-vs2.3.2.5/fs/jfs/jfs_inode.c
---- linux-3.0.67/fs/jfs/jfs_inode.c 2010-08-02 14:52:49.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/jfs/jfs_inode.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/jfs/jfs_inode.c linux-3.0.101-vs2.3.2.5/fs/jfs/jfs_inode.c
+--- linux-3.0.101/fs/jfs/jfs_inode.c 2010-08-02 14:52:49.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/jfs/jfs_inode.c 2011-06-10 20:11:24.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -4138,9 +4449,9 @@ diff -NurpP --minimal linux-3.0.67/fs/jfs/jfs_inode.c linux-3.0.67-vs2.3.2.5/fs/
}
/*
-diff -NurpP --minimal linux-3.0.67/fs/jfs/jfs_inode.h linux-3.0.67-vs2.3.2.5/fs/jfs/jfs_inode.h
---- linux-3.0.67/fs/jfs/jfs_inode.h 2011-07-22 09:18:05.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/jfs/jfs_inode.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/jfs/jfs_inode.h linux-3.0.101-vs2.3.2.5/fs/jfs/jfs_inode.h
+--- linux-3.0.101/fs/jfs/jfs_inode.h 2011-07-22 09:18:05.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/jfs/jfs_inode.h 2011-06-10 20:11:24.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);
@@ -4149,9 +4460,9 @@ diff -NurpP --minimal linux-3.0.67/fs/jfs/jfs_inode.h linux-3.0.67-vs2.3.2.5/fs/
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern int jfs_setattr(struct dentry *, struct iattr *);
-diff -NurpP --minimal linux-3.0.67/fs/jfs/namei.c linux-3.0.67-vs2.3.2.5/fs/jfs/namei.c
---- linux-3.0.67/fs/jfs/namei.c 2011-05-22 14:17:53.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/jfs/namei.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/jfs/namei.c linux-3.0.101-vs2.3.2.5/fs/jfs/namei.c
+--- linux-3.0.101/fs/jfs/namei.c 2011-05-22 14:17:53.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/jfs/namei.c 2011-06-10 20:11:24.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
@@ -4176,9 +4487,9 @@ diff -NurpP --minimal linux-3.0.67/fs/jfs/namei.c linux-3.0.67-vs2.3.2.5/fs/jfs/
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.0.67/fs/jfs/super.c linux-3.0.67-vs2.3.2.5/fs/jfs/super.c
---- linux-3.0.67/fs/jfs/super.c 2011-05-22 14:17:53.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/jfs/super.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/jfs/super.c linux-3.0.101-vs2.3.2.5/fs/jfs/super.c
+--- linux-3.0.101/fs/jfs/super.c 2011-05-22 14:17:53.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/jfs/super.c 2011-06-10 20:11:24.000000000 +0000
@@ -198,7 +198,8 @@ static void jfs_put_super(struct super_b
enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
@@ -4244,9 +4555,9 @@ diff -NurpP --minimal linux-3.0.67/fs/jfs/super.c linux-3.0.67-vs2.3.2.5/fs/jfs/
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-3.0.67/fs/libfs.c linux-3.0.67-vs2.3.2.5/fs/libfs.c
---- linux-3.0.67/fs/libfs.c 2011-07-22 09:18:05.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/libfs.c 2011-07-22 09:20:39.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/libfs.c linux-3.0.101-vs2.3.2.5/fs/libfs.c
+--- linux-3.0.101/fs/libfs.c 2011-07-22 09:18:05.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/libfs.c 2011-07-22 09:20:39.000000000 +0000
@@ -133,7 +133,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
@@ -4292,9 +4603,9 @@ diff -NurpP --minimal linux-3.0.67/fs/libfs.c linux-3.0.67-vs2.3.2.5/fs/libfs.c
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(mount_pseudo);
EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-3.0.67/fs/locks.c linux-3.0.67-vs2.3.2.5/fs/locks.c
---- linux-3.0.67/fs/locks.c 2013-03-02 15:23:55.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/locks.c 2012-09-01 09:37:48.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/locks.c linux-3.0.101-vs2.3.2.5/fs/locks.c
+--- linux-3.0.101/fs/locks.c 2013-10-22 12:14:33.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/locks.c 2012-09-01 09:37:48.000000000 +0000
@@ -126,6 +126,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
@@ -4484,9 +4795,9 @@ diff -NurpP --minimal linux-3.0.67/fs/locks.c linux-3.0.67-vs2.3.2.5/fs/locks.c
return 0;
}
-diff -NurpP --minimal linux-3.0.67/fs/namei.c linux-3.0.67-vs2.3.2.5/fs/namei.c
---- linux-3.0.67/fs/namei.c 2013-03-02 15:23:55.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/namei.c 2012-03-23 13:54:00.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/namei.c linux-3.0.101-vs2.3.2.5/fs/namei.c
+--- linux-3.0.101/fs/namei.c 2013-10-22 12:14:33.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/namei.c 2012-03-23 13:54:00.000000000 +0000
@@ -32,6 +32,14 @@
#include <linux/fcntl.h>
#include <linux/device_cgroup.h>
@@ -4952,9 +5263,9 @@ diff -NurpP --minimal linux-3.0.67/fs/namei.c linux-3.0.67-vs2.3.2.5/fs/namei.c
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-diff -NurpP --minimal linux-3.0.67/fs/namespace.c linux-3.0.67-vs2.3.2.5/fs/namespace.c
---- linux-3.0.67/fs/namespace.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/namespace.c 2012-06-22 17:02:22.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/namespace.c linux-3.0.101-vs2.3.2.5/fs/namespace.c
+--- linux-3.0.101/fs/namespace.c 2013-10-22 12:14:34.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/namespace.c 2012-06-22 17:02:22.000000000 +0000
@@ -31,6 +31,11 @@
#include <linux/idr.h>
#include <linux/fs_struct.h>
@@ -5275,9 +5586,9 @@ diff -NurpP --minimal linux-3.0.67/fs/namespace.c linux-3.0.67-vs2.3.2.5/fs/name
kfree(ns);
}
EXPORT_SYMBOL(put_mnt_ns);
-diff -NurpP --minimal linux-3.0.67/fs/nfs/client.c linux-3.0.67-vs2.3.2.5/fs/nfs/client.c
---- linux-3.0.67/fs/nfs/client.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/nfs/client.c 2013-01-16 00:11:18.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/nfs/client.c linux-3.0.101-vs2.3.2.5/fs/nfs/client.c
+--- linux-3.0.101/fs/nfs/client.c 2013-10-22 12:14:34.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/nfs/client.c 2013-01-16 00:11:18.000000000 +0000
@@ -779,6 +779,9 @@ static int nfs_init_server_rpcclient(str
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
@@ -5299,9 +5610,9 @@ diff -NurpP --minimal linux-3.0.67/fs/nfs/client.c linux-3.0.67-vs2.3.2.5/fs/nfs
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.0.67/fs/nfs/dir.c linux-3.0.67-vs2.3.2.5/fs/nfs/dir.c
---- linux-3.0.67/fs/nfs/dir.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/nfs/dir.c 2013-01-16 00:11:18.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/nfs/dir.c linux-3.0.101-vs2.3.2.5/fs/nfs/dir.c
+--- linux-3.0.101/fs/nfs/dir.c 2013-10-22 12:14:34.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/nfs/dir.c 2013-01-16 00:11:18.000000000 +0000
@@ -35,6 +35,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
@@ -5318,9 +5629,9 @@ diff -NurpP --minimal linux-3.0.67/fs/nfs/dir.c linux-3.0.67-vs2.3.2.5/fs/nfs/di
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-3.0.67/fs/nfs/inode.c linux-3.0.67-vs2.3.2.5/fs/nfs/inode.c
---- linux-3.0.67/fs/nfs/inode.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/nfs/inode.c 2012-10-20 17:57:22.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/nfs/inode.c linux-3.0.101-vs2.3.2.5/fs/nfs/inode.c
+--- linux-3.0.101/fs/nfs/inode.c 2013-10-22 12:14:34.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/nfs/inode.c 2012-10-20 17:57:22.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/nfs_xdr.h>
#include <linux/slab.h>
@@ -5472,9 +5783,9 @@ diff -NurpP --minimal linux-3.0.67/fs/nfs/inode.c linux-3.0.67-vs2.3.2.5/fs/nfs/
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-3.0.67/fs/nfs/nfs3xdr.c linux-3.0.67-vs2.3.2.5/fs/nfs/nfs3xdr.c
---- linux-3.0.67/fs/nfs/nfs3xdr.c 2011-03-15 17:07:32.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/nfs/nfs3xdr.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/nfs/nfs3xdr.c linux-3.0.101-vs2.3.2.5/fs/nfs/nfs3xdr.c
+--- linux-3.0.101/fs/nfs/nfs3xdr.c 2011-03-15 17:07:32.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/nfs/nfs3xdr.c 2011-06-10 20:11:24.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -5620,9 +5931,9 @@ diff -NurpP --minimal linux-3.0.67/fs/nfs/nfs3xdr.c linux-3.0.67-vs2.3.2.5/fs/nf
}
/*
-diff -NurpP --minimal linux-3.0.67/fs/nfs/super.c linux-3.0.67-vs2.3.2.5/fs/nfs/super.c
---- linux-3.0.67/fs/nfs/super.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/nfs/super.c 2013-01-16 00:11:18.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/nfs/super.c linux-3.0.101-vs2.3.2.5/fs/nfs/super.c
+--- linux-3.0.101/fs/nfs/super.c 2013-10-22 12:14:36.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/nfs/super.c 2013-01-16 00:11:18.000000000 +0000
@@ -53,6 +53,7 @@
#include <linux/nfs_xdr.h>
#include <linux/magic.h>
@@ -5694,9 +6005,9 @@ diff -NurpP --minimal linux-3.0.67/fs/nfs/super.c linux-3.0.67-vs2.3.2.5/fs/nfs/
/*
* options that take text values
-diff -NurpP --minimal linux-3.0.67/fs/nfsd/auth.c linux-3.0.67-vs2.3.2.5/fs/nfsd/auth.c
---- linux-3.0.67/fs/nfsd/auth.c 2010-02-25 10:52:05.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/nfsd/auth.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/nfsd/auth.c linux-3.0.101-vs2.3.2.5/fs/nfsd/auth.c
+--- linux-3.0.101/fs/nfsd/auth.c 2010-02-25 10:52:05.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/nfsd/auth.c 2011-06-10 20:11:24.000000000 +0000
@@ -1,6 +1,7 @@
/* Copyright (C) 1995, 1996 Olaf Kirch <okir at monad.swb.de> */
@@ -5715,9 +6026,9 @@ diff -NurpP --minimal linux-3.0.67/fs/nfsd/auth.c linux-3.0.67-vs2.3.2.5/fs/nfsd
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-3.0.67/fs/nfsd/nfs3xdr.c linux-3.0.67-vs2.3.2.5/fs/nfsd/nfs3xdr.c
---- linux-3.0.67/fs/nfsd/nfs3xdr.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/nfsd/nfs3xdr.c 2012-06-08 13:28:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/nfsd/nfs3xdr.c linux-3.0.101-vs2.3.2.5/fs/nfsd/nfs3xdr.c
+--- linux-3.0.101/fs/nfsd/nfs3xdr.c 2013-10-22 12:14:36.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/nfsd/nfs3xdr.c 2012-06-08 13:28:24.000000000 +0000
@@ -7,6 +7,7 @@
*/
@@ -5768,9 +6079,9 @@ diff -NurpP --minimal linux-3.0.67/fs/nfsd/nfs3xdr.c linux-3.0.67-vs2.3.2.5/fs/n
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-3.0.67/fs/nfsd/nfs4xdr.c linux-3.0.67-vs2.3.2.5/fs/nfsd/nfs4xdr.c
---- linux-3.0.67/fs/nfsd/nfs4xdr.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/nfsd/nfs4xdr.c 2013-01-16 00:11:18.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/nfsd/nfs4xdr.c linux-3.0.101-vs2.3.2.5/fs/nfsd/nfs4xdr.c
+--- linux-3.0.101/fs/nfsd/nfs4xdr.c 2013-10-22 12:14:36.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/nfsd/nfs4xdr.c 2013-07-14 13:47:14.000000000 +0000
@@ -45,6 +45,7 @@
#include <linux/statfs.h>
#include <linux/utsname.h>
@@ -5779,7 +6090,7 @@ diff -NurpP --minimal linux-3.0.67/fs/nfsd/nfs4xdr.c linux-3.0.67-vs2.3.2.5/fs/n
#include "idmap.h"
#include "acl.h"
-@@ -2102,14 +2103,18 @@ out_acl:
+@@ -2096,14 +2097,18 @@ out_acl:
WRITE32(stat.nlink);
}
if (bmval1 & FATTR4_WORD1_OWNER) {
@@ -5800,9 +6111,9 @@ diff -NurpP --minimal linux-3.0.67/fs/nfsd/nfs4xdr.c linux-3.0.67-vs2.3.2.5/fs/n
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-3.0.67/fs/nfsd/nfsxdr.c linux-3.0.67-vs2.3.2.5/fs/nfsd/nfsxdr.c
---- linux-3.0.67/fs/nfsd/nfsxdr.c 2011-05-22 14:17:53.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/nfsd/nfsxdr.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/nfsd/nfsxdr.c linux-3.0.101-vs2.3.2.5/fs/nfsd/nfsxdr.c
+--- linux-3.0.101/fs/nfsd/nfsxdr.c 2011-05-22 14:17:53.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/nfsd/nfsxdr.c 2011-06-10 20:11:24.000000000 +0000
@@ -6,6 +6,7 @@
#include "xdr.h"
@@ -5851,9 +6162,9 @@ diff -NurpP --minimal linux-3.0.67/fs/nfsd/nfsxdr.c linux-3.0.67-vs2.3.2.5/fs/nf
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.0.67/fs/ocfs2/dlmglue.c linux-3.0.67-vs2.3.2.5/fs/ocfs2/dlmglue.c
---- linux-3.0.67/fs/ocfs2/dlmglue.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ocfs2/dlmglue.c 2013-03-02 15:28:07.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ocfs2/dlmglue.c linux-3.0.101-vs2.3.2.5/fs/ocfs2/dlmglue.c
+--- linux-3.0.101/fs/ocfs2/dlmglue.c 2013-10-22 12:14:38.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ocfs2/dlmglue.c 2013-03-02 15:28:07.000000000 +0000
@@ -2041,6 +2041,7 @@ static void __ocfs2_stuff_meta_lvb(struc
lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
lvb->lvb_iuid = cpu_to_be32(inode->i_uid);
@@ -5870,9 +6181,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ocfs2/dlmglue.c linux-3.0.67-vs2.3.2.5/fs/
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
inode->i_nlink = be16_to_cpu(lvb->lvb_inlink);
ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-3.0.67/fs/ocfs2/dlmglue.h linux-3.0.67-vs2.3.2.5/fs/ocfs2/dlmglue.h
---- linux-3.0.67/fs/ocfs2/dlmglue.h 2010-10-21 11:07:50.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ocfs2/dlmglue.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ocfs2/dlmglue.h linux-3.0.101-vs2.3.2.5/fs/ocfs2/dlmglue.h
+--- linux-3.0.101/fs/ocfs2/dlmglue.h 2010-10-21 11:07:50.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ocfs2/dlmglue.h 2011-06-10 20:11:24.000000000 +0000
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
@@ -5883,9 +6194,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ocfs2/dlmglue.h linux-3.0.67-vs2.3.2.5/fs/
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.0.67/fs/ocfs2/file.c linux-3.0.67-vs2.3.2.5/fs/ocfs2/file.c
---- linux-3.0.67/fs/ocfs2/file.c 2011-07-22 09:18:06.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ocfs2/file.c 2011-06-10 20:43:33.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ocfs2/file.c linux-3.0.101-vs2.3.2.5/fs/ocfs2/file.c
+--- linux-3.0.101/fs/ocfs2/file.c 2011-07-22 09:18:06.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ocfs2/file.c 2011-06-10 20:43:33.000000000 +0000
@@ -1111,7 +1111,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
@@ -5895,9 +6206,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ocfs2/file.c linux-3.0.67-vs2.3.2.5/fs/ocf
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-3.0.67/fs/ocfs2/inode.c linux-3.0.67-vs2.3.2.5/fs/ocfs2/inode.c
---- linux-3.0.67/fs/ocfs2/inode.c 2011-05-22 14:17:53.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ocfs2/inode.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ocfs2/inode.c linux-3.0.101-vs2.3.2.5/fs/ocfs2/inode.c
+--- linux-3.0.101/fs/ocfs2/inode.c 2011-05-22 14:17:53.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ocfs2/inode.c 2011-06-10 20:11:24.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
@@ -5994,9 +6305,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ocfs2/inode.c linux-3.0.67-vs2.3.2.5/fs/oc
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
-diff -NurpP --minimal linux-3.0.67/fs/ocfs2/inode.h linux-3.0.67-vs2.3.2.5/fs/ocfs2/inode.h
---- linux-3.0.67/fs/ocfs2/inode.h 2011-01-05 20:50:26.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ocfs2/inode.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ocfs2/inode.h linux-3.0.101-vs2.3.2.5/fs/ocfs2/inode.h
+--- linux-3.0.101/fs/ocfs2/inode.h 2011-01-05 20:50:26.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ocfs2/inode.h 2011-06-10 20:11:24.000000000 +0000
@@ -151,6 +151,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
@@ -6005,9 +6316,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ocfs2/inode.h linux-3.0.67-vs2.3.2.5/fs/oc
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-3.0.67/fs/ocfs2/ioctl.c linux-3.0.67-vs2.3.2.5/fs/ocfs2/ioctl.c
---- linux-3.0.67/fs/ocfs2/ioctl.c 2011-07-22 09:18:06.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ocfs2/ioctl.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ocfs2/ioctl.c linux-3.0.101-vs2.3.2.5/fs/ocfs2/ioctl.c
+--- linux-3.0.101/fs/ocfs2/ioctl.c 2011-07-22 09:18:06.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ocfs2/ioctl.c 2011-06-10 20:11:24.000000000 +0000
@@ -78,7 +78,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
@@ -6071,9 +6382,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ocfs2/ioctl.c linux-3.0.67-vs2.3.2.5/fs/oc
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = filp->f_path.dentry->d_inode;
-diff -NurpP --minimal linux-3.0.67/fs/ocfs2/namei.c linux-3.0.67-vs2.3.2.5/fs/ocfs2/namei.c
---- linux-3.0.67/fs/ocfs2/namei.c 2011-05-22 14:17:53.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ocfs2/namei.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ocfs2/namei.c linux-3.0.101-vs2.3.2.5/fs/ocfs2/namei.c
+--- linux-3.0.101/fs/ocfs2/namei.c 2011-05-22 14:17:53.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ocfs2/namei.c 2011-06-10 20:11:24.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
@@ -6104,9 +6415,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ocfs2/namei.c linux-3.0.67-vs2.3.2.5/fs/oc
fe->i_mode = cpu_to_le16(inode->i_mode);
if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
-diff -NurpP --minimal linux-3.0.67/fs/ocfs2/ocfs2.h linux-3.0.67-vs2.3.2.5/fs/ocfs2/ocfs2.h
---- linux-3.0.67/fs/ocfs2/ocfs2.h 2011-05-22 14:17:53.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ocfs2/ocfs2.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ocfs2/ocfs2.h linux-3.0.101-vs2.3.2.5/fs/ocfs2/ocfs2.h
+--- linux-3.0.101/fs/ocfs2/ocfs2.h 2011-05-22 14:17:53.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ocfs2/ocfs2.h 2011-06-10 20:11:24.000000000 +0000
@@ -272,6 +272,7 @@ enum ocfs2_mount_options
writes */
OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
@@ -6115,9 +6426,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ocfs2/ocfs2.h linux-3.0.67-vs2.3.2.5/fs/oc
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-3.0.67/fs/ocfs2/ocfs2_fs.h linux-3.0.67-vs2.3.2.5/fs/ocfs2/ocfs2_fs.h
---- linux-3.0.67/fs/ocfs2/ocfs2_fs.h 2011-05-22 14:17:53.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ocfs2/ocfs2_fs.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ocfs2/ocfs2_fs.h linux-3.0.101-vs2.3.2.5/fs/ocfs2/ocfs2_fs.h
+--- linux-3.0.101/fs/ocfs2/ocfs2_fs.h 2011-05-22 14:17:53.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ocfs2/ocfs2_fs.h 2011-06-10 20:11:24.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 */
@@ -6130,9 +6441,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ocfs2/ocfs2_fs.h linux-3.0.67-vs2.3.2.5/fs
#define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
#define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
-diff -NurpP --minimal linux-3.0.67/fs/ocfs2/super.c linux-3.0.67-vs2.3.2.5/fs/ocfs2/super.c
---- linux-3.0.67/fs/ocfs2/super.c 2011-07-22 09:18:06.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/ocfs2/super.c 2011-06-15 00:40:14.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/ocfs2/super.c linux-3.0.101-vs2.3.2.5/fs/ocfs2/super.c
+--- linux-3.0.101/fs/ocfs2/super.c 2011-07-22 09:18:06.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/ocfs2/super.c 2011-06-15 00:40:14.000000000 +0000
@@ -184,6 +184,7 @@ enum {
Opt_coherency_full,
Opt_resv_level,
@@ -6196,9 +6507,9 @@ diff -NurpP --minimal linux-3.0.67/fs/ocfs2/super.c linux-3.0.67-vs2.3.2.5/fs/oc
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.0.67/fs/open.c linux-3.0.67-vs2.3.2.5/fs/open.c
---- linux-3.0.67/fs/open.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/open.c 2012-09-16 16:24:54.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/open.c linux-3.0.101-vs2.3.2.5/fs/open.c
+--- linux-3.0.101/fs/open.c 2013-10-22 12:14:38.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/open.c 2012-09-16 16:24:54.000000000 +0000
@@ -30,6 +30,11 @@
#include <linux/fs_struct.h>
#include <linux/ima.h>
@@ -6279,9 +6590,9 @@ diff -NurpP --minimal linux-3.0.67/fs/open.c linux-3.0.67-vs2.3.2.5/fs/open.c
}
void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-3.0.67/fs/proc/array.c linux-3.0.67-vs2.3.2.5/fs/proc/array.c
---- linux-3.0.67/fs/proc/array.c 2011-07-22 09:18:06.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/proc/array.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/proc/array.c linux-3.0.101-vs2.3.2.5/fs/proc/array.c
+--- linux-3.0.101/fs/proc/array.c 2011-07-22 09:18:06.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/proc/array.c 2011-06-10 20:11:24.000000000 +0000
@@ -81,6 +81,8 @@
#include <linux/pid_namespace.h>
#include <linux/ptrace.h>
@@ -6395,9 +6706,9 @@ diff -NurpP --minimal linux-3.0.67/fs/proc/array.c linux-3.0.67-vs2.3.2.5/fs/pro
seq_printf(m, "%d (%s) %c %d %d %d %d %d %u %lu \
%lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n",
-diff -NurpP --minimal linux-3.0.67/fs/proc/base.c linux-3.0.67-vs2.3.2.5/fs/proc/base.c
---- linux-3.0.67/fs/proc/base.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/proc/base.c 2012-02-15 04:20:43.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/proc/base.c linux-3.0.101-vs2.3.2.5/fs/proc/base.c
+--- linux-3.0.101/fs/proc/base.c 2013-10-22 12:14:39.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/proc/base.c 2012-02-15 04:20:43.000000000 +0000
@@ -83,6 +83,8 @@
#include <linux/pid_namespace.h>
#include <linux/fs_struct.h>
@@ -6568,9 +6879,9 @@ diff -NurpP --minimal linux-3.0.67/fs/proc/base.c linux-3.0.67-vs2.3.2.5/fs/proc
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-3.0.67/fs/proc/generic.c linux-3.0.67-vs2.3.2.5/fs/proc/generic.c
---- linux-3.0.67/fs/proc/generic.c 2011-07-22 09:18:06.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/proc/generic.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/proc/generic.c linux-3.0.101-vs2.3.2.5/fs/proc/generic.c
+--- linux-3.0.101/fs/proc/generic.c 2011-07-22 09:18:06.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/proc/generic.c 2011-06-10 20:11:24.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
@@ -6630,9 +6941,9 @@ diff -NurpP --minimal linux-3.0.67/fs/proc/generic.c linux-3.0.67-vs2.3.2.5/fs/p
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-3.0.67/fs/proc/inode.c linux-3.0.67-vs2.3.2.5/fs/proc/inode.c
---- linux-3.0.67/fs/proc/inode.c 2011-07-22 09:18:06.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/proc/inode.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/proc/inode.c linux-3.0.101-vs2.3.2.5/fs/proc/inode.c
+--- linux-3.0.101/fs/proc/inode.c 2011-07-22 09:18:06.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/proc/inode.c 2011-06-10 20:11:24.000000000 +0000
@@ -442,6 +442,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
@@ -6642,9 +6953,9 @@ diff -NurpP --minimal linux-3.0.67/fs/proc/inode.c linux-3.0.67-vs2.3.2.5/fs/pro
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-3.0.67/fs/proc/internal.h linux-3.0.67-vs2.3.2.5/fs/proc/internal.h
---- linux-3.0.67/fs/proc/internal.h 2011-07-22 09:18:06.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/proc/internal.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/proc/internal.h linux-3.0.101-vs2.3.2.5/fs/proc/internal.h
+--- linux-3.0.101/fs/proc/internal.h 2011-07-22 09:18:06.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/proc/internal.h 2011-06-10 20:11:24.000000000 +0000
@@ -10,6 +10,7 @@
*/
@@ -6681,9 +6992,9 @@ diff -NurpP --minimal linux-3.0.67/fs/proc/internal.h linux-3.0.67-vs2.3.2.5/fs/
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-3.0.67/fs/proc/loadavg.c linux-3.0.67-vs2.3.2.5/fs/proc/loadavg.c
---- linux-3.0.67/fs/proc/loadavg.c 2009-09-10 13:26:23.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/proc/loadavg.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/proc/loadavg.c linux-3.0.101-vs2.3.2.5/fs/proc/loadavg.c
+--- linux-3.0.101/fs/proc/loadavg.c 2009-09-10 13:26:23.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/proc/loadavg.c 2011-06-10 20:11:24.000000000 +0000
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
@@ -6713,9 +7024,9 @@ diff -NurpP --minimal linux-3.0.67/fs/proc/loadavg.c linux-3.0.67-vs2.3.2.5/fs/p
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-3.0.67/fs/proc/meminfo.c linux-3.0.67-vs2.3.2.5/fs/proc/meminfo.c
---- linux-3.0.67/fs/proc/meminfo.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/proc/meminfo.c 2011-12-23 15:09:00.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/proc/meminfo.c linux-3.0.101-vs2.3.2.5/fs/proc/meminfo.c
+--- linux-3.0.101/fs/proc/meminfo.c 2013-10-22 12:14:39.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/proc/meminfo.c 2011-12-23 15:09:00.000000000 +0000
@@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_
allowed = ((totalram_pages - hugetlb_total_pages())
* sysctl_overcommit_ratio / 100) + total_swap_pages;
@@ -6726,9 +7037,9 @@ diff -NurpP --minimal linux-3.0.67/fs/proc/meminfo.c linux-3.0.67-vs2.3.2.5/fs/p
total_swapcache_pages - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-3.0.67/fs/proc/root.c linux-3.0.67-vs2.3.2.5/fs/proc/root.c
---- linux-3.0.67/fs/proc/root.c 2011-07-22 09:18:06.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/proc/root.c 2011-06-22 10:39:15.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/proc/root.c linux-3.0.101-vs2.3.2.5/fs/proc/root.c
+--- linux-3.0.101/fs/proc/root.c 2011-07-22 09:18:06.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/proc/root.c 2011-06-22 10:39:15.000000000 +0000
@@ -18,9 +18,14 @@
#include <linux/bitops.h>
#include <linux/mount.h>
@@ -6760,9 +7071,9 @@ diff -NurpP --minimal linux-3.0.67/fs/proc/root.c linux-3.0.67-vs2.3.2.5/fs/proc
};
int pid_ns_prepare_proc(struct pid_namespace *ns)
-diff -NurpP --minimal linux-3.0.67/fs/proc/uptime.c linux-3.0.67-vs2.3.2.5/fs/proc/uptime.c
---- linux-3.0.67/fs/proc/uptime.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/proc/uptime.c 2012-01-26 07:56:00.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/proc/uptime.c linux-3.0.101-vs2.3.2.5/fs/proc/uptime.c
+--- linux-3.0.101/fs/proc/uptime.c 2013-10-22 12:14:39.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/proc/uptime.c 2012-01-26 07:56:00.000000000 +0000
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
@@ -6782,9 +7093,9 @@ diff -NurpP --minimal linux-3.0.67/fs/proc/uptime.c linux-3.0.67-vs2.3.2.5/fs/pr
seq_printf(m, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-3.0.67/fs/quota/dquot.c linux-3.0.67-vs2.3.2.5/fs/quota/dquot.c
---- linux-3.0.67/fs/quota/dquot.c 2011-07-22 09:18:06.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/quota/dquot.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/quota/dquot.c linux-3.0.101-vs2.3.2.5/fs/quota/dquot.c
+--- linux-3.0.101/fs/quota/dquot.c 2011-07-22 09:18:06.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/quota/dquot.c 2011-06-10 20:11:24.000000000 +0000
@@ -1548,6 +1548,9 @@ int __dquot_alloc_space(struct inode *in
int reserve = flags & DQUOT_SPACE_RESERVE;
int nofail = flags & DQUOT_SPACE_NOFAIL;
@@ -6823,9 +7134,9 @@ diff -NurpP --minimal linux-3.0.67/fs/quota/dquot.c linux-3.0.67-vs2.3.2.5/fs/qu
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!dquot_active(inode))
-diff -NurpP --minimal linux-3.0.67/fs/quota/quota.c linux-3.0.67-vs2.3.2.5/fs/quota/quota.c
---- linux-3.0.67/fs/quota/quota.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/quota/quota.c 2011-11-15 16:37:07.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/quota/quota.c linux-3.0.101-vs2.3.2.5/fs/quota/quota.c
+--- linux-3.0.101/fs/quota/quota.c 2013-10-22 12:14:39.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/quota/quota.c 2011-11-15 16:37:07.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
@@ -6913,18 +7224,18 @@ diff -NurpP --minimal linux-3.0.67/fs/quota/quota.c linux-3.0.67-vs2.3.2.5/fs/qu
sb = get_super(bdev);
bdput(bdev);
if (!sb)
-diff -NurpP --minimal linux-3.0.67/fs/reiserfs/file.c linux-3.0.67-vs2.3.2.5/fs/reiserfs/file.c
---- linux-3.0.67/fs/reiserfs/file.c 2011-01-05 20:50:26.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/reiserfs/file.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/reiserfs/file.c linux-3.0.101-vs2.3.2.5/fs/reiserfs/file.c
+--- linux-3.0.101/fs/reiserfs/file.c 2011-01-05 20:50:26.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/reiserfs/file.c 2011-06-10 20:11:24.000000000 +0000
@@ -312,4 +312,5 @@ const struct inode_operations reiserfs_f
.listxattr = reiserfs_listxattr,
.removexattr = reiserfs_removexattr,
.permission = reiserfs_permission,
+ .sync_flags = reiserfs_sync_flags,
};
-diff -NurpP --minimal linux-3.0.67/fs/reiserfs/inode.c linux-3.0.67-vs2.3.2.5/fs/reiserfs/inode.c
---- linux-3.0.67/fs/reiserfs/inode.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/reiserfs/inode.c 2012-12-08 00:58:08.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/reiserfs/inode.c linux-3.0.101-vs2.3.2.5/fs/reiserfs/inode.c
+--- linux-3.0.101/fs/reiserfs/inode.c 2013-10-22 12:14:39.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/reiserfs/inode.c 2012-12-08 00:58:08.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/writeback.h>
#include <linux/quotaops.h>
@@ -7090,9 +7401,9 @@ diff -NurpP --minimal linux-3.0.67/fs/reiserfs/inode.c linux-3.0.67-vs2.3.2.5/fs
mark_inode_dirty(inode);
error = journal_end(&th, inode->i_sb, jbegin_count);
if (error)
-diff -NurpP --minimal linux-3.0.67/fs/reiserfs/ioctl.c linux-3.0.67-vs2.3.2.5/fs/reiserfs/ioctl.c
---- linux-3.0.67/fs/reiserfs/ioctl.c 2011-05-22 14:17:53.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/reiserfs/ioctl.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/reiserfs/ioctl.c linux-3.0.101-vs2.3.2.5/fs/reiserfs/ioctl.c
+--- linux-3.0.101/fs/reiserfs/ioctl.c 2011-05-22 14:17:53.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/reiserfs/ioctl.c 2011-06-10 20:11:24.000000000 +0000
@@ -11,6 +11,21 @@
#include <linux/pagemap.h>
#include <linux/compat.h>
@@ -7154,9 +7465,9 @@ diff -NurpP --minimal linux-3.0.67/fs/reiserfs/ioctl.c linux-3.0.67-vs2.3.2.5/fs
sd_attrs_to_i_attrs(flags, inode);
REISERFS_I(inode)->i_attrs = flags;
inode->i_ctime = CURRENT_TIME_SEC;
-diff -NurpP --minimal linux-3.0.67/fs/reiserfs/namei.c linux-3.0.67-vs2.3.2.5/fs/reiserfs/namei.c
---- linux-3.0.67/fs/reiserfs/namei.c 2011-05-22 14:17:53.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/reiserfs/namei.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/reiserfs/namei.c linux-3.0.101-vs2.3.2.5/fs/reiserfs/namei.c
+--- linux-3.0.101/fs/reiserfs/namei.c 2011-05-22 14:17:53.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/reiserfs/namei.c 2011-06-10 20:11:24.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/reiserfs_acl.h>
#include <linux/reiserfs_xattr.h>
@@ -7181,9 +7492,9 @@ diff -NurpP --minimal linux-3.0.67/fs/reiserfs/namei.c linux-3.0.67-vs2.3.2.5/fs
};
/*
-diff -NurpP --minimal linux-3.0.67/fs/reiserfs/super.c linux-3.0.67-vs2.3.2.5/fs/reiserfs/super.c
---- linux-3.0.67/fs/reiserfs/super.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/reiserfs/super.c 2012-12-08 00:58:08.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/reiserfs/super.c linux-3.0.101-vs2.3.2.5/fs/reiserfs/super.c
+--- linux-3.0.101/fs/reiserfs/super.c 2013-10-22 12:14:39.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/reiserfs/super.c 2012-12-08 00:58:08.000000000 +0000
@@ -905,6 +905,14 @@ static int reiserfs_parse_options(struct
{"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
{"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
@@ -7225,9 +7536,9 @@ diff -NurpP --minimal linux-3.0.67/fs/reiserfs/super.c linux-3.0.67-vs2.3.2.5/fs
rs = SB_DISK_SUPER_BLOCK(s);
/* Let's do basic sanity check to verify that underlying device is not
smaller than the filesystem. If the check fails then abort and scream,
-diff -NurpP --minimal linux-3.0.67/fs/reiserfs/xattr.c linux-3.0.67-vs2.3.2.5/fs/reiserfs/xattr.c
---- linux-3.0.67/fs/reiserfs/xattr.c 2011-07-22 09:18:06.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/reiserfs/xattr.c 2011-06-22 10:39:15.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/reiserfs/xattr.c linux-3.0.101-vs2.3.2.5/fs/reiserfs/xattr.c
+--- linux-3.0.101/fs/reiserfs/xattr.c 2013-10-22 12:14:39.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/reiserfs/xattr.c 2013-05-13 18:25:05.000000000 +0000
@@ -40,6 +40,7 @@
#include <linux/errno.h>
#include <linux/gfp.h>
@@ -7236,9 +7547,9 @@ diff -NurpP --minimal linux-3.0.67/fs/reiserfs/xattr.c linux-3.0.67-vs2.3.2.5/fs
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/xattr.h>
-diff -NurpP --minimal linux-3.0.67/fs/stat.c linux-3.0.67-vs2.3.2.5/fs/stat.c
---- linux-3.0.67/fs/stat.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/stat.c 2012-10-20 17:57:22.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/stat.c linux-3.0.101-vs2.3.2.5/fs/stat.c
+--- linux-3.0.101/fs/stat.c 2013-10-22 12:14:40.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/stat.c 2012-10-20 17:57:22.000000000 +0000
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
@@ -7247,9 +7558,9 @@ diff -NurpP --minimal linux-3.0.67/fs/stat.c linux-3.0.67-vs2.3.2.5/fs/stat.c
stat->rdev = inode->i_rdev;
stat->atime = inode->i_atime;
stat->mtime = inode->i_mtime;
-diff -NurpP --minimal linux-3.0.67/fs/statfs.c linux-3.0.67-vs2.3.2.5/fs/statfs.c
---- linux-3.0.67/fs/statfs.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/statfs.c 2011-11-15 16:37:07.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/statfs.c linux-3.0.101-vs2.3.2.5/fs/statfs.c
+--- linux-3.0.101/fs/statfs.c 2013-10-22 12:14:40.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/statfs.c 2013-10-22 12:25:41.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
@@ -7268,9 +7579,9 @@ diff -NurpP --minimal linux-3.0.67/fs/statfs.c linux-3.0.67-vs2.3.2.5/fs/statfs.
return retval;
}
-diff -NurpP --minimal linux-3.0.67/fs/super.c linux-3.0.67-vs2.3.2.5/fs/super.c
---- linux-3.0.67/fs/super.c 2013-03-02 15:23:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/super.c 2012-06-08 13:28:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/super.c linux-3.0.101-vs2.3.2.5/fs/super.c
+--- linux-3.0.101/fs/super.c 2013-10-22 12:14:40.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/super.c 2013-08-13 17:02:28.000000000 +0000
@@ -32,6 +32,9 @@
#include <linux/backing-dev.h>
#include <linux/rculist_bl.h>
@@ -7281,7 +7592,7 @@ diff -NurpP --minimal linux-3.0.67/fs/super.c linux-3.0.67-vs2.3.2.5/fs/super.c
#include "internal.h"
-@@ -943,6 +946,13 @@ mount_fs(struct file_system_type *type,
+@@ -938,6 +941,13 @@ mount_fs(struct file_system_type *type,
WARN_ON(sb->s_bdi == &default_backing_dev_info);
sb->s_flags |= MS_BORN;
@@ -7295,9 +7606,9 @@ diff -NurpP --minimal linux-3.0.67/fs/super.c linux-3.0.67-vs2.3.2.5/fs/super.c
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-3.0.67/fs/sysfs/mount.c linux-3.0.67-vs2.3.2.5/fs/sysfs/mount.c
---- linux-3.0.67/fs/sysfs/mount.c 2011-07-22 09:18:06.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/sysfs/mount.c 2011-06-22 10:39:15.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/sysfs/mount.c linux-3.0.101-vs2.3.2.5/fs/sysfs/mount.c
+--- linux-3.0.101/fs/sysfs/mount.c 2011-07-22 09:18:06.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/sysfs/mount.c 2011-06-22 10:39:15.000000000 +0000
@@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super
sb->s_blocksize = PAGE_CACHE_SIZE;
@@ -7307,9 +7618,9 @@ diff -NurpP --minimal linux-3.0.67/fs/sysfs/mount.c linux-3.0.67-vs2.3.2.5/fs/sy
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-3.0.67/fs/utimes.c linux-3.0.67-vs2.3.2.5/fs/utimes.c
---- linux-3.0.67/fs/utimes.c 2011-05-22 14:17:54.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/utimes.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/utimes.c linux-3.0.101-vs2.3.2.5/fs/utimes.c
+--- linux-3.0.101/fs/utimes.c 2011-05-22 14:17:54.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/utimes.c 2011-06-10 20:11:24.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
@@ -7339,9 +7650,9 @@ diff -NurpP --minimal linux-3.0.67/fs/utimes.c linux-3.0.67-vs2.3.2.5/fs/utimes.
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-3.0.67/fs/xattr.c linux-3.0.67-vs2.3.2.5/fs/xattr.c
---- linux-3.0.67/fs/xattr.c 2011-07-22 09:18:09.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/xattr.c 2011-06-10 21:10:19.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/xattr.c linux-3.0.101-vs2.3.2.5/fs/xattr.c
+--- linux-3.0.101/fs/xattr.c 2011-07-22 09:18:09.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/xattr.c 2011-06-10 21:10:19.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/module.h>
#include <linux/fsnotify.h>
@@ -7359,9 +7670,9 @@ diff -NurpP --minimal linux-3.0.67/fs/xattr.c linux-3.0.67-vs2.3.2.5/fs/xattr.c
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-3.0.67/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.67-vs2.3.2.5/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-3.0.67/fs/xfs/linux-2.6/xfs_ioctl.c 2011-05-22 14:17:54.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/xfs/linux-2.6/xfs_ioctl.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.101-vs2.3.2.5/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-3.0.101/fs/xfs/linux-2.6/xfs_ioctl.c 2011-05-22 14:17:54.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/xfs/linux-2.6/xfs_ioctl.c 2011-06-10 20:11:24.000000000 +0000
@@ -28,7 +28,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
@@ -7430,9 +7741,9 @@ diff -NurpP --minimal linux-3.0.67/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.67-vs2
return xfs_ioc_setxflags(ip, filp, arg);
case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-3.0.67/fs/xfs/linux-2.6/xfs_ioctl.h linux-3.0.67-vs2.3.2.5/fs/xfs/linux-2.6/xfs_ioctl.h
---- linux-3.0.67/fs/xfs/linux-2.6/xfs_ioctl.h 2010-07-07 16:31:54.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/xfs/linux-2.6/xfs_ioctl.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/xfs/linux-2.6/xfs_ioctl.h linux-3.0.101-vs2.3.2.5/fs/xfs/linux-2.6/xfs_ioctl.h
+--- linux-3.0.101/fs/xfs/linux-2.6/xfs_ioctl.h 2010-07-07 16:31:54.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/xfs/linux-2.6/xfs_ioctl.h 2011-06-10 20:11:24.000000000 +0000
@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
void __user *uhandle,
u32 hlen);
@@ -7446,9 +7757,9 @@ diff -NurpP --minimal linux-3.0.67/fs/xfs/linux-2.6/xfs_ioctl.h linux-3.0.67-vs2
extern long
xfs_file_ioctl(
struct file *filp,
-diff -NurpP --minimal linux-3.0.67/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.67-vs2.3.2.5/fs/xfs/linux-2.6/xfs_iops.c
---- linux-3.0.67/fs/xfs/linux-2.6/xfs_iops.c 2013-03-02 15:23:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/xfs/linux-2.6/xfs_iops.c 2011-12-19 14:55:53.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.101-vs2.3.2.5/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-3.0.101/fs/xfs/linux-2.6/xfs_iops.c 2013-10-22 12:14:40.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/xfs/linux-2.6/xfs_iops.c 2011-12-19 14:55:53.000000000 +0000
@@ -30,6 +30,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
@@ -7524,9 +7835,9 @@ diff -NurpP --minimal linux-3.0.67/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.67-vs2.
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-3.0.67/fs/xfs/linux-2.6/xfs_linux.h linux-3.0.67-vs2.3.2.5/fs/xfs/linux-2.6/xfs_linux.h
---- linux-3.0.67/fs/xfs/linux-2.6/xfs_linux.h 2013-03-02 15:23:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/xfs/linux-2.6/xfs_linux.h 2011-11-15 16:37:07.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/xfs/linux-2.6/xfs_linux.h linux-3.0.101-vs2.3.2.5/fs/xfs/linux-2.6/xfs_linux.h
+--- linux-3.0.101/fs/xfs/linux-2.6/xfs_linux.h 2013-10-22 12:14:40.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/xfs/linux-2.6/xfs_linux.h 2011-11-15 16:37:07.000000000 +0000
@@ -117,6 +117,7 @@
#define current_cpu() (raw_smp_processor_id())
@@ -7535,9 +7846,9 @@ diff -NurpP --minimal linux-3.0.67/fs/xfs/linux-2.6/xfs_linux.h linux-3.0.67-vs2
#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.0.67/fs/xfs/linux-2.6/xfs_super.c linux-3.0.67-vs2.3.2.5/fs/xfs/linux-2.6/xfs_super.c
---- linux-3.0.67/fs/xfs/linux-2.6/xfs_super.c 2013-03-02 15:23:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/xfs/linux-2.6/xfs_super.c 2012-01-10 08:19:13.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/xfs/linux-2.6/xfs_super.c linux-3.0.101-vs2.3.2.5/fs/xfs/linux-2.6/xfs_super.c
+--- linux-3.0.101/fs/xfs/linux-2.6/xfs_super.c 2013-10-22 12:14:40.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/xfs/linux-2.6/xfs_super.c 2012-01-10 08:19:13.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 */
@@ -7610,9 +7921,9 @@ diff -NurpP --minimal linux-3.0.67/fs/xfs/linux-2.6/xfs_super.c linux-3.0.67-vs2
/*
* 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.0.67/fs/xfs/xfs_dinode.h linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_dinode.h
---- linux-3.0.67/fs/xfs/xfs_dinode.h 2011-01-05 20:50:28.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_dinode.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/xfs/xfs_dinode.h linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_dinode.h
+--- linux-3.0.101/fs/xfs/xfs_dinode.h 2011-01-05 20:50:28.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_dinode.h 2011-06-10 20:11:24.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 */
@@ -7653,9 +7964,9 @@ diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_dinode.h linux-3.0.67-vs2.3.2.5/fs
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_fs.h linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_fs.h
---- linux-3.0.67/fs/xfs/xfs_fs.h 2011-01-05 20:50:28.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_fs.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/xfs/xfs_fs.h linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_fs.h
+--- linux-3.0.101/fs/xfs/xfs_fs.h 2011-01-05 20:50:28.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_fs.h 2011-06-10 20:11:24.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 */
@@ -7676,9 +7987,9 @@ diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_fs.h linux-3.0.67-vs2.3.2.5/fs/xfs
__u32 bs_dmevmask; /* DMIG event mask */
__u16 bs_dmstate; /* DMIG state info */
__u16 bs_aextents; /* attribute number of extents */
-diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_ialloc.c linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_ialloc.c
---- linux-3.0.67/fs/xfs/xfs_ialloc.c 2011-05-22 14:17:54.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_ialloc.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/xfs/xfs_ialloc.c linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_ialloc.c
+--- linux-3.0.101/fs/xfs/xfs_ialloc.c 2011-05-22 14:17:54.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_ialloc.c 2011-06-10 20:11:24.000000000 +0000
@@ -37,7 +37,6 @@
#include "xfs_error.h"
#include "xfs_bmap.h"
@@ -7687,9 +7998,9 @@ diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_ialloc.c linux-3.0.67-vs2.3.2.5/fs
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_inode.c linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_inode.c
---- linux-3.0.67/fs/xfs/xfs_inode.c 2013-03-02 15:23:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_inode.c 2011-12-23 15:09:00.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/xfs/xfs_inode.c linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_inode.c
+--- linux-3.0.101/fs/xfs/xfs_inode.c 2013-10-22 12:14:40.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_inode.c 2011-12-23 15:09:00.000000000 +0000
@@ -243,6 +243,7 @@ xfs_inotobp(
return 0;
}
@@ -7864,9 +8175,9 @@ diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_inode.c linux-3.0.67-vs2.3.2.5/fs/
/* Wrap, we never let the log put out DI_MAX_FLUSH */
if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
-diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_inode.h linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_inode.h
---- linux-3.0.67/fs/xfs/xfs_inode.h 2013-03-02 15:23:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_inode.h 2011-12-19 14:55:53.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/xfs/xfs_inode.h linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_inode.h
+--- linux-3.0.101/fs/xfs/xfs_inode.h 2013-10-22 12:14:40.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_inode.h 2011-12-19 14:55:53.000000000 +0000
@@ -135,7 +135,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 */
@@ -7887,9 +8198,9 @@ diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_inode.h linux-3.0.67-vs2.3.2.5/fs/
void xfs_idestroy_fork(struct xfs_inode *, int);
void xfs_idata_realloc(struct xfs_inode *, int, int);
void xfs_iroot_realloc(struct xfs_inode *, int, int);
-diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_itable.c linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_itable.c
---- linux-3.0.67/fs/xfs/xfs_itable.c 2011-05-22 14:17:54.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_itable.c 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/xfs/xfs_itable.c linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_itable.c
+--- linux-3.0.101/fs/xfs/xfs_itable.c 2011-05-22 14:17:54.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_itable.c 2011-06-10 20:11:24.000000000 +0000
@@ -98,6 +98,7 @@ xfs_bulkstat_one_int(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
@@ -7898,9 +8209,9 @@ diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_itable.c linux-3.0.67-vs2.3.2.5/fs
buf->bs_size = dic->di_size;
/*
-diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_log_recover.c linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_log_recover.c
---- linux-3.0.67/fs/xfs/xfs_log_recover.c 2013-03-02 15:23:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_log_recover.c 2012-11-18 20:07:02.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/xfs/xfs_log_recover.c linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_log_recover.c
+--- linux-3.0.101/fs/xfs/xfs_log_recover.c 2013-10-22 12:14:40.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_log_recover.c 2012-11-18 20:07:02.000000000 +0000
@@ -2343,7 +2343,8 @@ xlog_recover_inode_pass2(
}
@@ -7911,9 +8222,9 @@ diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_log_recover.c linux-3.0.67-vs2.3.2
/* the rest is in on-disk format */
if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
-diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_mount.h linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_mount.h
---- linux-3.0.67/fs/xfs/xfs_mount.h 2011-07-22 09:18:10.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_mount.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/xfs/xfs_mount.h linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_mount.h
+--- linux-3.0.101/fs/xfs/xfs_mount.h 2011-07-22 09:18:10.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_mount.h 2011-06-10 20:11:24.000000000 +0000
@@ -249,6 +249,7 @@ typedef struct xfs_mount {
allocator */
#define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */
@@ -7922,9 +8233,9 @@ diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_mount.h linux-3.0.67-vs2.3.2.5/fs/
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_vnodeops.c linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_vnodeops.c
---- linux-3.0.67/fs/xfs/xfs_vnodeops.c 2013-03-02 15:23:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_vnodeops.c 2012-02-07 01:05:58.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/xfs/xfs_vnodeops.c linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_vnodeops.c
+--- linux-3.0.101/fs/xfs/xfs_vnodeops.c 2013-10-22 12:14:41.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_vnodeops.c 2012-02-07 01:05:58.000000000 +0000
@@ -50,6 +50,78 @@
#include "xfs_vnodeops.h"
#include "xfs_trace.h"
@@ -8062,9 +8373,9 @@ diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_vnodeops.c linux-3.0.67-vs2.3.2.5/
if (iuid != uid) {
if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_UQUOTA_ON(mp)) {
ASSERT(mask & ATTR_UID);
-diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_vnodeops.h linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_vnodeops.h
---- linux-3.0.67/fs/xfs/xfs_vnodeops.h 2011-05-22 14:17:54.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/fs/xfs/xfs_vnodeops.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/fs/xfs/xfs_vnodeops.h linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_vnodeops.h
+--- linux-3.0.101/fs/xfs/xfs_vnodeops.h 2011-05-22 14:17:54.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/fs/xfs/xfs_vnodeops.h 2011-06-10 20:11:24.000000000 +0000
@@ -13,6 +13,7 @@ struct xfs_inode;
struct xfs_iomap;
@@ -8073,9 +8384,9 @@ diff -NurpP --minimal linux-3.0.67/fs/xfs/xfs_vnodeops.h linux-3.0.67-vs2.3.2.5/
int xfs_setattr(struct xfs_inode *ip, struct iattr *vap, int flags);
#define XFS_ATTR_DMI 0x01 /* invocation from a DMI function */
#define XFS_ATTR_NONBLOCK 0x02 /* return EAGAIN if operation would block */
-diff -NurpP --minimal linux-3.0.67/include/asm-generic/tlb.h linux-3.0.67-vs2.3.2.5/include/asm-generic/tlb.h
---- linux-3.0.67/include/asm-generic/tlb.h 2013-03-02 15:23:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/asm-generic/tlb.h 2013-01-16 00:11:18.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/asm-generic/tlb.h linux-3.0.101-vs2.3.2.5/include/asm-generic/tlb.h
+--- linux-3.0.101/include/asm-generic/tlb.h 2013-10-22 12:14:41.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/asm-generic/tlb.h 2013-01-16 00:11:18.000000000 +0000
@@ -16,6 +16,7 @@
#define _ASM_GENERIC__TLB_H
@@ -8084,9 +8395,9 @@ diff -NurpP --minimal linux-3.0.67/include/asm-generic/tlb.h linux-3.0.67-vs2.3.
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.0.67/include/linux/Kbuild linux-3.0.67-vs2.3.2.5/include/linux/Kbuild
---- linux-3.0.67/include/linux/Kbuild 2011-07-22 09:18:10.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/Kbuild 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/Kbuild linux-3.0.101-vs2.3.2.5/include/linux/Kbuild
+--- linux-3.0.101/include/linux/Kbuild 2011-07-22 09:18:10.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/Kbuild 2011-06-10 20:11:24.000000000 +0000
@@ -17,6 +17,7 @@ header-y += netfilter_bridge/
header-y += netfilter_ipv4/
header-y += netfilter_ipv6/
@@ -8095,9 +8406,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/Kbuild linux-3.0.67-vs2.3.2.5/i
header-y += wimax/
objhdr-y += version.h
-diff -NurpP --minimal linux-3.0.67/include/linux/capability.h linux-3.0.67-vs2.3.2.5/include/linux/capability.h
---- linux-3.0.67/include/linux/capability.h 2011-07-22 09:18:10.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/capability.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/capability.h linux-3.0.101-vs2.3.2.5/include/linux/capability.h
+--- linux-3.0.101/include/linux/capability.h 2011-07-22 09:18:10.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/capability.h 2011-06-10 20:11:24.000000000 +0000
@@ -279,6 +279,7 @@ struct cpu_vfs_cap_data {
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
@@ -8120,9 +8431,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/capability.h linux-3.0.67-vs2.3
/*
* Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-3.0.67/include/linux/cred.h linux-3.0.67-vs2.3.2.5/include/linux/cred.h
---- linux-3.0.67/include/linux/cred.h 2011-07-22 09:18:10.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/cred.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/cred.h linux-3.0.101-vs2.3.2.5/include/linux/cred.h
+--- linux-3.0.101/include/linux/cred.h 2011-07-22 09:18:10.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/cred.h 2011-06-10 20:11:24.000000000 +0000
@@ -156,6 +156,7 @@ extern void exit_creds(struct task_struc
extern int copy_creds(struct task_struct *, unsigned long);
extern const struct cred *get_task_cred(struct task_struct *);
@@ -8163,18 +8474,18 @@ diff -NurpP --minimal linux-3.0.67/include/linux/cred.h linux-3.0.67-vs2.3.2.5/i
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-3.0.67/include/linux/devpts_fs.h linux-3.0.67-vs2.3.2.5/include/linux/devpts_fs.h
---- linux-3.0.67/include/linux/devpts_fs.h 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/devpts_fs.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/devpts_fs.h linux-3.0.101-vs2.3.2.5/include/linux/devpts_fs.h
+--- linux-3.0.101/include/linux/devpts_fs.h 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/devpts_fs.h 2011-06-10 20:11:24.000000000 +0000
@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/ext2_fs.h linux-3.0.67-vs2.3.2.5/include/linux/ext2_fs.h
---- linux-3.0.67/include/linux/ext2_fs.h 2013-03-02 15:23:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/ext2_fs.h 2011-11-15 16:37:07.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/ext2_fs.h linux-3.0.101-vs2.3.2.5/include/linux/ext2_fs.h
+--- linux-3.0.101/include/linux/ext2_fs.h 2013-10-22 12:14:41.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/ext2_fs.h 2011-11-15 16:37:07.000000000 +0000
@@ -189,8 +189,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) */
@@ -8214,9 +8525,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/ext2_fs.h linux-3.0.67-vs2.3.2.
#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-3.0.67/include/linux/ext3_fs.h linux-3.0.67-vs2.3.2.5/include/linux/ext3_fs.h
---- linux-3.0.67/include/linux/ext3_fs.h 2013-03-02 15:23:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/ext3_fs.h 2011-11-15 16:37:07.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/ext3_fs.h linux-3.0.101-vs2.3.2.5/include/linux/ext3_fs.h
+--- linux-3.0.101/include/linux/ext3_fs.h 2013-10-22 12:14:41.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/ext3_fs.h 2011-11-15 16:37:07.000000000 +0000
@@ -173,10 +173,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) */
@@ -8268,9 +8579,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/ext3_fs.h linux-3.0.67-vs2.3.2.
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.0.67/include/linux/fs.h linux-3.0.67-vs2.3.2.5/include/linux/fs.h
---- linux-3.0.67/include/linux/fs.h 2013-03-02 15:23:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/fs.h 2012-09-01 09:37:48.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/fs.h linux-3.0.101-vs2.3.2.5/include/linux/fs.h
+--- linux-3.0.101/include/linux/fs.h 2013-10-22 12:14:41.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/fs.h 2012-09-01 09:37:48.000000000 +0000
@@ -208,6 +208,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 */
@@ -8453,9 +8764,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/fs.h linux-3.0.67-vs2.3.2.5/inc
extern int simple_setattr(struct dentry *, struct iattr *);
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
-diff -NurpP --minimal linux-3.0.67/include/linux/gfs2_ondisk.h linux-3.0.67-vs2.3.2.5/include/linux/gfs2_ondisk.h
---- linux-3.0.67/include/linux/gfs2_ondisk.h 2010-07-07 16:31:55.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/gfs2_ondisk.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/gfs2_ondisk.h linux-3.0.101-vs2.3.2.5/include/linux/gfs2_ondisk.h
+--- linux-3.0.101/include/linux/gfs2_ondisk.h 2010-07-07 16:31:55.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/gfs2_ondisk.h 2011-06-10 20:11:24.000000000 +0000
@@ -211,6 +211,9 @@ enum {
gfs2fl_NoAtime = 7,
gfs2fl_Sync = 8,
@@ -8476,9 +8787,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/gfs2_ondisk.h linux-3.0.67-vs2.
#define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */
#define GFS2_DIF_INHERIT_DIRECTIO 0x40000000
#define GFS2_DIF_INHERIT_JDATA 0x80000000
-diff -NurpP --minimal linux-3.0.67/include/linux/if_tun.h linux-3.0.67-vs2.3.2.5/include/linux/if_tun.h
---- linux-3.0.67/include/linux/if_tun.h 2010-08-02 14:52:54.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/if_tun.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/if_tun.h linux-3.0.101-vs2.3.2.5/include/linux/if_tun.h
+--- linux-3.0.101/include/linux/if_tun.h 2010-08-02 14:52:54.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/if_tun.h 2011-06-10 20:11:24.000000000 +0000
@@ -53,6 +53,7 @@
#define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
#define TUNGETVNETHDRSZ _IOR('T', 215, int)
@@ -8487,9 +8798,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/if_tun.h linux-3.0.67-vs2.3.2.5
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-3.0.67/include/linux/init_task.h linux-3.0.67-vs2.3.2.5/include/linux/init_task.h
---- linux-3.0.67/include/linux/init_task.h 2013-03-02 15:23:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/init_task.h 2012-10-20 17:57:22.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/init_task.h linux-3.0.101-vs2.3.2.5/include/linux/init_task.h
+--- linux-3.0.101/include/linux/init_task.h 2013-10-22 12:14:42.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/init_task.h 2012-10-20 17:57:22.000000000 +0000
@@ -211,6 +211,10 @@ extern struct task_group root_task_group
INIT_TRACE_RECURSION \
INIT_TASK_RCU_PREEMPT(tsk) \
@@ -8501,9 +8812,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/init_task.h linux-3.0.67-vs2.3.
}
-diff -NurpP --minimal linux-3.0.67/include/linux/ipc.h linux-3.0.67-vs2.3.2.5/include/linux/ipc.h
---- linux-3.0.67/include/linux/ipc.h 2009-12-03 19:02:55.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/ipc.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/ipc.h linux-3.0.101-vs2.3.2.5/include/linux/ipc.h
+--- linux-3.0.101/include/linux/ipc.h 2009-12-03 19:02:55.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/ipc.h 2011-06-10 20:11:24.000000000 +0000
@@ -91,6 +91,7 @@ struct kern_ipc_perm
key_t key;
uid_t uid;
@@ -8512,9 +8823,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/ipc.h linux-3.0.67-vs2.3.2.5/in
uid_t cuid;
gid_t cgid;
mode_t mode;
-diff -NurpP --minimal linux-3.0.67/include/linux/ipc_namespace.h linux-3.0.67-vs2.3.2.5/include/linux/ipc_namespace.h
---- linux-3.0.67/include/linux/ipc_namespace.h 2011-05-22 14:17:55.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/ipc_namespace.h 2011-06-13 12:09:44.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/ipc_namespace.h linux-3.0.101-vs2.3.2.5/include/linux/ipc_namespace.h
+--- linux-3.0.101/include/linux/ipc_namespace.h 2013-10-22 12:14:42.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/ipc_namespace.h 2013-05-13 18:25:05.000000000 +0000
@@ -94,7 +94,8 @@ static inline int mq_init_ns(struct ipc_
#if defined(CONFIG_IPC_NS)
@@ -8541,9 +8852,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/ipc_namespace.h linux-3.0.67-vs
}
static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-diff -NurpP --minimal linux-3.0.67/include/linux/loop.h linux-3.0.67-vs2.3.2.5/include/linux/loop.h
---- linux-3.0.67/include/linux/loop.h 2009-09-10 13:26:25.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/loop.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/loop.h linux-3.0.101-vs2.3.2.5/include/linux/loop.h
+--- linux-3.0.101/include/linux/loop.h 2009-09-10 13:26:25.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/loop.h 2011-06-10 20:11:24.000000000 +0000
@@ -45,6 +45,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
@@ -8552,9 +8863,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/loop.h linux-3.0.67-vs2.3.2.5/i
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-3.0.67/include/linux/magic.h linux-3.0.67-vs2.3.2.5/include/linux/magic.h
---- linux-3.0.67/include/linux/magic.h 2011-05-22 14:17:55.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/magic.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/magic.h linux-3.0.101-vs2.3.2.5/include/linux/magic.h
+--- linux-3.0.101/include/linux/magic.h 2011-05-22 14:17:55.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/magic.h 2011-06-10 20:11:24.000000000 +0000
@@ -3,7 +3,7 @@
#define ADFS_SUPER_MAGIC 0xadf5
@@ -8572,9 +8883,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/magic.h linux-3.0.67-vs2.3.2.5/
#define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */
#define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */
-diff -NurpP --minimal linux-3.0.67/include/linux/major.h linux-3.0.67-vs2.3.2.5/include/linux/major.h
---- linux-3.0.67/include/linux/major.h 2009-09-10 13:26:25.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/major.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/major.h linux-3.0.101-vs2.3.2.5/include/linux/major.h
+--- linux-3.0.101/include/linux/major.h 2009-09-10 13:26:25.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/major.h 2011-06-10 20:11:24.000000000 +0000
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
@@ -8583,9 +8894,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/major.h linux-3.0.67-vs2.3.2.5/
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-3.0.67/include/linux/memcontrol.h linux-3.0.67-vs2.3.2.5/include/linux/memcontrol.h
---- linux-3.0.67/include/linux/memcontrol.h 2013-03-02 15:23:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/memcontrol.h 2012-09-01 09:37:48.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/memcontrol.h linux-3.0.101-vs2.3.2.5/include/linux/memcontrol.h
+--- linux-3.0.101/include/linux/memcontrol.h 2013-10-22 12:14:42.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/memcontrol.h 2012-09-01 09:37:48.000000000 +0000
@@ -87,6 +87,13 @@ extern struct mem_cgroup *try_get_mem_cg
extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p);
extern struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm);
@@ -8600,9 +8911,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/memcontrol.h linux-3.0.67-vs2.3
static inline
int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
{
-diff -NurpP --minimal linux-3.0.67/include/linux/mm_types.h linux-3.0.67-vs2.3.2.5/include/linux/mm_types.h
---- linux-3.0.67/include/linux/mm_types.h 2013-03-02 15:23:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/mm_types.h 2011-11-15 16:37:07.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/mm_types.h linux-3.0.101-vs2.3.2.5/include/linux/mm_types.h
+--- linux-3.0.101/include/linux/mm_types.h 2013-10-22 12:14:42.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/mm_types.h 2011-11-15 16:37:07.000000000 +0000
@@ -282,6 +282,7 @@ struct mm_struct {
/* Architecture-specific MM context */
@@ -8611,9 +8922,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/mm_types.h linux-3.0.67-vs2.3.2
/* Swap token stuff */
/*
-diff -NurpP --minimal linux-3.0.67/include/linux/mmzone.h linux-3.0.67-vs2.3.2.5/include/linux/mmzone.h
---- linux-3.0.67/include/linux/mmzone.h 2013-03-02 15:23:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/mmzone.h 2012-09-01 09:37:48.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/mmzone.h linux-3.0.101-vs2.3.2.5/include/linux/mmzone.h
+--- linux-3.0.101/include/linux/mmzone.h 2013-10-22 12:14:42.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/mmzone.h 2012-09-01 09:37:48.000000000 +0000
@@ -668,6 +668,13 @@ typedef struct pglist_data {
__pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
})
@@ -8628,9 +8939,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/mmzone.h linux-3.0.67-vs2.3.2.5
#include <linux/memory_hotplug.h>
extern struct mutex zonelists_mutex;
-diff -NurpP --minimal linux-3.0.67/include/linux/mount.h linux-3.0.67-vs2.3.2.5/include/linux/mount.h
---- linux-3.0.67/include/linux/mount.h 2011-03-15 17:07:39.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/mount.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/mount.h linux-3.0.101-vs2.3.2.5/include/linux/mount.h
+--- linux-3.0.101/include/linux/mount.h 2011-03-15 17:07:39.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/mount.h 2011-06-10 20:11:24.000000000 +0000
@@ -52,6 +52,9 @@ struct mnt_pcp {
int mnt_writers;
};
@@ -8649,9 +8960,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/mount.h linux-3.0.67-vs2.3.2.5/
};
struct file; /* forward dec */
-diff -NurpP --minimal linux-3.0.67/include/linux/net.h linux-3.0.67-vs2.3.2.5/include/linux/net.h
---- linux-3.0.67/include/linux/net.h 2011-07-22 09:18:11.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/net.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/net.h linux-3.0.101-vs2.3.2.5/include/linux/net.h
+--- linux-3.0.101/include/linux/net.h 2011-07-22 09:18:11.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/net.h 2011-06-10 20:11:24.000000000 +0000
@@ -72,6 +72,7 @@ struct net;
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
@@ -8660,9 +8971,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/net.h linux-3.0.67-vs2.3.2.5/in
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-3.0.67/include/linux/netdevice.h linux-3.0.67-vs2.3.2.5/include/linux/netdevice.h
---- linux-3.0.67/include/linux/netdevice.h 2013-03-02 15:23:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/netdevice.h 2012-10-20 17:57:22.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/netdevice.h linux-3.0.101-vs2.3.2.5/include/linux/netdevice.h
+--- linux-3.0.101/include/linux/netdevice.h 2013-10-22 12:14:43.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/netdevice.h 2013-05-13 18:25:05.000000000 +0000
@@ -1643,6 +1643,7 @@ extern void netdev_resync_ops(struct ne
extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev);
extern struct net_device *dev_get_by_index(struct net *net, int ifindex);
@@ -8671,9 +8982,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/netdevice.h linux-3.0.67-vs2.3.
extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
extern int dev_restart(struct net_device *dev);
#ifdef CONFIG_NETPOLL_TRAP
-diff -NurpP --minimal linux-3.0.67/include/linux/nfs_mount.h linux-3.0.67-vs2.3.2.5/include/linux/nfs_mount.h
---- linux-3.0.67/include/linux/nfs_mount.h 2011-01-05 20:50:31.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/nfs_mount.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/nfs_mount.h linux-3.0.101-vs2.3.2.5/include/linux/nfs_mount.h
+--- linux-3.0.101/include/linux/nfs_mount.h 2011-01-05 20:50:31.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/nfs_mount.h 2011-06-10 20:11:24.000000000 +0000
@@ -63,7 +63,8 @@ struct nfs_mount_data {
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
#define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
@@ -8684,9 +8995,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/nfs_mount.h linux-3.0.67-vs2.3.
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-3.0.67/include/linux/nsproxy.h linux-3.0.67-vs2.3.2.5/include/linux/nsproxy.h
---- linux-3.0.67/include/linux/nsproxy.h 2011-07-22 09:18:11.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/nsproxy.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/nsproxy.h linux-3.0.101-vs2.3.2.5/include/linux/nsproxy.h
+--- linux-3.0.101/include/linux/nsproxy.h 2011-07-22 09:18:11.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/nsproxy.h 2011-06-10 20:11:24.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -8735,9 +9046,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/nsproxy.h linux-3.0.67-vs2.3.2.
}
#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/pid.h linux-3.0.67-vs2.3.2.5/include/linux/pid.h
---- linux-3.0.67/include/linux/pid.h 2011-07-22 09:18:11.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/pid.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/pid.h linux-3.0.101-vs2.3.2.5/include/linux/pid.h
+--- linux-3.0.101/include/linux/pid.h 2011-07-22 09:18:11.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/pid.h 2011-06-10 20:11:24.000000000 +0000
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
@@ -8756,9 +9067,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/pid.h linux-3.0.67-vs2.3.2.5/in
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-3.0.67/include/linux/proc_fs.h linux-3.0.67-vs2.3.2.5/include/linux/proc_fs.h
---- linux-3.0.67/include/linux/proc_fs.h 2011-07-22 09:18:11.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/proc_fs.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/proc_fs.h linux-3.0.101-vs2.3.2.5/include/linux/proc_fs.h
+--- linux-3.0.101/include/linux/proc_fs.h 2011-07-22 09:18:11.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/proc_fs.h 2011-06-10 20:11:24.000000000 +0000
@@ -56,6 +56,7 @@ struct proc_dir_entry {
nlink_t nlink;
uid_t uid;
@@ -8794,9 +9105,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/proc_fs.h linux-3.0.67-vs2.3.2.
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-3.0.67/include/linux/quotaops.h linux-3.0.67-vs2.3.2.5/include/linux/quotaops.h
---- linux-3.0.67/include/linux/quotaops.h 2011-05-22 14:17:57.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/quotaops.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/quotaops.h linux-3.0.101-vs2.3.2.5/include/linux/quotaops.h
+--- linux-3.0.101/include/linux/quotaops.h 2011-05-22 14:17:57.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/quotaops.h 2011-06-10 20:11:24.000000000 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -8838,9 +9149,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/quotaops.h linux-3.0.67-vs2.3.2
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.0.67/include/linux/reboot.h linux-3.0.67-vs2.3.2.5/include/linux/reboot.h
---- linux-3.0.67/include/linux/reboot.h 2010-07-07 16:31:56.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/reboot.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/reboot.h linux-3.0.101-vs2.3.2.5/include/linux/reboot.h
+--- linux-3.0.101/include/linux/reboot.h 2010-07-07 16:31:56.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/reboot.h 2011-06-10 20:11:24.000000000 +0000
@@ -33,6 +33,7 @@
#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
@@ -8849,9 +9160,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/reboot.h linux-3.0.67-vs2.3.2.5
#ifdef __KERNEL__
-diff -NurpP --minimal linux-3.0.67/include/linux/reiserfs_fs.h linux-3.0.67-vs2.3.2.5/include/linux/reiserfs_fs.h
---- linux-3.0.67/include/linux/reiserfs_fs.h 2011-05-22 14:17:58.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/reiserfs_fs.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/reiserfs_fs.h linux-3.0.101-vs2.3.2.5/include/linux/reiserfs_fs.h
+--- linux-3.0.101/include/linux/reiserfs_fs.h 2011-05-22 14:17:58.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/reiserfs_fs.h 2011-06-10 20:11:24.000000000 +0000
@@ -976,6 +976,11 @@ struct stat_data_v1 {
#define REISERFS_COMPR_FL FS_COMPR_FL
#define REISERFS_NOTAIL_FL FS_NOTAIL_FL
@@ -8882,9 +9193,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/reiserfs_fs.h linux-3.0.67-vs2.
int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
-diff -NurpP --minimal linux-3.0.67/include/linux/reiserfs_fs_sb.h linux-3.0.67-vs2.3.2.5/include/linux/reiserfs_fs_sb.h
---- linux-3.0.67/include/linux/reiserfs_fs_sb.h 2010-02-25 10:52:07.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/reiserfs_fs_sb.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/reiserfs_fs_sb.h linux-3.0.101-vs2.3.2.5/include/linux/reiserfs_fs_sb.h
+--- linux-3.0.101/include/linux/reiserfs_fs_sb.h 2010-02-25 10:52:07.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/reiserfs_fs_sb.h 2011-06-10 20:11:24.000000000 +0000
@@ -476,6 +476,7 @@ enum reiserfs_mount_options {
REISERFS_EXPOSE_PRIVROOT,
REISERFS_BARRIER_NONE,
@@ -8893,9 +9204,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/reiserfs_fs_sb.h linux-3.0.67-v
/* Actions on error */
REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-3.0.67/include/linux/sched.h linux-3.0.67-vs2.3.2.5/include/linux/sched.h
---- linux-3.0.67/include/linux/sched.h 2013-03-02 15:23:58.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/sched.h 2012-10-20 17:57:22.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/sched.h linux-3.0.101-vs2.3.2.5/include/linux/sched.h
+--- linux-3.0.101/include/linux/sched.h 2013-10-22 12:14:43.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/sched.h 2013-05-13 18:25:05.000000000 +0000
@@ -1409,6 +1409,14 @@ struct task_struct {
#endif
seccomp_t seccomp;
@@ -8942,9 +9253,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/sched.h linux-3.0.67-vs2.3.2.5/
}
-diff -NurpP --minimal linux-3.0.67/include/linux/shmem_fs.h linux-3.0.67-vs2.3.2.5/include/linux/shmem_fs.h
---- linux-3.0.67/include/linux/shmem_fs.h 2011-07-22 09:18:11.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/shmem_fs.h 2011-07-01 09:35:35.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/shmem_fs.h linux-3.0.101-vs2.3.2.5/include/linux/shmem_fs.h
+--- linux-3.0.101/include/linux/shmem_fs.h 2011-07-22 09:18:11.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/shmem_fs.h 2011-07-01 09:35:35.000000000 +0000
@@ -12,6 +12,9 @@
#define SHMEM_SYMLINK_INLINE_LEN (SHMEM_NR_DIRECT * sizeof(swp_entry_t))
@@ -8955,9 +9266,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/shmem_fs.h linux-3.0.67-vs2.3.2
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-3.0.67/include/linux/stat.h linux-3.0.67-vs2.3.2.5/include/linux/stat.h
---- linux-3.0.67/include/linux/stat.h 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/stat.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/stat.h linux-3.0.101-vs2.3.2.5/include/linux/stat.h
+--- linux-3.0.101/include/linux/stat.h 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/stat.h 2011-06-10 20:11:24.000000000 +0000
@@ -66,6 +66,7 @@ struct kstat {
unsigned int nlink;
uid_t uid;
@@ -8966,9 +9277,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/stat.h linux-3.0.67-vs2.3.2.5/i
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-3.0.67/include/linux/sunrpc/auth.h linux-3.0.67-vs2.3.2.5/include/linux/sunrpc/auth.h
---- linux-3.0.67/include/linux/sunrpc/auth.h 2011-03-15 17:07:39.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/sunrpc/auth.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/sunrpc/auth.h linux-3.0.101-vs2.3.2.5/include/linux/sunrpc/auth.h
+--- linux-3.0.101/include/linux/sunrpc/auth.h 2011-03-15 17:07:39.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/sunrpc/auth.h 2011-06-10 20:11:24.000000000 +0000
@@ -25,6 +25,7 @@
struct auth_cred {
uid_t uid;
@@ -8977,9 +9288,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/sunrpc/auth.h linux-3.0.67-vs2.
struct group_info *group_info;
unsigned char machine_cred : 1;
};
-diff -NurpP --minimal linux-3.0.67/include/linux/sunrpc/clnt.h linux-3.0.67-vs2.3.2.5/include/linux/sunrpc/clnt.h
---- linux-3.0.67/include/linux/sunrpc/clnt.h 2011-05-22 14:17:58.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/sunrpc/clnt.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/sunrpc/clnt.h linux-3.0.101-vs2.3.2.5/include/linux/sunrpc/clnt.h
+--- linux-3.0.101/include/linux/sunrpc/clnt.h 2011-05-22 14:17:58.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/sunrpc/clnt.h 2011-06-10 20:11:24.000000000 +0000
@@ -49,7 +49,8 @@ struct rpc_clnt {
unsigned int cl_softrtry : 1,/* soft timeouts */
cl_discrtry : 1,/* disconnect before retry */
@@ -8990,9 +9301,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/sunrpc/clnt.h linux-3.0.67-vs2.
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-3.0.67/include/linux/syscalls.h linux-3.0.67-vs2.3.2.5/include/linux/syscalls.h
---- linux-3.0.67/include/linux/syscalls.h 2011-07-22 09:18:11.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/syscalls.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/syscalls.h linux-3.0.101-vs2.3.2.5/include/linux/syscalls.h
+--- linux-3.0.101/include/linux/syscalls.h 2011-07-22 09:18:11.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/syscalls.h 2011-06-10 20:11:24.000000000 +0000
@@ -483,6 +483,8 @@ asmlinkage long sys_symlink(const char _
asmlinkage long sys_unlink(const char __user *pathname);
asmlinkage long sys_rename(const char __user *oldname,
@@ -9002,9 +9313,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/syscalls.h linux-3.0.67-vs2.3.2
asmlinkage long sys_chmod(const char __user *filename, mode_t mode);
asmlinkage long sys_fchmod(unsigned int fd, mode_t mode);
-diff -NurpP --minimal linux-3.0.67/include/linux/sysctl.h linux-3.0.67-vs2.3.2.5/include/linux/sysctl.h
---- linux-3.0.67/include/linux/sysctl.h 2011-03-15 17:07:40.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/sysctl.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/sysctl.h linux-3.0.101-vs2.3.2.5/include/linux/sysctl.h
+--- linux-3.0.101/include/linux/sysctl.h 2011-03-15 17:07:40.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/sysctl.h 2011-06-10 20:11:24.000000000 +0000
@@ -60,6 +60,7 @@ enum
CTL_ABI=9, /* Binary emulation */
CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
@@ -9021,9 +9332,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/sysctl.h linux-3.0.67-vs2.3.2.5
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-3.0.67/include/linux/sysfs.h linux-3.0.67-vs2.3.2.5/include/linux/sysfs.h
---- linux-3.0.67/include/linux/sysfs.h 2011-07-22 09:18:11.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/sysfs.h 2011-06-22 10:39:15.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/sysfs.h linux-3.0.101-vs2.3.2.5/include/linux/sysfs.h
+--- linux-3.0.101/include/linux/sysfs.h 2011-07-22 09:18:11.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/sysfs.h 2011-06-22 10:39:15.000000000 +0000
@@ -19,6 +19,8 @@
#include <linux/kobject_ns.h>
#include <asm/atomic.h>
@@ -9033,9 +9344,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/sysfs.h linux-3.0.67-vs2.3.2.5/
struct kobject;
struct module;
enum kobj_ns_type;
-diff -NurpP --minimal linux-3.0.67/include/linux/time.h linux-3.0.67-vs2.3.2.5/include/linux/time.h
---- linux-3.0.67/include/linux/time.h 2013-03-02 15:23:58.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/time.h 2012-10-20 17:57:22.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/time.h linux-3.0.101-vs2.3.2.5/include/linux/time.h
+--- linux-3.0.101/include/linux/time.h 2013-10-22 12:14:43.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/time.h 2012-10-20 17:57:22.000000000 +0000
@@ -281,6 +281,9 @@ static __always_inline void timespec_add
a->tv_sec += __iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns);
a->tv_nsec = ns;
@@ -9046,9 +9357,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/time.h linux-3.0.67-vs2.3.2.5/i
#endif /* __KERNEL__ */
#define NFDBITS __NFDBITS
-diff -NurpP --minimal linux-3.0.67/include/linux/types.h linux-3.0.67-vs2.3.2.5/include/linux/types.h
---- linux-3.0.67/include/linux/types.h 2011-05-22 14:17:58.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/types.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/types.h linux-3.0.101-vs2.3.2.5/include/linux/types.h
+--- linux-3.0.101/include/linux/types.h 2011-05-22 14:17:58.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/types.h 2011-06-10 20:11:24.000000000 +0000
@@ -40,6 +40,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
@@ -9059,9 +9370,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/types.h linux-3.0.67-vs2.3.2.5/
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-3.0.67/include/linux/utsname.h linux-3.0.67-vs2.3.2.5/include/linux/utsname.h
---- linux-3.0.67/include/linux/utsname.h 2011-05-22 14:17:58.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/utsname.h 2011-06-13 12:36:48.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/utsname.h linux-3.0.101-vs2.3.2.5/include/linux/utsname.h
+--- linux-3.0.101/include/linux/utsname.h 2011-05-22 14:17:58.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/utsname.h 2011-06-13 12:36:48.000000000 +0000
@@ -54,7 +54,8 @@ static inline void get_uts_ns(struct uts
}
@@ -9088,9 +9399,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/utsname.h linux-3.0.67-vs2.3.2.
}
#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vroot.h linux-3.0.67-vs2.3.2.5/include/linux/vroot.h
---- linux-3.0.67/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vroot.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vroot.h linux-3.0.101-vs2.3.2.5/include/linux/vroot.h
+--- linux-3.0.101/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vroot.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
@@ -9143,9 +9454,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vroot.h linux-3.0.67-vs2.3.2.5/
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vs_base.h linux-3.0.67-vs2.3.2.5/include/linux/vs_base.h
---- linux-3.0.67/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vs_base.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vs_base.h linux-3.0.101-vs2.3.2.5/include/linux/vs_base.h
+--- linux-3.0.101/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vs_base.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
@@ -9157,9 +9468,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vs_base.h linux-3.0.67-vs2.3.2.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vs_context.h linux-3.0.67-vs2.3.2.5/include/linux/vs_context.h
---- linux-3.0.67/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vs_context.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vs_context.h linux-3.0.101-vs2.3.2.5/include/linux/vs_context.h
+--- linux-3.0.101/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vs_context.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
@@ -9403,9 +9714,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vs_context.h linux-3.0.67-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vs_cowbl.h linux-3.0.67-vs2.3.2.5/include/linux/vs_cowbl.h
---- linux-3.0.67/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vs_cowbl.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vs_cowbl.h linux-3.0.101-vs2.3.2.5/include/linux/vs_cowbl.h
+--- linux-3.0.101/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vs_cowbl.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
@@ -9455,9 +9766,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vs_cowbl.h linux-3.0.67-vs2.3.2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vs_cvirt.h linux-3.0.67-vs2.3.2.5/include/linux/vs_cvirt.h
---- linux-3.0.67/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vs_cvirt.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vs_cvirt.h linux-3.0.101-vs2.3.2.5/include/linux/vs_cvirt.h
+--- linux-3.0.101/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vs_cvirt.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
@@ -9509,9 +9820,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vs_cvirt.h linux-3.0.67-vs2.3.2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vs_device.h linux-3.0.67-vs2.3.2.5/include/linux/vs_device.h
---- linux-3.0.67/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vs_device.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vs_device.h linux-3.0.101-vs2.3.2.5/include/linux/vs_device.h
+--- linux-3.0.101/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vs_device.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
@@ -9558,9 +9869,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vs_device.h linux-3.0.67-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vs_dlimit.h linux-3.0.67-vs2.3.2.5/include/linux/vs_dlimit.h
---- linux-3.0.67/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vs_dlimit.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vs_dlimit.h linux-3.0.101-vs2.3.2.5/include/linux/vs_dlimit.h
+--- linux-3.0.101/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vs_dlimit.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
@@ -9777,9 +10088,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vs_dlimit.h linux-3.0.67-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vs_inet.h linux-3.0.67-vs2.3.2.5/include/linux/vs_inet.h
---- linux-3.0.67/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vs_inet.h 2011-08-18 15:01:00.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vs_inet.h linux-3.0.101-vs2.3.2.5/include/linux/vs_inet.h
+--- linux-3.0.101/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vs_inet.h 2011-08-18 15:01:00.000000000 +0000
@@ -0,0 +1,353 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
@@ -10134,9 +10445,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vs_inet.h linux-3.0.67-vs2.3.2.
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vs_inet6.h linux-3.0.67-vs2.3.2.5/include/linux/vs_inet6.h
---- linux-3.0.67/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vs_inet6.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vs_inet6.h linux-3.0.101-vs2.3.2.5/include/linux/vs_inet6.h
+--- linux-3.0.101/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vs_inet6.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,246 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
@@ -10384,9 +10695,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vs_inet6.h linux-3.0.67-vs2.3.2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vs_limit.h linux-3.0.67-vs2.3.2.5/include/linux/vs_limit.h
---- linux-3.0.67/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vs_limit.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vs_limit.h linux-3.0.101-vs2.3.2.5/include/linux/vs_limit.h
+--- linux-3.0.101/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vs_limit.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
@@ -10528,9 +10839,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vs_limit.h linux-3.0.67-vs2.3.2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vs_memory.h linux-3.0.67-vs2.3.2.5/include/linux/vs_memory.h
---- linux-3.0.67/include/linux/vs_memory.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vs_memory.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vs_memory.h linux-3.0.101-vs2.3.2.5/include/linux/vs_memory.h
+--- linux-3.0.101/include/linux/vs_memory.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vs_memory.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,58 @@
+#ifndef _VS_MEMORY_H
+#define _VS_MEMORY_H
@@ -10590,9 +10901,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vs_memory.h linux-3.0.67-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vs_network.h linux-3.0.67-vs2.3.2.5/include/linux/vs_network.h
---- linux-3.0.67/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vs_network.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vs_network.h linux-3.0.101-vs2.3.2.5/include/linux/vs_network.h
+--- linux-3.0.101/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vs_network.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
@@ -10763,9 +11074,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vs_network.h linux-3.0.67-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vs_pid.h linux-3.0.67-vs2.3.2.5/include/linux/vs_pid.h
---- linux-3.0.67/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vs_pid.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vs_pid.h linux-3.0.101-vs2.3.2.5/include/linux/vs_pid.h
+--- linux-3.0.101/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vs_pid.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
@@ -10817,9 +11128,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vs_pid.h linux-3.0.67-vs2.3.2.5
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vs_sched.h linux-3.0.67-vs2.3.2.5/include/linux/vs_sched.h
---- linux-3.0.67/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vs_sched.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vs_sched.h linux-3.0.101-vs2.3.2.5/include/linux/vs_sched.h
+--- linux-3.0.101/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vs_sched.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
@@ -10861,9 +11172,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vs_sched.h linux-3.0.67-vs2.3.2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vs_socket.h linux-3.0.67-vs2.3.2.5/include/linux/vs_socket.h
---- linux-3.0.67/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vs_socket.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vs_socket.h linux-3.0.101-vs2.3.2.5/include/linux/vs_socket.h
+--- linux-3.0.101/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vs_socket.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
@@ -10932,9 +11243,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vs_socket.h linux-3.0.67-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vs_tag.h linux-3.0.67-vs2.3.2.5/include/linux/vs_tag.h
---- linux-3.0.67/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vs_tag.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vs_tag.h linux-3.0.101-vs2.3.2.5/include/linux/vs_tag.h
+--- linux-3.0.101/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vs_tag.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
@@ -10983,9 +11294,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vs_tag.h linux-3.0.67-vs2.3.2.5
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vs_time.h linux-3.0.67-vs2.3.2.5/include/linux/vs_time.h
---- linux-3.0.67/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vs_time.h 2011-06-13 12:57:45.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vs_time.h linux-3.0.101-vs2.3.2.5/include/linux/vs_time.h
+--- linux-3.0.101/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vs_time.h 2011-06-13 12:57:45.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
@@ -11006,9 +11317,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vs_time.h linux-3.0.67-vs2.3.2.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/Kbuild linux-3.0.67-vs2.3.2.5/include/linux/vserver/Kbuild
---- linux-3.0.67/include/linux/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/Kbuild 2011-08-08 16:02:46.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/Kbuild linux-3.0.101-vs2.3.2.5/include/linux/vserver/Kbuild
+--- linux-3.0.101/include/linux/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/Kbuild 2011-08-08 16:02:46.000000000 +0000
@@ -0,0 +1,8 @@
+
+header-y += context_cmd.h network_cmd.h space_cmd.h \
@@ -11018,9 +11329,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/Kbuild linux-3.0.67-vs2
+
+header-y += switch.h network.h monitor.h inode.h device.h
+
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/base.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/base.h
---- linux-3.0.67/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/base.h 2011-08-01 16:26:07.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/base.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/base.h
+--- linux-3.0.101/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/base.h 2011-08-01 16:26:07.000000000 +0000
@@ -0,0 +1,178 @@
+#ifndef _VX_BASE_H
+#define _VX_BASE_H
@@ -11200,9 +11511,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/base.h linux-3.0.67-vs2
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/cacct.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/cacct.h
---- linux-3.0.67/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/cacct.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/cacct.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/cacct.h
+--- linux-3.0.101/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/cacct.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _VX_CACCT_H
+#define _VX_CACCT_H
@@ -11219,9 +11530,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/cacct.h linux-3.0.67-vs
+};
+
+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/cacct_cmd.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/cacct_cmd.h
---- linux-3.0.67/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/cacct_cmd.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/cacct_cmd.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/cacct_cmd.h
+--- linux-3.0.101/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/cacct_cmd.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,23 @@
+#ifndef _VX_CACCT_CMD_H
+#define _VX_CACCT_CMD_H
@@ -11246,9 +11557,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/cacct_cmd.h linux-3.0.6
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/cacct_def.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/cacct_def.h
---- linux-3.0.67/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/cacct_def.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/cacct_def.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/cacct_def.h
+--- linux-3.0.101/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/cacct_def.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,43 @@
+#ifndef _VX_CACCT_DEF_H
+#define _VX_CACCT_DEF_H
@@ -11293,9 +11604,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/cacct_def.h linux-3.0.6
+#endif
+
+#endif /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/cacct_int.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/cacct_int.h
---- linux-3.0.67/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/cacct_int.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/cacct_int.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/cacct_int.h
+--- linux-3.0.101/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/cacct_int.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,21 @@
+#ifndef _VX_CACCT_INT_H
+#define _VX_CACCT_INT_H
@@ -11318,9 +11629,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/cacct_int.h linux-3.0.6
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/check.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/check.h
---- linux-3.0.67/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/check.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/check.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/check.h
+--- linux-3.0.101/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/check.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,89 @@
+#ifndef _VS_CHECK_H
+#define _VS_CHECK_H
@@ -11411,9 +11722,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/check.h linux-3.0.67-vs
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/context.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/context.h
---- linux-3.0.67/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/context.h 2011-10-27 11:59:29.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/context.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/context.h
+--- linux-3.0.101/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/context.h 2011-10-27 11:59:29.000000000 +0000
@@ -0,0 +1,188 @@
+#ifndef _VX_CONTEXT_H
+#define _VX_CONTEXT_H
@@ -11603,9 +11914,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/context.h linux-3.0.67-
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/context_cmd.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/context_cmd.h
---- linux-3.0.67/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/context_cmd.h 2011-08-01 16:25:07.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/context_cmd.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/context_cmd.h
+--- linux-3.0.101/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/context_cmd.h 2011-08-01 16:25:07.000000000 +0000
@@ -0,0 +1,162 @@
+#ifndef _VX_CONTEXT_CMD_H
+#define _VX_CONTEXT_CMD_H
@@ -11769,9 +12080,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/context_cmd.h linux-3.0
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/cvirt.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/cvirt.h
---- linux-3.0.67/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/cvirt.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/cvirt.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/cvirt.h
+--- linux-3.0.101/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/cvirt.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,20 @@
+#ifndef _VX_CVIRT_H
+#define _VX_CVIRT_H
@@ -11793,9 +12104,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/cvirt.h linux-3.0.67-vs
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/cvirt_cmd.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/cvirt_cmd.h
---- linux-3.0.67/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/cvirt_cmd.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/cvirt_cmd.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/cvirt_cmd.h
+--- linux-3.0.101/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/cvirt_cmd.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,53 @@
+#ifndef _VX_CVIRT_CMD_H
+#define _VX_CVIRT_CMD_H
@@ -11850,9 +12161,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/cvirt_cmd.h linux-3.0.6
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/cvirt_def.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/cvirt_def.h
---- linux-3.0.67/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/cvirt_def.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/cvirt_def.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/cvirt_def.h
+--- linux-3.0.101/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/cvirt_def.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,80 @@
+#ifndef _VX_CVIRT_DEF_H
+#define _VX_CVIRT_DEF_H
@@ -11934,9 +12245,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/cvirt_def.h linux-3.0.6
+#endif
+
+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/debug.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/debug.h
---- linux-3.0.67/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/debug.h 2011-11-17 20:25:04.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/debug.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/debug.h
+--- linux-3.0.101/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/debug.h 2011-11-17 20:25:04.000000000 +0000
@@ -0,0 +1,145 @@
+#ifndef _VX_DEBUG_H
+#define _VX_DEBUG_H
@@ -12083,9 +12394,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/debug.h linux-3.0.67-vs
+
+
+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/debug_cmd.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/debug_cmd.h
---- linux-3.0.67/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/debug_cmd.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/debug_cmd.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/debug_cmd.h
+--- linux-3.0.101/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/debug_cmd.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,58 @@
+#ifndef _VX_DEBUG_CMD_H
+#define _VX_DEBUG_CMD_H
@@ -12145,9 +12456,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/debug_cmd.h linux-3.0.6
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/device.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/device.h
---- linux-3.0.67/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/device.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/device.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/device.h
+--- linux-3.0.101/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/device.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _VX_DEVICE_H
+#define _VX_DEVICE_H
@@ -12164,9 +12475,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/device.h linux-3.0.67-v
+#else /* _VX_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VX_DEVICE_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/device_cmd.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/device_cmd.h
---- linux-3.0.67/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/device_cmd.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/device_cmd.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/device_cmd.h
+--- linux-3.0.101/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/device_cmd.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,44 @@
+#ifndef _VX_DEVICE_CMD_H
+#define _VX_DEVICE_CMD_H
@@ -12212,9 +12523,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/device_cmd.h linux-3.0.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/device_def.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/device_def.h
---- linux-3.0.67/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/device_def.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/device_def.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/device_def.h
+--- linux-3.0.101/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/device_def.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VX_DEVICE_DEF_H
+#define _VX_DEVICE_DEF_H
@@ -12233,9 +12544,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/device_def.h linux-3.0.
+};
+
+#endif /* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/dlimit.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/dlimit.h
---- linux-3.0.67/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/dlimit.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/dlimit.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/dlimit.h
+--- linux-3.0.101/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/dlimit.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,54 @@
+#ifndef _VX_DLIMIT_H
+#define _VX_DLIMIT_H
@@ -12291,9 +12602,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/dlimit.h linux-3.0.67-v
+#else /* _VX_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/dlimit_cmd.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/dlimit_cmd.h
---- linux-3.0.67/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/dlimit_cmd.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/dlimit_cmd.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/dlimit_cmd.h
+--- linux-3.0.101/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/dlimit_cmd.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,109 @@
+#ifndef _VX_DLIMIT_CMD_H
+#define _VX_DLIMIT_CMD_H
@@ -12404,9 +12715,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/dlimit_cmd.h linux-3.0.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/global.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/global.h
---- linux-3.0.67/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/global.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/global.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/global.h
+--- linux-3.0.101/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/global.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VX_GLOBAL_H
+#define _VX_GLOBAL_H
@@ -12427,9 +12738,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/global.h linux-3.0.67-v
+
+
+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/history.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/history.h
---- linux-3.0.67/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/history.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/history.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/history.h
+--- linux-3.0.101/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/history.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,197 @@
+#ifndef _VX_HISTORY_H
+#define _VX_HISTORY_H
@@ -12628,9 +12939,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/history.h linux-3.0.67-
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-3.0.67/include/linux/vserver/inode.h linux-3.0.67-vs2.3.2.5/include/linux/vserver/inode.h
---- linux-3.0.67/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.67-vs2.3.2.5/include/linux/vserver/inode.h 2011-06-10 20:11:24.000000000 +0000
+diff -NurpP --minimal linux-3.0.101/include/linux/vserver/inode.h linux-3.0.101-vs2.3.2.5/include/linux/vserver/inode.h
+--- linux-3.0.101/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.0.101-vs2.3.2.5/include/linux/vserver/inode.h 2011-06-10 20:11:24.000000000 +0000
@@ -0,0 +1,39 @@
+#ifndef _VX_INODE_H
+#define _VX_INODE_H
@@ -12671,9 +12982,9 @@ diff -NurpP --minimal linux-3.0.67/include/linux/vserver/inode.h linux-3.0.67-vs
+#else /* _VX_INODE_H */
<Skipped 2346 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/70dcae270f11e1cebadb568d94311d4f9910584e
More information about the pld-cvs-commit
mailing list