[packages/kernel/LINUX_3_0] up to 3.0.67
glen
glen at pld-linux.org
Tue Mar 5 21:52:43 CET 2013
commit a289601ddae7bdecbf61baa9992d391790f46f00
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Mar 5 21:10:36 2013 +0200
up to 3.0.67
vserver patch updated from
http://vserver.13thfloor.at/Experimental/patch-3.0.67-vs2.3.2.5.diff
kernel-vserver-2.3.patch | 2727 +++++++++++++++++++++++-----------------------
kernel.spec | 6 +-
2 files changed, 1367 insertions(+), 1366 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 1ba8e01..8440e68 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -93,7 +93,7 @@
%endif
%define basever 3.0
-%define postver .52
+%define postver .68
%define rel 1
%define _enable_debug_packages 0
@@ -140,7 +140,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
# Source0-md5: ecf932280e2441bdd992423ef3d55f8f
%if "%{postver}" != ".0"
Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Patch0-md5: a137b283cff5267442642c173b1c4bb7
+# Patch0-md5: c89a72cc5bee460be033de0026d73b25
%endif
Source3: kernel-autoconf.h
@@ -238,7 +238,7 @@ Patch70: kernel-tuxonice-headers.patch
# http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
Patch85: kernel-hostap.patch
-# http://vserver.13thfloor.at/Experimental/patch-3.0.46-vs2.3.2.5.diff
+# http://vserver.13thfloor.at/Experimental/patch-3.0.67-vs2.3.2.5.diff
Patch100: kernel-vserver-2.3.patch
Patch101: kernel-vserver-fixes.patch
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 6f95ba5..ff82675 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-3.0.46/Documentation/vserver/debug.txt linux-3.0.46-vs2.3.2.5/Documentation/vserver/debug.txt
---- linux-3.0.46/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/Documentation/vserver/debug.txt 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -156,9 +156,9 @@ diff -NurpP --minimal linux-3.0.46/Documentation/vserver/debug.txt linux-3.0.46-
+ 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.46/arch/alpha/Kconfig linux-3.0.46-vs2.3.2.5/arch/alpha/Kconfig
---- linux-3.0.46/arch/alpha/Kconfig 2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/alpha/Kconfig 2011-06-10 22:11:24.000000000 +0200
+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
@@ -668,6 +668,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -168,9 +168,9 @@ diff -NurpP --minimal linux-3.0.46/arch/alpha/Kconfig linux-3.0.46-vs2.3.2.5/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.46/arch/alpha/kernel/entry.S linux-3.0.46-vs2.3.2.5/arch/alpha/kernel/entry.S
---- linux-3.0.46/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/alpha/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200
+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
@@ -860,24 +860,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
@@ -203,9 +203,9 @@ diff -NurpP --minimal linux-3.0.46/arch/alpha/kernel/entry.S linux-3.0.46-vs2.3.
ret
.end sys_getxpid
-diff -NurpP --minimal linux-3.0.46/arch/alpha/kernel/ptrace.c linux-3.0.46-vs2.3.2.5/arch/alpha/kernel/ptrace.c
---- linux-3.0.46/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/arch/alpha/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -13,6 +13,7 @@
#include <linux/user.h>
#include <linux/security.h>
@@ -214,9 +214,9 @@ diff -NurpP --minimal linux-3.0.46/arch/alpha/kernel/ptrace.c linux-3.0.46-vs2.3
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.0.46/arch/alpha/kernel/systbls.S linux-3.0.46-vs2.3.2.5/arch/alpha/kernel/systbls.S
---- linux-3.0.46/arch/alpha/kernel/systbls.S 2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/alpha/kernel/systbls.S 2011-06-10 22:11:24.000000000 +0200
+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
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -226,9 +226,9 @@ diff -NurpP --minimal linux-3.0.46/arch/alpha/kernel/systbls.S linux-3.0.46-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.46/arch/alpha/kernel/traps.c linux-3.0.46-vs2.3.2.5/arch/alpha/kernel/traps.c
---- linux-3.0.46/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/alpha/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -239,10 +239,10 @@ diff -NurpP --minimal linux-3.0.46/arch/alpha/kernel/traps.c linux-3.0.46-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.46/arch/arm/Kconfig linux-3.0.46-vs2.3.2.5/arch/arm/Kconfig
---- linux-3.0.46/arch/arm/Kconfig 2012-10-20 19:47:04.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/arm/Kconfig 2012-10-20 19:57:21.000000000 +0200
-@@ -2062,6 +2062,8 @@ source "fs/Kconfig"
+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
+@@ -2072,6 +2072,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -251,9 +251,9 @@ diff -NurpP --minimal linux-3.0.46/arch/arm/Kconfig linux-3.0.46-vs2.3.2.5/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.46/arch/arm/kernel/calls.S linux-3.0.46-vs2.3.2.5/arch/arm/kernel/calls.S
---- linux-3.0.46/arch/arm/kernel/calls.S 2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/arm/kernel/calls.S 2011-06-10 22:11:24.000000000 +0200
+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
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -263,9 +263,9 @@ diff -NurpP --minimal linux-3.0.46/arch/arm/kernel/calls.S linux-3.0.46-vs2.3.2.
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.0.46/arch/arm/kernel/process.c linux-3.0.46-vs2.3.2.5/arch/arm/kernel/process.c
---- linux-3.0.46/arch/arm/kernel/process.c 2012-10-20 19:47:04.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/arm/kernel/process.c 2011-12-19 15:55:53.000000000 +0100
+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
@@ -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.46/arch/arm/kernel/process.c linux-3.0.46-vs2.3.
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-3.0.46/arch/arm/kernel/traps.c linux-3.0.46-vs2.3.2.5/arch/arm/kernel/traps.c
---- linux-3.0.46/arch/arm/kernel/traps.c 2012-10-20 19:47:05.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/arm/kernel/traps.c 2012-06-08 15:28:23.000000000 +0200
+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
@@ -242,8 +242,8 @@ static int __die(const char *str, int er
print_modules();
@@ -290,9 +290,9 @@ diff -NurpP --minimal linux-3.0.46/arch/arm/kernel/traps.c linux-3.0.46-vs2.3.2.
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.0.46/arch/cris/Kconfig linux-3.0.46-vs2.3.2.5/arch/cris/Kconfig
---- linux-3.0.46/arch/cris/Kconfig 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/cris/Kconfig 2011-06-10 22:11:24.000000000 +0200
+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
@@ -678,6 +678,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -302,9 +302,9 @@ diff -NurpP --minimal linux-3.0.46/arch/cris/Kconfig linux-3.0.46-vs2.3.2.5/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.46/arch/frv/kernel/kernel_thread.S linux-3.0.46-vs2.3.2.5/arch/frv/kernel/kernel_thread.S
---- linux-3.0.46/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/arch/frv/kernel/kernel_thread.S 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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.46/arch/frv/kernel/kernel_thread.S linux-3.0.46-
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.46/arch/h8300/Kconfig linux-3.0.46-vs2.3.2.5/arch/h8300/Kconfig
---- linux-3.0.46/arch/h8300/Kconfig 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/h8300/Kconfig 2011-06-10 22:11:24.000000000 +0200
+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
@@ -213,6 +213,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -326,9 +326,9 @@ diff -NurpP --minimal linux-3.0.46/arch/h8300/Kconfig linux-3.0.46-vs2.3.2.5/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.46/arch/ia64/Kconfig linux-3.0.46-vs2.3.2.5/arch/ia64/Kconfig
---- linux-3.0.46/arch/ia64/Kconfig 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/ia64/Kconfig 2011-06-10 22:11:24.000000000 +0200
+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
@@ -671,6 +671,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -338,9 +338,9 @@ diff -NurpP --minimal linux-3.0.46/arch/ia64/Kconfig linux-3.0.46-vs2.3.2.5/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.46/arch/ia64/include/asm/tlb.h linux-3.0.46-vs2.3.2.5/arch/ia64/include/asm/tlb.h
---- linux-3.0.46/arch/ia64/include/asm/tlb.h 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/ia64/include/asm/tlb.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -349,9 +349,9 @@ diff -NurpP --minimal linux-3.0.46/arch/ia64/include/asm/tlb.h linux-3.0.46-vs2.
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.46/arch/ia64/kernel/entry.S linux-3.0.46-vs2.3.2.5/arch/ia64/kernel/entry.S
---- linux-3.0.46/arch/ia64/kernel/entry.S 2012-10-20 19:47:06.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/ia64/kernel/entry.S 2012-06-08 15:28:23.000000000 +0200
+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
@@ -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.46/arch/ia64/kernel/entry.S linux-3.0.46-vs2.3.2
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-3.0.46/arch/ia64/kernel/perfmon.c linux-3.0.46-vs2.3.2.5/arch/ia64/kernel/perfmon.c
---- linux-3.0.46/arch/ia64/kernel/perfmon.c 2011-03-15 18:06:39.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/arch/ia64/kernel/perfmon.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -42,6 +42,7 @@
#include <linux/completion.h>
#include <linux/tracehook.h>
@@ -372,9 +372,9 @@ diff -NurpP --minimal linux-3.0.46/arch/ia64/kernel/perfmon.c linux-3.0.46-vs2.3
#include <asm/errno.h>
#include <asm/intrinsics.h>
-diff -NurpP --minimal linux-3.0.46/arch/ia64/kernel/process.c linux-3.0.46-vs2.3.2.5/arch/ia64/kernel/process.c
---- linux-3.0.46/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/arch/ia64/kernel/process.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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.46/arch/ia64/kernel/process.c linux-3.0.46-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.46/arch/ia64/kernel/ptrace.c linux-3.0.46-vs2.3.2.5/arch/ia64/kernel/ptrace.c
---- linux-3.0.46/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/arch/ia64/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -397,9 +397,9 @@ diff -NurpP --minimal linux-3.0.46/arch/ia64/kernel/ptrace.c linux-3.0.46-vs2.3.
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.46/arch/ia64/kernel/traps.c linux-3.0.46-vs2.3.2.5/arch/ia64/kernel/traps.c
---- linux-3.0.46/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/ia64/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -424,9 +424,9 @@ diff -NurpP --minimal linux-3.0.46/arch/ia64/kernel/traps.c linux-3.0.46-vs2.3.2
}
}
}
-diff -NurpP --minimal linux-3.0.46/arch/ia64/mm/fault.c linux-3.0.46-vs2.3.2.5/arch/ia64/mm/fault.c
---- linux-3.0.46/arch/ia64/mm/fault.c 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/ia64/mm/fault.c 2011-06-10 22:28:23.000000000 +0200
+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
@@ -11,6 +11,7 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -435,9 +435,9 @@ diff -NurpP --minimal linux-3.0.46/arch/ia64/mm/fault.c linux-3.0.46-vs2.3.2.5/a
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.46/arch/m32r/kernel/traps.c linux-3.0.46-vs2.3.2.5/arch/m32r/kernel/traps.c
---- linux-3.0.46/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/arch/m32r/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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.46/arch/m32r/kernel/traps.c linux-3.0.46-vs2.3.2
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.0.46/arch/m68k/Kconfig linux-3.0.46-vs2.3.2.5/arch/m68k/Kconfig
---- linux-3.0.46/arch/m68k/Kconfig 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/m68k/Kconfig 2011-06-10 22:11:24.000000000 +0200
+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
@@ -241,6 +241,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -462,9 +462,9 @@ diff -NurpP --minimal linux-3.0.46/arch/m68k/Kconfig linux-3.0.46-vs2.3.2.5/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.46/arch/mips/Kconfig linux-3.0.46-vs2.3.2.5/arch/mips/Kconfig
---- linux-3.0.46/arch/mips/Kconfig 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/mips/Kconfig 2011-06-10 22:11:24.000000000 +0200
+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
@@ -2485,6 +2485,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -474,9 +474,9 @@ diff -NurpP --minimal linux-3.0.46/arch/mips/Kconfig linux-3.0.46-vs2.3.2.5/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.46/arch/mips/kernel/ptrace.c linux-3.0.46-vs2.3.2.5/arch/mips/kernel/ptrace.c
---- linux-3.0.46/arch/mips/kernel/ptrace.c 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/mips/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -495,9 +495,9 @@ diff -NurpP --minimal linux-3.0.46/arch/mips/kernel/ptrace.c linux-3.0.46-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.46/arch/mips/kernel/scall32-o32.S linux-3.0.46-vs2.3.2.5/arch/mips/kernel/scall32-o32.S
---- linux-3.0.46/arch/mips/kernel/scall32-o32.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/mips/kernel/scall32-o32.S 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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.46/arch/mips/kernel/scall32-o32.S linux-3.0.46-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.46/arch/mips/kernel/scall64-64.S linux-3.0.46-vs2.3.2.5/arch/mips/kernel/scall64-64.S
---- linux-3.0.46/arch/mips/kernel/scall64-64.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/mips/kernel/scall64-64.S 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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.46/arch/mips/kernel/scall64-64.S linux-3.0.46-vs
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.0.46/arch/mips/kernel/scall64-n32.S linux-3.0.46-vs2.3.2.5/arch/mips/kernel/scall64-n32.S
---- linux-3.0.46/arch/mips/kernel/scall64-n32.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/mips/kernel/scall64-n32.S 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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.46/arch/mips/kernel/scall64-n32.S linux-3.0.46-v
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.0.46/arch/mips/kernel/scall64-o32.S linux-3.0.46-vs2.3.2.5/arch/mips/kernel/scall64-o32.S
---- linux-3.0.46/arch/mips/kernel/scall64-o32.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/mips/kernel/scall64-o32.S 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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.46/arch/mips/kernel/scall64-o32.S linux-3.0.46-v
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.0.46/arch/mips/kernel/traps.c linux-3.0.46-vs2.3.2.5/arch/mips/kernel/traps.c
---- linux-3.0.46/arch/mips/kernel/traps.c 2011-05-22 16:17:00.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/mips/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
@@ -560,9 +560,9 @@ diff -NurpP --minimal linux-3.0.46/arch/mips/kernel/traps.c linux-3.0.46-vs2.3.2
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-3.0.46/arch/parisc/Kconfig linux-3.0.46-vs2.3.2.5/arch/parisc/Kconfig
---- linux-3.0.46/arch/parisc/Kconfig 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/parisc/Kconfig 2011-06-10 22:11:24.000000000 +0200
+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
@@ -279,6 +279,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -572,9 +572,9 @@ diff -NurpP --minimal linux-3.0.46/arch/parisc/Kconfig linux-3.0.46-vs2.3.2.5/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.46/arch/parisc/kernel/syscall_table.S linux-3.0.46-vs2.3.2.5/arch/parisc/kernel/syscall_table.S
---- linux-3.0.46/arch/parisc/kernel/syscall_table.S 2012-10-20 19:47:06.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/parisc/kernel/syscall_table.S 2011-08-29 03:45:07.000000000 +0200
+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
@@ -361,7 +361,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -584,9 +584,9 @@ diff -NurpP --minimal linux-3.0.46/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.46/arch/parisc/kernel/traps.c linux-3.0.46-vs2.3.2.5/arch/parisc/kernel/traps.c
---- linux-3.0.46/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/parisc/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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.46/arch/parisc/kernel/traps.c linux-3.0.46-vs2.3
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.0.46/arch/parisc/mm/fault.c linux-3.0.46-vs2.3.2.5/arch/parisc/mm/fault.c
---- linux-3.0.46/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/parisc/mm/fault.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -237,8 +237,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
@@ -625,9 +625,9 @@ diff -NurpP --minimal linux-3.0.46/arch/parisc/mm/fault.c linux-3.0.46-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.46/arch/powerpc/Kconfig linux-3.0.46-vs2.3.2.5/arch/powerpc/Kconfig
---- linux-3.0.46/arch/powerpc/Kconfig 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/powerpc/Kconfig 2011-06-10 22:11:24.000000000 +0200
+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
@@ -978,6 +978,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -637,9 +637,9 @@ diff -NurpP --minimal linux-3.0.46/arch/powerpc/Kconfig linux-3.0.46-vs2.3.2.5/a
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-3.0.46/arch/powerpc/include/asm/unistd.h linux-3.0.46-vs2.3.2.5/arch/powerpc/include/asm/unistd.h
---- linux-3.0.46/arch/powerpc/include/asm/unistd.h 2011-07-22 11:17:40.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/powerpc/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -649,9 +649,9 @@ diff -NurpP --minimal linux-3.0.46/arch/powerpc/include/asm/unistd.h linux-3.0.4
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-3.0.46/arch/powerpc/kernel/process.c linux-3.0.46-vs2.3.2.5/arch/powerpc/kernel/process.c
---- linux-3.0.46/arch/powerpc/kernel/process.c 2012-10-20 19:47:06.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/powerpc/kernel/process.c 2012-09-16 18:24:54.000000000 +0200
+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
@@ -656,8 +656,9 @@ void show_regs(struct pt_regs * regs)
#else
printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
@@ -664,10 +664,10 @@ diff -NurpP --minimal linux-3.0.46/arch/powerpc/kernel/process.c linux-3.0.46-vs
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-3.0.46/arch/powerpc/kernel/traps.c linux-3.0.46-vs2.3.2.5/arch/powerpc/kernel/traps.c
---- linux-3.0.46/arch/powerpc/kernel/traps.c 2011-07-22 11:17:40.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/powerpc/kernel/traps.c 2011-07-19 00:44:39.000000000 +0200
-@@ -1075,8 +1075,9 @@ void nonrecoverable_exception(struct pt_
+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
+@@ -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.46/arch/powerpc/kernel/traps.c linux-3.0.46-vs2.
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-3.0.46/arch/powerpc/kernel/vdso.c linux-3.0.46-vs2.3.2.5/arch/powerpc/kernel/vdso.c
---- linux-3.0.46/arch/powerpc/kernel/vdso.c 2011-05-22 16:17:02.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/powerpc/kernel/vdso.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -23,6 +23,7 @@
#include <linux/security.h>
#include <linux/bootmem.h>
@@ -690,9 +690,9 @@ diff -NurpP --minimal linux-3.0.46/arch/powerpc/kernel/vdso.c linux-3.0.46-vs2.3
#include <asm/pgtable.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-3.0.46/arch/s390/Kconfig linux-3.0.46-vs2.3.2.5/arch/s390/Kconfig
---- linux-3.0.46/arch/s390/Kconfig 2012-10-20 19:47:07.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/s390/Kconfig 2012-06-08 15:28:23.000000000 +0200
+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
@@ -630,6 +630,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -702,9 +702,9 @@ diff -NurpP --minimal linux-3.0.46/arch/s390/Kconfig linux-3.0.46-vs2.3.2.5/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.46/arch/s390/include/asm/tlb.h linux-3.0.46-vs2.3.2.5/arch/s390/include/asm/tlb.h
---- linux-3.0.46/arch/s390/include/asm/tlb.h 2012-10-20 19:47:07.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/s390/include/asm/tlb.h 2012-06-08 15:28:23.000000000 +0200
+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
@@ -24,6 +24,8 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -714,9 +714,9 @@ diff -NurpP --minimal linux-3.0.46/arch/s390/include/asm/tlb.h linux-3.0.46-vs2.
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.0.46/arch/s390/include/asm/unistd.h linux-3.0.46-vs2.3.2.5/arch/s390/include/asm/unistd.h
---- linux-3.0.46/arch/s390/include/asm/unistd.h 2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/s390/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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.46/arch/s390/include/asm/unistd.h linux-3.0.46-v
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-3.0.46/arch/s390/kernel/ptrace.c linux-3.0.46-vs2.3.2.5/arch/s390/kernel/ptrace.c
---- linux-3.0.46/arch/s390/kernel/ptrace.c 2012-10-20 19:47:07.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/s390/kernel/ptrace.c 2012-03-15 13:33:10.000000000 +0100
+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
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
@@ -737,9 +737,9 @@ diff -NurpP --minimal linux-3.0.46/arch/s390/kernel/ptrace.c linux-3.0.46-vs2.3.
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-3.0.46/arch/s390/kernel/syscalls.S linux-3.0.46-vs2.3.2.5/arch/s390/kernel/syscalls.S
---- linux-3.0.46/arch/s390/kernel/syscalls.S 2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/s390/kernel/syscalls.S 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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.46/arch/s390/kernel/syscalls.S linux-3.0.46-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.46/arch/sh/Kconfig linux-3.0.46-vs2.3.2.5/arch/sh/Kconfig
---- linux-3.0.46/arch/sh/Kconfig 2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/sh/Kconfig 2011-07-19 00:44:39.000000000 +0200
+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
@@ -893,6 +893,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -761,9 +761,9 @@ diff -NurpP --minimal linux-3.0.46/arch/sh/Kconfig linux-3.0.46-vs2.3.2.5/arch/s
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.46/arch/sh/kernel/irq.c linux-3.0.46-vs2.3.2.5/arch/sh/kernel/irq.c
---- linux-3.0.46/arch/sh/kernel/irq.c 2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/sh/kernel/irq.c 2011-07-19 00:45:06.000000000 +0200
+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
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
@@ -772,9 +772,9 @@ diff -NurpP --minimal linux-3.0.46/arch/sh/kernel/irq.c linux-3.0.46-vs2.3.2.5/a
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.0.46/arch/sh/kernel/vsyscall/vsyscall.c linux-3.0.46-vs2.3.2.5/arch/sh/kernel/vsyscall/vsyscall.c
---- linux-3.0.46/arch/sh/kernel/vsyscall/vsyscall.c 2011-05-22 16:17:07.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/sh/kernel/vsyscall/vsyscall.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -18,6 +18,7 @@
#include <linux/elf.h>
#include <linux/sched.h>
@@ -783,9 +783,9 @@ diff -NurpP --minimal linux-3.0.46/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.46/arch/sparc/Kconfig linux-3.0.46-vs2.3.2.5/arch/sparc/Kconfig
---- linux-3.0.46/arch/sparc/Kconfig 2012-10-20 19:47:07.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/sparc/Kconfig 2012-06-08 15:28:23.000000000 +0200
+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"
source "arch/sparc/Kconfig.debug"
@@ -795,9 +795,9 @@ diff -NurpP --minimal linux-3.0.46/arch/sparc/Kconfig linux-3.0.46-vs2.3.2.5/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.46/arch/sparc/include/asm/tlb_64.h linux-3.0.46-vs2.3.2.5/arch/sparc/include/asm/tlb_64.h
---- linux-3.0.46/arch/sparc/include/asm/tlb_64.h 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/sparc/include/asm/tlb_64.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -3,6 +3,7 @@
#include <linux/swap.h>
@@ -806,9 +806,9 @@ diff -NurpP --minimal linux-3.0.46/arch/sparc/include/asm/tlb_64.h linux-3.0.46-
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
-diff -NurpP --minimal linux-3.0.46/arch/sparc/include/asm/unistd.h linux-3.0.46-vs2.3.2.5/arch/sparc/include/asm/unistd.h
---- linux-3.0.46/arch/sparc/include/asm/unistd.h 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/sparc/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -335,7 +335,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -818,9 +818,9 @@ diff -NurpP --minimal linux-3.0.46/arch/sparc/include/asm/unistd.h linux-3.0.46-
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-3.0.46/arch/sparc/kernel/systbls_32.S linux-3.0.46-vs2.3.2.5/arch/sparc/kernel/systbls_32.S
---- linux-3.0.46/arch/sparc/kernel/systbls_32.S 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/sparc/kernel/systbls_32.S 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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.46/arch/sparc/kernel/systbls_32.S linux-3.0.46-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.46/arch/sparc/kernel/systbls_64.S linux-3.0.46-vs2.3.2.5/arch/sparc/kernel/systbls_64.S
---- linux-3.0.46/arch/sparc/kernel/systbls_64.S 2012-10-20 19:47:10.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/sparc/kernel/systbls_64.S 2012-06-08 15:28:23.000000000 +0200
+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
@@ -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.46/arch/sparc/kernel/systbls_64.S linux-3.0.46-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.46/arch/um/Kconfig.rest linux-3.0.46-vs2.3.2.5/arch/um/Kconfig.rest
---- linux-3.0.46/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/um/Kconfig.rest 2011-06-10 22:11:24.000000000 +0200
+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
@@ -18,6 +18,8 @@ source "drivers/connector/Kconfig"
source "fs/Kconfig"
@@ -863,9 +863,9 @@ diff -NurpP --minimal linux-3.0.46/arch/um/Kconfig.rest linux-3.0.46-vs2.3.2.5/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.46/arch/um/include/asm/tlb.h linux-3.0.46-vs2.3.2.5/arch/um/include/asm/tlb.h
---- linux-3.0.46/arch/um/include/asm/tlb.h 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/um/include/asm/tlb.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -3,6 +3,7 @@
#include <linux/pagemap.h>
@@ -874,10 +874,10 @@ diff -NurpP --minimal linux-3.0.46/arch/um/include/asm/tlb.h linux-3.0.46-vs2.3.
#include <asm/percpu.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.0.46/arch/x86/Kconfig linux-3.0.46-vs2.3.2.5/arch/x86/Kconfig
---- linux-3.0.46/arch/x86/Kconfig 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/x86/Kconfig 2011-07-22 11:20:39.000000000 +0200
-@@ -2159,6 +2159,8 @@ source "fs/Kconfig"
+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"
source "arch/x86/Kconfig.debug"
@@ -886,9 +886,9 @@ diff -NurpP --minimal linux-3.0.46/arch/x86/Kconfig linux-3.0.46-vs2.3.2.5/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.46/arch/x86/ia32/ia32entry.S linux-3.0.46-vs2.3.2.5/arch/x86/ia32/ia32entry.S
---- linux-3.0.46/arch/x86/ia32/ia32entry.S 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/x86/ia32/ia32entry.S 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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.46/arch/x86/ia32/ia32entry.S linux-3.0.46-vs2.3.
.quad sys_mbind
.quad compat_sys_get_mempolicy /* 275 */
.quad sys_set_mempolicy
-diff -NurpP --minimal linux-3.0.46/arch/x86/include/asm/unistd_64.h linux-3.0.46-vs2.3.2.5/arch/x86/include/asm/unistd_64.h
---- linux-3.0.46/arch/x86/include/asm/unistd_64.h 2011-07-22 11:17:43.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/x86/include/asm/unistd_64.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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.46/arch/x86/include/asm/unistd_64.h linux-3.0.46
#define __NR_mbind 237
__SYSCALL(__NR_mbind, sys_mbind)
#define __NR_set_mempolicy 238
-diff -NurpP --minimal linux-3.0.46/arch/x86/kernel/syscall_table_32.S linux-3.0.46-vs2.3.2.5/arch/x86/kernel/syscall_table_32.S
---- linux-3.0.46/arch/x86/kernel/syscall_table_32.S 2011-07-22 11:17:43.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/arch/x86/kernel/syscall_table_32.S 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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.46/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.46/block/genhd.c linux-3.0.46-vs2.3.2.5/block/genhd.c
---- linux-3.0.46/block/genhd.c 2012-10-20 19:47:11.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/block/genhd.c 2012-06-08 15:28:23.000000000 +0200
+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
@@ -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.46/block/genhd.c linux-3.0.46-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.46/drivers/block/Kconfig linux-3.0.46-vs2.3.2.5/drivers/block/Kconfig
---- linux-3.0.46/drivers/block/Kconfig 2011-07-22 11:17:44.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/drivers/block/Kconfig 2011-06-10 22:11:24.000000000 +0200
+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
@@ -273,6 +273,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
@@ -964,9 +964,9 @@ diff -NurpP --minimal linux-3.0.46/drivers/block/Kconfig linux-3.0.46-vs2.3.2.5/
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-3.0.46/drivers/block/Makefile linux-3.0.46-vs2.3.2.5/drivers/block/Makefile
---- linux-3.0.46/drivers/block/Makefile 2011-07-22 11:17:44.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/drivers/block/Makefile 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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.46/drivers/block/Makefile linux-3.0.46-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.46/drivers/block/loop.c linux-3.0.46-vs2.3.2.5/drivers/block/loop.c
---- linux-3.0.46/drivers/block/loop.c 2012-10-20 19:47:12.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/drivers/block/loop.c 2011-08-31 19:37:44.000000000 +0200
+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
@@ -75,6 +75,7 @@
#include <linux/kthread.h>
#include <linux/splice.h>
@@ -1002,7 +1002,7 @@ diff -NurpP --minimal linux-3.0.46/drivers/block/loop.c linux-3.0.46-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,
+@@ -1059,7 +1062,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.46/drivers/block/loop.c linux-3.0.46-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,
+@@ -1143,7 +1146,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;
@@ -1031,9 +1031,9 @@ diff -NurpP --minimal linux-3.0.46/drivers/block/loop.c linux-3.0.46-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.46/drivers/block/vroot.c linux-3.0.46-vs2.3.2.5/drivers/block/vroot.c
---- linux-3.0.46/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/drivers/block/vroot.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,292 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -1327,9 +1327,9 @@ diff -NurpP --minimal linux-3.0.46/drivers/block/vroot.c linux-3.0.46-vs2.3.2.5/
+
+#endif
+
-diff -NurpP --minimal linux-3.0.46/drivers/infiniband/Kconfig linux-3.0.46-vs2.3.2.5/drivers/infiniband/Kconfig
---- linux-3.0.46/drivers/infiniband/Kconfig 2011-07-22 11:17:45.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/drivers/infiniband/Kconfig 2012-02-15 05:19:42.000000000 +0100
+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
@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
config INFINIBAND_ADDR_TRANS
bool
@@ -1339,9 +1339,9 @@ diff -NurpP --minimal linux-3.0.46/drivers/infiniband/Kconfig linux-3.0.46-vs2.3
default y
source "drivers/infiniband/hw/mthca/Kconfig"
-diff -NurpP --minimal linux-3.0.46/drivers/infiniband/core/addr.c linux-3.0.46-vs2.3.2.5/drivers/infiniband/core/addr.c
---- linux-3.0.46/drivers/infiniband/core/addr.c 2012-10-20 19:47:14.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/drivers/infiniband/core/addr.c 2012-02-15 05:20:43.000000000 +0100
+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
@@ -254,7 +254,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl6.saddr)) {
@@ -1351,9 +1351,9 @@ diff -NurpP --minimal linux-3.0.46/drivers/infiniband/core/addr.c linux-3.0.46-v
if (ret)
goto put;
-diff -NurpP --minimal linux-3.0.46/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-3.0.46-vs2.3.2.5/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-3.0.46/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-05-22 16:17:16.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -35,6 +35,7 @@
#include <linux/device.h>
#include <linux/slab.h>
@@ -1362,9 +1362,9 @@ diff -NurpP --minimal linux-3.0.46/drivers/infiniband/hw/ipath/ipath_user_pages.
#include "ipath_kernel.h"
-diff -NurpP --minimal linux-3.0.46/drivers/md/dm-ioctl.c linux-3.0.46-vs2.3.2.5/drivers/md/dm-ioctl.c
---- linux-3.0.46/drivers/md/dm-ioctl.c 2011-05-22 16:17:18.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/drivers/md/dm-ioctl.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
@@ -1393,7 +1393,7 @@ diff -NurpP --minimal linux-3.0.46/drivers/md/dm-ioctl.c linux-3.0.46-vs2.3.2.5/
dm_get(hc->md);
return hc;
}
-@@ -427,6 +430,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
+@@ -427,6 +430,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
static int remove_all(struct dm_ioctl *param, size_t param_size)
{
@@ -1403,7 +1403,7 @@ diff -NurpP --minimal linux-3.0.46/drivers/md/dm-ioctl.c linux-3.0.46-vs2.3.2.5/
dm_hash_remove_all(1);
param->data_size = 0;
return 0;
-@@ -474,6 +480,8 @@ static int list_devices(struct dm_ioctl
+@@ -474,6 +480,8 @@ static int list_devices(struct dm_ioctl
*/
for (i = 0; i < NUM_BUCKETS; i++) {
list_for_each_entry (hc, _name_buckets + i, name_list) {
@@ -1412,7 +1412,7 @@ diff -NurpP --minimal linux-3.0.46/drivers/md/dm-ioctl.c linux-3.0.46-vs2.3.2.5/
needed += sizeof(struct dm_name_list);
needed += strlen(hc->name) + 1;
needed += ALIGN_MASK;
-@@ -497,6 +505,8 @@ static int list_devices(struct dm_ioctl
+@@ -497,6 +505,8 @@ static int list_devices(struct dm_ioctl
*/
for (i = 0; i < NUM_BUCKETS; i++) {
list_for_each_entry (hc, _name_buckets + i, name_list) {
@@ -1435,7 +1435,7 @@ diff -NurpP --minimal linux-3.0.46/drivers/md/dm-ioctl.c linux-3.0.46-vs2.3.2.5/
out:
return mdptr;
}
-@@ -1577,8 +1588,8 @@ static int ctl_ioctl(uint command, struc
+@@ -1585,8 +1596,8 @@ static int ctl_ioctl(uint command, struc
ioctl_fn fn = NULL;
size_t input_param_size;
@@ -1446,9 +1446,9 @@ diff -NurpP --minimal linux-3.0.46/drivers/md/dm-ioctl.c linux-3.0.46-vs2.3.2.5/
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.0.46/drivers/md/dm.c linux-3.0.46-vs2.3.2.5/drivers/md/dm.c
---- linux-3.0.46/drivers/md/dm.c 2012-10-20 19:47:15.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/drivers/md/dm.c 2012-10-20 19:57:21.000000000 +0200
+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
@@ -20,6 +20,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
@@ -1465,7 +1465,7 @@ diff -NurpP --minimal linux-3.0.46/drivers/md/dm.c linux-3.0.46-vs2.3.2.5/driver
unsigned long flags;
-@@ -334,6 +336,7 @@ int dm_deleting_md(struct mapped_device
+@@ -334,6 +336,7 @@ int dm_deleting_md(struct mapped_device
static int dm_blk_open(struct block_device *bdev, fmode_t mode)
{
struct mapped_device *md;
@@ -1514,7 +1514,7 @@ diff -NurpP --minimal linux-3.0.46/drivers/md/dm.c linux-3.0.46-vs2.3.2.5/driver
/*-----------------------------------------------------------------
* CRUD START:
* A more elegant soln is in the works that uses the queue
-@@ -1867,6 +1879,7 @@ static struct mapped_device *alloc_dev(i
+@@ -1873,6 +1885,7 @@ static struct mapped_device *alloc_dev(i
INIT_LIST_HEAD(&md->uevent_list);
spin_lock_init(&md->uevent_lock);
@@ -1522,9 +1522,9 @@ diff -NurpP --minimal linux-3.0.46/drivers/md/dm.c linux-3.0.46-vs2.3.2.5/driver
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-3.0.46/drivers/md/dm.h linux-3.0.46-vs2.3.2.5/drivers/md/dm.h
---- linux-3.0.46/drivers/md/dm.h 2011-05-22 16:17:18.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/drivers/md/dm.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -41,6 +41,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
@@ -1534,9 +1534,9 @@ diff -NurpP --minimal linux-3.0.46/drivers/md/dm.h linux-3.0.46-vs2.3.2.5/driver
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.0.46/drivers/net/tun.c linux-3.0.46-vs2.3.2.5/drivers/net/tun.c
---- linux-3.0.46/drivers/net/tun.c 2012-10-20 19:47:22.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/drivers/net/tun.c 2012-09-01 11:37:46.000000000 +0200
+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
@@ -64,6 +64,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
@@ -1553,7 +1553,7 @@ diff -NurpP --minimal linux-3.0.46/drivers/net/tun.c linux-3.0.46-vs2.3.2.5/driv
struct net_device *dev;
u32 set_features;
-@@ -905,6 +907,7 @@ static void tun_setup(struct net_device
+@@ -905,6 +907,7 @@ static void tun_setup(struct net_device
tun->owner = -1;
tun->group = -1;
@@ -1561,7 +1561,7 @@ diff -NurpP --minimal linux-3.0.46/drivers/net/tun.c linux-3.0.46-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,
+@@ -1055,7 +1058,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 +1570,7 @@ diff -NurpP --minimal linux-3.0.46/drivers/net/tun.c linux-3.0.46-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,
+@@ -1069,7 +1072,7 @@ static int tun_set_iff(struct net *net,
char *name;
unsigned long flags = 0;
@@ -1579,7 +1579,7 @@ diff -NurpP --minimal linux-3.0.46/drivers/net/tun.c linux-3.0.46-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,
+@@ -1137,6 +1140,9 @@ static int tun_set_iff(struct net *net,
sk->sk_destruct = tun_sock_destruct;
@@ -1589,7 +1589,7 @@ diff -NurpP --minimal linux-3.0.46/drivers/net/tun.c linux-3.0.46-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
+@@ -1320,6 +1326,16 @@ static long __tun_chr_ioctl(struct file
tun_debug(KERN_INFO, tun, "group set to %d\n", tun->group);
break;
@@ -1606,9 +1606,9 @@ diff -NurpP --minimal linux-3.0.46/drivers/net/tun.c linux-3.0.46-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.46/drivers/tty/sysrq.c linux-3.0.46-vs2.3.2.5/drivers/tty/sysrq.c
---- linux-3.0.46/drivers/tty/sysrq.c 2011-05-22 16:17:44.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/drivers/tty/sysrq.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -41,6 +41,7 @@
#include <linux/oom.h>
#include <linux/slab.h>
@@ -1660,9 +1660,9 @@ diff -NurpP --minimal linux-3.0.46/drivers/tty/sysrq.c linux-3.0.46-vs2.3.2.5/dr
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-3.0.46/drivers/tty/tty_io.c linux-3.0.46-vs2.3.2.5/drivers/tty/tty_io.c
---- linux-3.0.46/drivers/tty/tty_io.c 2012-10-20 19:47:28.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/drivers/tty/tty_io.c 2011-11-15 17:37:05.000000000 +0100
+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
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
@@ -1689,9 +1689,9 @@ diff -NurpP --minimal linux-3.0.46/drivers/tty/tty_io.c linux-3.0.46-vs2.3.2.5/d
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-3.0.46/fs/attr.c linux-3.0.46-vs2.3.2.5/fs/attr.c
---- linux-3.0.46/fs/attr.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/attr.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -13,6 +13,9 @@
#include <linux/fsnotify.h>
#include <linux/fcntl.h>
@@ -1732,9 +1732,9 @@ diff -NurpP --minimal linux-3.0.46/fs/attr.c linux-3.0.46-vs2.3.2.5/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-3.0.46/fs/binfmt_aout.c linux-3.0.46-vs2.3.2.5/fs/binfmt_aout.c
---- linux-3.0.46/fs/binfmt_aout.c 2010-10-21 13:07:47.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/binfmt_aout.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -25,6 +25,7 @@
#include <linux/init.h>
#include <linux/coredump.h>
@@ -1743,9 +1743,9 @@ diff -NurpP --minimal linux-3.0.46/fs/binfmt_aout.c linux-3.0.46-vs2.3.2.5/fs/bi
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.0.46/fs/binfmt_elf.c linux-3.0.46-vs2.3.2.5/fs/binfmt_elf.c
---- linux-3.0.46/fs/binfmt_elf.c 2012-10-20 19:47:30.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/binfmt_elf.c 2012-10-20 19:57:21.000000000 +0200
+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
@@ -32,6 +32,7 @@
#include <linux/elf.h>
#include <linux/utsname.h>
@@ -1754,9 +1754,9 @@ diff -NurpP --minimal linux-3.0.46/fs/binfmt_elf.c linux-3.0.46-vs2.3.2.5/fs/bin
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-3.0.46/fs/binfmt_flat.c linux-3.0.46-vs2.3.2.5/fs/binfmt_flat.c
---- linux-3.0.46/fs/binfmt_flat.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/binfmt_flat.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -35,6 +35,7 @@
#include <linux/init.h>
#include <linux/flat.h>
@@ -1765,9 +1765,9 @@ diff -NurpP --minimal linux-3.0.46/fs/binfmt_flat.c linux-3.0.46-vs2.3.2.5/fs/bi
#include <asm/byteorder.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-3.0.46/fs/binfmt_som.c linux-3.0.46-vs2.3.2.5/fs/binfmt_som.c
---- linux-3.0.46/fs/binfmt_som.c 2010-02-25 11:52:04.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/fs/binfmt_som.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/personality.h>
@@ -1776,9 +1776,9 @@ diff -NurpP --minimal linux-3.0.46/fs/binfmt_som.c linux-3.0.46-vs2.3.2.5/fs/bin
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.0.46/fs/block_dev.c linux-3.0.46-vs2.3.2.5/fs/block_dev.c
---- linux-3.0.46/fs/block_dev.c 2012-10-20 19:47:30.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/block_dev.c 2012-06-08 15:28:24.000000000 +0200
+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
@@ -25,6 +25,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
@@ -1816,9 +1816,9 @@ diff -NurpP --minimal linux-3.0.46/fs/block_dev.c linux-3.0.46-vs2.3.2.5/fs/bloc
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.0.46/fs/btrfs/ctree.h linux-3.0.46-vs2.3.2.5/fs/btrfs/ctree.h
---- linux-3.0.46/fs/btrfs/ctree.h 2012-10-20 19:47:30.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/btrfs/ctree.h 2012-06-08 15:28:24.000000000 +0200
+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
@@ -600,11 +600,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
@@ -1852,7 +1852,7 @@ diff -NurpP --minimal linux-3.0.46/fs/btrfs/ctree.h linux-3.0.46-vs2.3.2.5/fs/bt
BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32);
BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64);
BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64);
-@@ -1621,6 +1627,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
+@@ -1621,6 +1627,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
@@ -1871,9 +1871,9 @@ diff -NurpP --minimal linux-3.0.46/fs/btrfs/ctree.h linux-3.0.46-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.46/fs/btrfs/disk-io.c linux-3.0.46-vs2.3.2.5/fs/btrfs/disk-io.c
---- linux-3.0.46/fs/btrfs/disk-io.c 2012-10-20 19:47:30.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/btrfs/disk-io.c 2012-09-01 11:37:47.000000000 +0200
+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
@@ -1766,6 +1766,9 @@ struct btrfs_root *open_ctree(struct sup
goto fail_alloc;
}
@@ -1884,9 +1884,9 @@ diff -NurpP --minimal linux-3.0.46/fs/btrfs/disk-io.c linux-3.0.46-vs2.3.2.5/fs/
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-3.0.46/fs/btrfs/inode.c linux-3.0.46-vs2.3.2.5/fs/btrfs/inode.c
---- linux-3.0.46/fs/btrfs/inode.c 2012-10-20 19:47:30.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/btrfs/inode.c 2011-10-18 13:51:13.000000000 +0200
+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
@@ -38,6 +38,7 @@
#include <linux/falloc.h>
#include <linux/slab.h>
@@ -1960,9 +1960,9 @@ diff -NurpP --minimal linux-3.0.46/fs/btrfs/inode.c linux-3.0.46-vs2.3.2.5/fs/bt
};
static const struct inode_operations btrfs_special_inode_operations = {
.getattr = btrfs_getattr,
-diff -NurpP --minimal linux-3.0.46/fs/btrfs/ioctl.c linux-3.0.46-vs2.3.2.5/fs/btrfs/ioctl.c
---- linux-3.0.46/fs/btrfs/ioctl.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/btrfs/ioctl.c 2011-06-22 12:39:15.000000000 +0200
+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
@@ -70,10 +70,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
@@ -2136,9 +2136,9 @@ diff -NurpP --minimal linux-3.0.46/fs/btrfs/ioctl.c linux-3.0.46-vs2.3.2.5/fs/bt
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-3.0.46/fs/btrfs/super.c linux-3.0.46-vs2.3.2.5/fs/btrfs/super.c
---- linux-3.0.46/fs/btrfs/super.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/btrfs/super.c 2011-07-19 00:44:39.000000000 +0200
+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
@@ -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 +2194,9 @@ diff -NurpP --minimal linux-3.0.46/fs/btrfs/super.c linux-3.0.46-vs2.3.2.5/fs/bt
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
-diff -NurpP --minimal linux-3.0.46/fs/char_dev.c linux-3.0.46-vs2.3.2.5/fs/char_dev.c
---- linux-3.0.46/fs/char_dev.c 2011-03-15 18:07:31.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/fs/char_dev.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
@@ -2229,9 +2229,9 @@ diff -NurpP --minimal linux-3.0.46/fs/char_dev.c linux-3.0.46-vs2.3.2.5/fs/char_
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.0.46/fs/dcache.c linux-3.0.46-vs2.3.2.5/fs/dcache.c
---- linux-3.0.46/fs/dcache.c 2012-10-20 19:47:30.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/dcache.c 2012-10-20 19:57:21.000000000 +0200
+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
@@ -36,6 +36,7 @@
#include <linux/bit_spinlock.h>
#include <linux/rculist_bl.h>
@@ -2275,7 +2275,7 @@ diff -NurpP --minimal linux-3.0.46/fs/dcache.c linux-3.0.46-vs2.3.2.5/fs/dcache.
spin_lock_init(&dentry->d_lock);
seqcount_init(&dentry->d_seq);
dentry->d_inode = NULL;
-@@ -1955,6 +1963,7 @@ struct dentry *__d_lookup(struct dentry
+@@ -1955,6 +1963,7 @@ struct dentry *__d_lookup(struct dentry
}
dentry->d_count++;
@@ -2283,9 +2283,9 @@ diff -NurpP --minimal linux-3.0.46/fs/dcache.c linux-3.0.46-vs2.3.2.5/fs/dcache.
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-3.0.46/fs/devpts/inode.c linux-3.0.46-vs2.3.2.5/fs/devpts/inode.c
---- linux-3.0.46/fs/devpts/inode.c 2011-05-22 16:17:50.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/devpts/inode.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
@@ -2377,10 +2377,10 @@ diff -NurpP --minimal linux-3.0.46/fs/devpts/inode.c linux-3.0.46-vs2.3.2.5/fs/d
inode->i_private = tty;
tty->driver_data = inode;
-diff -NurpP --minimal linux-3.0.46/fs/ext2/balloc.c linux-3.0.46-vs2.3.2.5/fs/ext2/balloc.c
---- linux-3.0.46/fs/ext2/balloc.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext2/balloc.c 2011-06-10 22:11:24.000000000 +0200
-@@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block
+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
+@@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
}
@@ -2388,10 +2388,10 @@ diff -NurpP --minimal linux-3.0.46/fs/ext2/balloc.c linux-3.0.46-vs2.3.2.5/fs/ex
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-3.0.46/fs/ext2/ext2.h linux-3.0.46-vs2.3.2.5/fs/ext2/ext2.h
---- linux-3.0.46/fs/ext2/ext2.h 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext2/ext2.h 2011-06-10 22:11:24.000000000 +0200
-@@ -126,6 +126,7 @@ extern void ext2_set_inode_flags(struct
+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
+@@ -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,
u64 start, u64 len);
@@ -2399,18 +2399,18 @@ diff -NurpP --minimal linux-3.0.46/fs/ext2/ext2.h linux-3.0.46-vs2.3.2.5/fs/ext2
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.0.46/fs/ext2/file.c linux-3.0.46-vs2.3.2.5/fs/ext2/file.c
---- linux-3.0.46/fs/ext2/file.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext2/file.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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.46/fs/ext2/ialloc.c linux-3.0.46-vs2.3.2.5/fs/ext2/ialloc.c
---- linux-3.0.46/fs/ext2/ialloc.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext2/ialloc.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
@@ -2427,9 +2427,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ext2/ialloc.c linux-3.0.46-vs2.3.2.5/fs/ex
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.0.46/fs/ext2/inode.c linux-3.0.46-vs2.3.2.5/fs/ext2/inode.c
---- linux-3.0.46/fs/ext2/inode.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext2/inode.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -32,6 +32,7 @@
#include <linux/mpage.h>
#include <linux/fiemap.h>
@@ -2438,7 +2438,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ext2/inode.c linux-3.0.46-vs2.3.2.5/fs/ext
#include "ext2.h"
#include "acl.h"
#include "xip.h"
-@@ -1167,7 +1168,7 @@ static void ext2_truncate_blocks(struct
+@@ -1167,7 +1168,7 @@ static void ext2_truncate_blocks(struct
return;
if (ext2_inode_is_fast_symlink(inode))
return;
@@ -2568,7 +2568,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ext2/inode.c linux-3.0.46-vs2.3.2.5/fs/ext
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
raw_inode->i_size = cpu_to_le32(inode->i_size);
raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
-@@ -1533,7 +1569,8 @@ int ext2_setattr(struct dentry *dentry,
+@@ -1533,7 +1569,8 @@ int ext2_setattr(struct dentry *dentry,
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
@@ -2578,9 +2578,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ext2/inode.c linux-3.0.46-vs2.3.2.5/fs/ext
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-3.0.46/fs/ext2/ioctl.c linux-3.0.46-vs2.3.2.5/fs/ext2/ioctl.c
---- linux-3.0.46/fs/ext2/ioctl.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext2/ioctl.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
@@ -2630,9 +2630,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ext2/ioctl.c linux-3.0.46-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.46/fs/ext2/namei.c linux-3.0.46-vs2.3.2.5/fs/ext2/namei.c
---- linux-3.0.46/fs/ext2/namei.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext2/namei.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
@@ -2657,9 +2657,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ext2/namei.c linux-3.0.46-vs2.3.2.5/fs/ext
};
const struct inode_operations ext2_special_inode_operations = {
-diff -NurpP --minimal linux-3.0.46/fs/ext2/super.c linux-3.0.46-vs2.3.2.5/fs/ext2/super.c
---- linux-3.0.46/fs/ext2/super.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext2/super.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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,
@@ -2680,7 +2680,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ext2/super.c linux-3.0.46-vs2.3.2.5/fs/ext
{Opt_grpquota, "grpquota"},
{Opt_ignore, "noquota"},
{Opt_quota, "quota"},
-@@ -492,6 +496,20 @@ static int parse_options(char *options,
+@@ -492,6 +496,20 @@ static int parse_options(char *options,
case Opt_nouid32:
set_opt (sbi->s_mount_opt, NO_UID32);
break;
@@ -2710,10 +2710,11 @@ diff -NurpP --minimal linux-3.0.46/fs/ext2/super.c linux-3.0.46-vs2.3.2.5/fs/ext
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
MS_POSIXACL : 0);
-@@ -1224,6 +1244,14 @@ static int ext2_remount (struct super_bl
+@@ -1223,6 +1243,14 @@ static int ext2_remount (struct super_bl
+ err = -EINVAL;
goto restore_opts;
}
-
++
+ if ((sbi->s_mount_opt & EXT2_MOUNT_TAGGED) &&
+ !(sb->s_flags & MS_TAGGED)) {
+ printk("EXT2-fs: %s: tagging not permitted on remount.\n",
@@ -2721,13 +2722,12 @@ diff -NurpP --minimal linux-3.0.46/fs/ext2/super.c linux-3.0.46-vs2.3.2.5/fs/ext
+ err = -EINVAL;
+ goto restore_opts;
+ }
-+
+
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.46/fs/ext3/file.c linux-3.0.46-vs2.3.2.5/fs/ext3/file.c
---- linux-3.0.46/fs/ext3/file.c 2010-07-07 18:31:51.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext3/file.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -81,5 +81,6 @@ const struct inode_operations ext3_file_
#endif
.check_acl = ext3_check_acl,
@@ -2735,9 +2735,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ext3/file.c linux-3.0.46-vs2.3.2.5/fs/ext3
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-3.0.46/fs/ext3/ialloc.c linux-3.0.46-vs2.3.2.5/fs/ext3/ialloc.c
---- linux-3.0.46/fs/ext3/ialloc.c 2012-10-20 19:47:30.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext3/ialloc.c 2012-06-08 15:28:24.000000000 +0200
+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
@@ -23,6 +23,7 @@
#include <linux/buffer_head.h>
#include <linux/random.h>
@@ -2754,9 +2754,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ext3/ialloc.c linux-3.0.46-vs2.3.2.5/fs/ex
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.0.46/fs/ext3/inode.c linux-3.0.46-vs2.3.2.5/fs/ext3/inode.c
---- linux-3.0.46/fs/ext3/inode.c 2012-10-20 19:47:30.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext3/inode.c 2012-09-16 18:24:54.000000000 +0200
+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
@@ -38,6 +38,7 @@
#include <linux/bio.h>
#include <linux/fiemap.h>
@@ -2765,7 +2765,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ext3/inode.c linux-3.0.46-vs2.3.2.5/fs/ext
#include "xattr.h"
#include "acl.h"
-@@ -2409,7 +2410,7 @@ static void ext3_free_branches(handle_t
+@@ -2409,7 +2410,7 @@ static void ext3_free_branches(handle_t
int ext3_can_truncate(struct inode *inode)
{
@@ -2921,7 +2921,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ext3/inode.c linux-3.0.46-vs2.3.2.5/fs/ext
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
disksize = cpu_to_le32(ei->i_disksize);
if (disksize != raw_inode->i_size) {
-@@ -3219,7 +3256,8 @@ int ext3_setattr(struct dentry *dentry,
+@@ -3219,7 +3256,8 @@ int ext3_setattr(struct dentry *dentry,
if (is_quota_modification(inode, attr))
dquot_initialize(inode);
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
@@ -2931,7 +2931,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ext3/inode.c linux-3.0.46-vs2.3.2.5/fs/ext
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -3241,6 +3279,8 @@ int ext3_setattr(struct dentry *dentry,
+@@ -3241,6 +3279,8 @@ int ext3_setattr(struct dentry *dentry,
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
@@ -2940,9 +2940,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ext3/inode.c linux-3.0.46-vs2.3.2.5/fs/ext
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.0.46/fs/ext3/ioctl.c linux-3.0.46-vs2.3.2.5/fs/ext3/ioctl.c
---- linux-3.0.46/fs/ext3/ioctl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext3/ioctl.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -8,6 +8,7 @@
*/
@@ -3018,9 +3018,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ext3/ioctl.c linux-3.0.46-vs2.3.2.5/fs/ext
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.0.46/fs/ext3/namei.c linux-3.0.46-vs2.3.2.5/fs/ext3/namei.c
---- linux-3.0.46/fs/ext3/namei.c 2012-10-20 19:47:30.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext3/namei.c 2011-08-29 03:45:09.000000000 +0200
+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
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3045,9 +3045,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ext3/namei.c linux-3.0.46-vs2.3.2.5/fs/ext
};
const struct inode_operations ext3_special_inode_operations = {
-diff -NurpP --minimal linux-3.0.46/fs/ext3/super.c linux-3.0.46-vs2.3.2.5/fs/ext3/super.c
---- linux-3.0.46/fs/ext3/super.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext3/super.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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 +3114,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ext3/super.c linux-3.0.46-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.46/fs/ext4/ext4.h linux-3.0.46-vs2.3.2.5/fs/ext4/ext4.h
---- linux-3.0.46/fs/ext4/ext4.h 2012-10-20 19:47:31.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext4/ext4.h 2012-09-01 11:37:48.000000000 +0200
+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
@@ -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 +3164,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ext4/ext4.h linux-3.0.46-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.46/fs/ext4/file.c linux-3.0.46-vs2.3.2.5/fs/ext4/file.c
---- linux-3.0.46/fs/ext4/file.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext4/file.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -282,5 +282,6 @@ const struct inode_operations ext4_file_
#endif
.check_acl = ext4_check_acl,
@@ -3174,9 +3174,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ext4/file.c linux-3.0.46-vs2.3.2.5/fs/ext4
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-3.0.46/fs/ext4/ialloc.c linux-3.0.46-vs2.3.2.5/fs/ext4/ialloc.c
---- linux-3.0.46/fs/ext4/ialloc.c 2012-10-20 19:47:31.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext4/ialloc.c 2012-09-01 11:37:48.000000000 +0200
+diff -NurpP --minimal linux-3.0.67/fs/ext4/ialloc.c linux-3.0.67-vs2.3.2.5/fs/ext4/ialloc.c
+--- linux-3.0.67/fs/ext4/ialloc.c 2013-03-02 15:23:55.000000000 +0000
++++ linux-3.0.67-vs2.3.2.5/fs/ext4/ialloc.c 2012-09-01 09:37:48.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -3193,9 +3193,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ext4/ialloc.c linux-3.0.46-vs2.3.2.5/fs/ex
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.0.46/fs/ext4/inode.c linux-3.0.46-vs2.3.2.5/fs/ext4/inode.c
---- linux-3.0.46/fs/ext4/inode.c 2012-10-20 19:47:31.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext4/inode.c 2012-10-20 19:57:21.000000000 +0200
+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
@@ -42,6 +42,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
@@ -3204,7 +3204,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ext4/inode.c linux-3.0.46-vs2.3.2.5/fs/ext
#include "ext4_jbd2.h"
#include "xattr.h"
-@@ -4841,41 +4842,64 @@ void ext4_set_inode_flags(struct inode *
+@@ -4843,41 +4844,64 @@ void ext4_set_inode_flags(struct inode *
{
unsigned int flags = EXT4_I(inode)->i_flags;
@@ -3276,7 +3276,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ext4/inode.c linux-3.0.46-vs2.3.2.5/fs/ext
} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
-@@ -4911,6 +4935,8 @@ struct inode *ext4_iget(struct super_blo
+@@ -4913,6 +4937,8 @@ struct inode *ext4_iget(struct super_blo
journal_t *journal = EXT4_SB(sb)->s_journal;
long ret;
int block;
@@ -3285,7 +3285,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ext4/inode.c linux-3.0.46-vs2.3.2.5/fs/ext
inode = iget_locked(sb, ino);
if (!inode)
-@@ -4926,12 +4952,16 @@ struct inode *ext4_iget(struct super_blo
+@@ -4928,12 +4954,16 @@ struct inode *ext4_iget(struct super_blo
goto bad_inode;
raw_inode = ext4_raw_inode(&iloc);
inode->i_mode = le16_to_cpu(raw_inode->i_mode);
@@ -3306,7 +3306,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ext4/inode.c linux-3.0.46-vs2.3.2.5/fs/ext
inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
-@@ -5150,6 +5180,8 @@ static int ext4_do_update_inode(handle_t
+@@ -5152,6 +5182,8 @@ static int ext4_do_update_inode(handle_t
struct ext4_inode *raw_inode = ext4_raw_inode(iloc);
struct ext4_inode_info *ei = EXT4_I(inode);
struct buffer_head *bh = iloc->bh;
@@ -3315,7 +3315,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ext4/inode.c linux-3.0.46-vs2.3.2.5/fs/ext
int err = 0, rc, block;
int need_datasync = 0;
-@@ -5161,29 +5193,32 @@ static int ext4_do_update_inode(handle_t
+@@ -5163,29 +5195,32 @@ static int ext4_do_update_inode(handle_t
ext4_get_inode_flags(ei);
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
if (!(test_opt(inode->i_sb, NO_UID32))) {
@@ -3354,7 +3354,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ext4/inode.c linux-3.0.46-vs2.3.2.5/fs/ext
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -5372,7 +5407,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -5374,7 +5409,8 @@ int ext4_setattr(struct dentry *dentry,
if (is_quota_modification(inode, attr))
dquot_initialize(inode);
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
@@ -3364,7 +3364,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ext4/inode.c linux-3.0.46-vs2.3.2.5/fs/ext
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -5394,6 +5430,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -5396,6 +5432,8 @@ int ext4_setattr(struct dentry *dentry,
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
@@ -3373,9 +3373,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ext4/inode.c linux-3.0.46-vs2.3.2.5/fs/ext
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.0.46/fs/ext4/ioctl.c linux-3.0.46-vs2.3.2.5/fs/ext4/ioctl.c
---- linux-3.0.46/fs/ext4/ioctl.c 2012-10-20 19:47:31.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext4/ioctl.c 2012-06-22 19:02:22.000000000 +0200
+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
@@ -14,10 +14,39 @@
#include <linux/compat.h>
#include <linux/mount.h>
@@ -3439,9 +3439,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ext4/ioctl.c linux-3.0.46-vs2.3.2.5/fs/ext
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-3.0.46/fs/ext4/namei.c linux-3.0.46-vs2.3.2.5/fs/ext4/namei.c
---- linux-3.0.46/fs/ext4/namei.c 2012-10-20 19:47:31.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext4/namei.c 2012-10-20 19:57:22.000000000 +0200
+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
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3466,9 +3466,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ext4/namei.c linux-3.0.46-vs2.3.2.5/fs/ext
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.0.46/fs/ext4/super.c linux-3.0.46-vs2.3.2.5/fs/ext4/super.c
---- linux-3.0.46/fs/ext4/super.c 2012-10-20 19:47:31.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ext4/super.c 2012-09-01 11:37:48.000000000 +0200
+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
@@ -1294,6 +1294,7 @@ enum {
Opt_inode_readahead_blks, Opt_journal_ioprio,
Opt_dioread_nolock, Opt_dioread_lock,
@@ -3487,7 +3487,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ext4/super.c linux-3.0.46-vs2.3.2.5/fs/ext
{Opt_err, NULL},
};
-@@ -1537,6 +1541,20 @@ static int parse_options(char *options,
+@@ -1537,6 +1541,20 @@ static int parse_options(char *options,
case Opt_nouid32:
set_opt(sb, NO_UID32);
break;
@@ -3508,7 +3508,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ext4/super.c linux-3.0.46-vs2.3.2.5/fs/ext
case Opt_debug:
set_opt(sb, DEBUG);
break;
-@@ -3193,6 +3211,9 @@ static int ext4_fill_super(struct super_
+@@ -3195,6 +3213,9 @@ static int ext4_fill_super(struct super_
&journal_ioprio, NULL, 0))
goto failed_mount;
@@ -3518,7 +3518,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ext4/super.c linux-3.0.46-vs2.3.2.5/fs/ext
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -4324,6 +4345,14 @@ static int ext4_remount(struct super_blo
+@@ -4329,6 +4350,14 @@ static int ext4_remount(struct super_blo
if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
ext4_abort(sb, "Abort forced by user");
@@ -3533,9 +3533,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ext4/super.c linux-3.0.46-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.46/fs/fcntl.c linux-3.0.46-vs2.3.2.5/fs/fcntl.c
---- linux-3.0.46/fs/fcntl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/fcntl.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -20,6 +20,7 @@
#include <linux/signal.h>
#include <linux/rcupdate.h>
@@ -3562,9 +3562,9 @@ diff -NurpP --minimal linux-3.0.46/fs/fcntl.c linux-3.0.46-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.46/fs/file.c linux-3.0.46-vs2.3.2.5/fs/file.c
---- linux-3.0.46/fs/file.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/file.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -21,6 +21,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -3590,9 +3590,9 @@ diff -NurpP --minimal linux-3.0.46/fs/file.c linux-3.0.46-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.46/fs/file_table.c linux-3.0.46-vs2.3.2.5/fs/file_table.c
---- linux-3.0.46/fs/file_table.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/file_table.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -24,6 +24,8 @@
#include <linux/percpu_counter.h>
#include <linux/percpu.h>
@@ -3629,9 +3629,9 @@ diff -NurpP --minimal linux-3.0.46/fs/file_table.c linux-3.0.46-vs2.3.2.5/fs/fil
file_sb_list_del(file);
file_free(file);
}
-diff -NurpP --minimal linux-3.0.46/fs/fs_struct.c linux-3.0.46-vs2.3.2.5/fs/fs_struct.c
---- linux-3.0.46/fs/fs_struct.c 2011-03-15 18:07:31.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/fs/fs_struct.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -3648,7 +3648,7 @@ diff -NurpP --minimal linux-3.0.46/fs/fs_struct.c linux-3.0.46-vs2.3.2.5/fs/fs_s
kmem_cache_free(fs_cachep, fs);
}
-@@ -135,6 +137,7 @@ struct fs_struct *copy_fs_struct(struct
+@@ -135,6 +137,7 @@ struct fs_struct *copy_fs_struct(struct
fs->pwd = old->pwd;
path_get_longterm(&fs->pwd);
spin_unlock(&old->lock);
@@ -3656,9 +3656,9 @@ diff -NurpP --minimal linux-3.0.46/fs/fs_struct.c linux-3.0.46-vs2.3.2.5/fs/fs_s
}
return fs;
}
-diff -NurpP --minimal linux-3.0.46/fs/gfs2/file.c linux-3.0.46-vs2.3.2.5/fs/gfs2/file.c
---- linux-3.0.46/fs/gfs2/file.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/gfs2/file.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -134,6 +134,9 @@ static const u32 fsflags_to_gfs2[32] = {
[7] = GFS2_DIF_NOATIME,
[12] = GFS2_DIF_EXHASH,
@@ -3779,9 +3779,9 @@ diff -NurpP --minimal linux-3.0.46/fs/gfs2/file.c linux-3.0.46-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.46/fs/gfs2/inode.h linux-3.0.46-vs2.3.2.5/fs/gfs2/inode.h
---- linux-3.0.46/fs/gfs2/inode.h 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/gfs2/inode.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -120,6 +120,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
@@ -3790,9 +3790,9 @@ diff -NurpP --minimal linux-3.0.46/fs/gfs2/inode.h linux-3.0.46-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.46/fs/inode.c linux-3.0.46-vs2.3.2.5/fs/inode.c
---- linux-3.0.46/fs/inode.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/inode.c 2011-07-01 11:35:34.000000000 +0200
+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
@@ -26,6 +26,7 @@
#include <linux/ima.h>
#include <linux/cred.h>
@@ -3848,9 +3848,9 @@ diff -NurpP --minimal linux-3.0.46/fs/inode.c linux-3.0.46-vs2.3.2.5/fs/inode.c
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-3.0.46/fs/ioctl.c linux-3.0.46-vs2.3.2.5/fs/ioctl.c
---- linux-3.0.46/fs/ioctl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ioctl.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -3861,9 +3861,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ioctl.c linux-3.0.46-vs2.3.2.5/fs/ioctl.c
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-3.0.46/fs/ioprio.c linux-3.0.46-vs2.3.2.5/fs/ioprio.c
---- linux-3.0.46/fs/ioprio.c 2011-01-05 21:50:24.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/fs/ioprio.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -27,6 +27,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
@@ -3872,7 +3872,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ioprio.c linux-3.0.46-vs2.3.2.5/fs/ioprio.
int set_task_ioprio(struct task_struct *task, int ioprio)
{
-@@ -119,6 +120,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which,
+@@ -119,6 +120,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which,
else
pgrp = find_vpid(who);
do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
@@ -3881,7 +3881,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ioprio.c linux-3.0.46-vs2.3.2.5/fs/ioprio.
ret = set_task_ioprio(p, ioprio);
if (ret)
break;
-@@ -208,6 +211,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
+@@ -208,6 +211,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
else
pgrp = find_vpid(who);
do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
@@ -3890,9 +3890,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ioprio.c linux-3.0.46-vs2.3.2.5/fs/ioprio.
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-3.0.46/fs/jfs/file.c linux-3.0.46-vs2.3.2.5/fs/jfs/file.c
---- linux-3.0.46/fs/jfs/file.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/jfs/file.c 2011-07-01 11:35:34.000000000 +0200
+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
@@ -102,7 +102,8 @@ int jfs_setattr(struct dentry *dentry, s
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
@@ -3911,9 +3911,9 @@ diff -NurpP --minimal linux-3.0.46/fs/jfs/file.c linux-3.0.46-vs2.3.2.5/fs/jfs/f
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.0.46/fs/jfs/ioctl.c linux-3.0.46-vs2.3.2.5/fs/jfs/ioctl.c
---- linux-3.0.46/fs/jfs/ioctl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/jfs/ioctl.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -11,6 +11,7 @@
#include <linux/mount.h>
#include <linux/time.h>
@@ -3971,9 +3971,9 @@ diff -NurpP --minimal linux-3.0.46/fs/jfs/ioctl.c linux-3.0.46-vs2.3.2.5/fs/jfs/
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-3.0.46/fs/jfs/jfs_dinode.h linux-3.0.46-vs2.3.2.5/fs/jfs/jfs_dinode.h
---- linux-3.0.46/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/fs/jfs/jfs_dinode.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
@@ -3990,9 +3990,9 @@ diff -NurpP --minimal linux-3.0.46/fs/jfs/jfs_dinode.h linux-3.0.46-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.46/fs/jfs/jfs_filsys.h linux-3.0.46-vs2.3.2.5/fs/jfs/jfs_filsys.h
---- linux-3.0.46/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/fs/jfs/jfs_filsys.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -263,6 +263,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
@@ -4001,9 +4001,9 @@ diff -NurpP --minimal linux-3.0.46/fs/jfs/jfs_filsys.h linux-3.0.46-vs2.3.2.5/fs
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-3.0.46/fs/jfs/jfs_imap.c linux-3.0.46-vs2.3.2.5/fs/jfs/jfs_imap.c
---- linux-3.0.46/fs/jfs/jfs_imap.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/jfs/jfs_imap.c 2011-07-01 11:35:34.000000000 +0200
+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
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
@@ -4063,9 +4063,9 @@ diff -NurpP --minimal linux-3.0.46/fs/jfs/jfs_imap.c linux-3.0.46-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.46/fs/jfs/jfs_inode.c linux-3.0.46-vs2.3.2.5/fs/jfs/jfs_inode.c
---- linux-3.0.46/fs/jfs/jfs_inode.c 2010-08-02 16:52:49.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/jfs/jfs_inode.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -4139,9 +4139,9 @@ diff -NurpP --minimal linux-3.0.46/fs/jfs/jfs_inode.c linux-3.0.46-vs2.3.2.5/fs/
}
/*
-diff -NurpP --minimal linux-3.0.46/fs/jfs/jfs_inode.h linux-3.0.46-vs2.3.2.5/fs/jfs/jfs_inode.h
---- linux-3.0.46/fs/jfs/jfs_inode.h 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/jfs/jfs_inode.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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);
@@ -4150,9 +4150,9 @@ diff -NurpP --minimal linux-3.0.46/fs/jfs/jfs_inode.h linux-3.0.46-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.46/fs/jfs/namei.c linux-3.0.46-vs2.3.2.5/fs/jfs/namei.c
---- linux-3.0.46/fs/jfs/namei.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/jfs/namei.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
@@ -4161,7 +4161,7 @@ diff -NurpP --minimal linux-3.0.46/fs/jfs/namei.c linux-3.0.46-vs2.3.2.5/fs/jfs/
#include "jfs_incore.h"
#include "jfs_superblock.h"
#include "jfs_inode.h"
-@@ -1486,6 +1487,7 @@ static struct dentry *jfs_lookup(struct
+@@ -1486,6 +1487,7 @@ static struct dentry *jfs_lookup(struct
return ERR_CAST(ip);
}
@@ -4177,9 +4177,9 @@ diff -NurpP --minimal linux-3.0.46/fs/jfs/namei.c linux-3.0.46-vs2.3.2.5/fs/jfs/
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.0.46/fs/jfs/super.c linux-3.0.46-vs2.3.2.5/fs/jfs/super.c
---- linux-3.0.46/fs/jfs/super.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/jfs/super.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -198,7 +198,8 @@ static void jfs_put_super(struct super_b
enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
@@ -4201,7 +4201,7 @@ diff -NurpP --minimal linux-3.0.46/fs/jfs/super.c linux-3.0.46-vs2.3.2.5/fs/jfs/
{Opt_ignore, "noquota"},
{Opt_ignore, "quota"},
{Opt_usrquota, "usrquota"},
-@@ -342,6 +347,20 @@ static int parse_options(char *options,
+@@ -342,6 +347,20 @@ static int parse_options(char *options,
}
break;
}
@@ -4245,9 +4245,9 @@ diff -NurpP --minimal linux-3.0.46/fs/jfs/super.c linux-3.0.46-vs2.3.2.5/fs/jfs/
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-3.0.46/fs/libfs.c linux-3.0.46-vs2.3.2.5/fs/libfs.c
---- linux-3.0.46/fs/libfs.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/libfs.c 2011-07-22 11:20:39.000000000 +0200
+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
@@ -133,7 +133,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
@@ -4293,9 +4293,9 @@ diff -NurpP --minimal linux-3.0.46/fs/libfs.c linux-3.0.46-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.46/fs/locks.c linux-3.0.46-vs2.3.2.5/fs/locks.c
---- linux-3.0.46/fs/locks.c 2012-10-20 19:47:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/locks.c 2012-09-01 11:37:48.000000000 +0200
+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
@@ -126,6 +126,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
@@ -4440,7 +4440,7 @@ diff -NurpP --minimal linux-3.0.46/fs/locks.c linux-3.0.46-vs2.3.2.5/fs/locks.c
if (error != FILE_LOCK_DEFERRED)
break;
error = wait_event_interruptible(fl.fl_wait, !fl.fl_next);
-@@ -1431,6 +1462,7 @@ int generic_setlease(struct file *filp,
+@@ -1431,6 +1462,7 @@ int generic_setlease(struct file *filp,
goto out;
locks_insert_lock(before, lease);
@@ -4448,7 +4448,7 @@ diff -NurpP --minimal linux-3.0.46/fs/locks.c linux-3.0.46-vs2.3.2.5/fs/locks.c
return 0;
out:
-@@ -1815,6 +1847,11 @@ int fcntl_setlk(unsigned int fd, struct
+@@ -1815,6 +1847,11 @@ int fcntl_setlk(unsigned int fd, struct
if (file_lock == NULL)
return -ENOLCK;
@@ -4485,9 +4485,9 @@ diff -NurpP --minimal linux-3.0.46/fs/locks.c linux-3.0.46-vs2.3.2.5/fs/locks.c
return 0;
}
-diff -NurpP --minimal linux-3.0.46/fs/namei.c linux-3.0.46-vs2.3.2.5/fs/namei.c
---- linux-3.0.46/fs/namei.c 2012-10-20 19:47:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/namei.c 2012-03-23 14:54:00.000000000 +0100
+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
@@ -32,6 +32,14 @@
#include <linux/fcntl.h>
#include <linux/device_cgroup.h>
@@ -4716,7 +4716,7 @@ diff -NurpP --minimal linux-3.0.46/fs/namei.c linux-3.0.46-vs2.3.2.5/fs/namei.c
out:
if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
path_put(&nd->root);
-@@ -2886,7 +3021,7 @@ int vfs_link(struct dentry *old_dentry,
+@@ -2886,7 +3021,7 @@ int vfs_link(struct dentry *old_dentry,
/*
* A link to an append-only or immutable file cannot be created.
*/
@@ -4953,9 +4953,9 @@ diff -NurpP --minimal linux-3.0.46/fs/namei.c linux-3.0.46-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.46/fs/namespace.c linux-3.0.46-vs2.3.2.5/fs/namespace.c
---- linux-3.0.46/fs/namespace.c 2012-10-20 19:47:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/namespace.c 2012-06-22 19:02:22.000000000 +0200
+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
@@ -31,6 +31,11 @@
#include <linux/idr.h>
#include <linux/fs_struct.h>
@@ -5019,7 +5019,7 @@ diff -NurpP --minimal linux-3.0.46/fs/namespace.c linux-3.0.46-vs2.3.2.5/fs/name
/*
* Simple .show_options callback for filesystems which don't want to
* implement more complex mount option showing.
-@@ -954,6 +989,8 @@ static int show_sb_opts(struct seq_file
+@@ -954,6 +989,8 @@ static int show_sb_opts(struct seq_file
{ MS_SYNCHRONOUS, ",sync" },
{ MS_DIRSYNC, ",dirsync" },
{ MS_MANDLOCK, ",mand" },
@@ -5075,7 +5075,7 @@ diff -NurpP --minimal linux-3.0.46/fs/namespace.c linux-3.0.46-vs2.3.2.5/fs/name
seq_printf(m, "%i %i %u:%u ", mnt->mnt_id, mnt->mnt_parent->mnt_id,
MAJOR(sb->s_dev), MINOR(sb->s_dev));
if (sb->s_op->show_path)
-@@ -1104,22 +1156,32 @@ static int show_vfsstat(struct seq_file
+@@ -1104,22 +1156,32 @@ static int show_vfsstat(struct seq_file
struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
int err = 0;
@@ -5276,10 +5276,10 @@ diff -NurpP --minimal linux-3.0.46/fs/namespace.c linux-3.0.46-vs2.3.2.5/fs/name
kfree(ns);
}
EXPORT_SYMBOL(put_mnt_ns);
-diff -NurpP --minimal linux-3.0.46/fs/nfs/client.c linux-3.0.46-vs2.3.2.5/fs/nfs/client.c
---- linux-3.0.46/fs/nfs/client.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/nfs/client.c 2011-06-10 22:11:24.000000000 +0200
-@@ -780,6 +780,9 @@ static int nfs_init_server_rpcclient(str
+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
+@@ -779,6 +779,9 @@ static int nfs_init_server_rpcclient(str
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
@@ -5289,7 +5289,7 @@ diff -NurpP --minimal linux-3.0.46/fs/nfs/client.c linux-3.0.46-vs2.3.2.5/fs/nfs
return 0;
}
-@@ -951,6 +954,10 @@ static void nfs_server_set_fsinfo(struct
+@@ -950,6 +953,10 @@ static void nfs_server_set_fsinfo(struct
server->acdirmin = server->acdirmax = 0;
}
@@ -5300,9 +5300,9 @@ diff -NurpP --minimal linux-3.0.46/fs/nfs/client.c linux-3.0.46-vs2.3.2.5/fs/nfs
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.0.46/fs/nfs/dir.c linux-3.0.46-vs2.3.2.5/fs/nfs/dir.c
---- linux-3.0.46/fs/nfs/dir.c 2012-10-20 19:47:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/nfs/dir.c 2011-12-19 15:55:53.000000000 +0100
+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
@@ -35,6 +35,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
@@ -5311,7 +5311,7 @@ diff -NurpP --minimal linux-3.0.46/fs/nfs/dir.c linux-3.0.46-vs2.3.2.5/fs/nfs/di
#include "delegation.h"
#include "iostat.h"
-@@ -1308,6 +1309,7 @@ static struct dentry *nfs_lookup(struct
+@@ -1311,6 +1312,7 @@ static struct dentry *nfs_lookup(struct
if (IS_ERR(res))
goto out_unblock_sillyrename;
@@ -5319,9 +5319,9 @@ diff -NurpP --minimal linux-3.0.46/fs/nfs/dir.c linux-3.0.46-vs2.3.2.5/fs/nfs/di
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-3.0.46/fs/nfs/inode.c linux-3.0.46-vs2.3.2.5/fs/nfs/inode.c
---- linux-3.0.46/fs/nfs/inode.c 2012-10-20 19:47:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/nfs/inode.c 2012-10-20 19:57:22.000000000 +0200
+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
@@ -38,6 +38,7 @@
#include <linux/nfs_xdr.h>
#include <linux/slab.h>
@@ -5473,9 +5473,9 @@ diff -NurpP --minimal linux-3.0.46/fs/nfs/inode.c linux-3.0.46-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.46/fs/nfs/nfs3xdr.c linux-3.0.46-vs2.3.2.5/fs/nfs/nfs3xdr.c
---- linux-3.0.46/fs/nfs/nfs3xdr.c 2011-03-15 18:07:32.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/fs/nfs/nfs3xdr.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -5621,9 +5621,9 @@ diff -NurpP --minimal linux-3.0.46/fs/nfs/nfs3xdr.c linux-3.0.46-vs2.3.2.5/fs/nf
}
/*
-diff -NurpP --minimal linux-3.0.46/fs/nfs/super.c linux-3.0.46-vs2.3.2.5/fs/nfs/super.c
---- linux-3.0.46/fs/nfs/super.c 2012-10-20 19:47:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/nfs/super.c 2012-10-20 19:57:22.000000000 +0200
+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
@@ -53,6 +53,7 @@
#include <linux/nfs_xdr.h>
#include <linux/magic.h>
@@ -5667,7 +5667,7 @@ diff -NurpP --minimal linux-3.0.46/fs/nfs/super.c linux-3.0.46-vs2.3.2.5/fs/nfs/
{ 0, NULL, NULL }
};
const struct proc_nfs_info *nfs_infop;
-@@ -1212,6 +1220,14 @@ static int nfs_parse_mount_options(char
+@@ -1212,6 +1220,14 @@ static int nfs_parse_mount_options(char
kfree(mnt->fscache_uniq);
mnt->fscache_uniq = NULL;
break;
@@ -5682,7 +5682,7 @@ diff -NurpP --minimal linux-3.0.46/fs/nfs/super.c linux-3.0.46-vs2.3.2.5/fs/nfs/
/*
* options that take numeric values
-@@ -1318,6 +1334,12 @@ static int nfs_parse_mount_options(char
+@@ -1318,6 +1334,12 @@ static int nfs_parse_mount_options(char
goto out_invalid_value;
mnt->minorversion = option;
break;
@@ -5695,9 +5695,9 @@ diff -NurpP --minimal linux-3.0.46/fs/nfs/super.c linux-3.0.46-vs2.3.2.5/fs/nfs/
/*
* options that take text values
-diff -NurpP --minimal linux-3.0.46/fs/nfsd/auth.c linux-3.0.46-vs2.3.2.5/fs/nfsd/auth.c
---- linux-3.0.46/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/fs/nfsd/auth.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -1,6 +1,7 @@
/* Copyright (C) 1995, 1996 Olaf Kirch <okir at monad.swb.de> */
@@ -5716,9 +5716,9 @@ diff -NurpP --minimal linux-3.0.46/fs/nfsd/auth.c linux-3.0.46-vs2.3.2.5/fs/nfsd
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-3.0.46/fs/nfsd/nfs3xdr.c linux-3.0.46-vs2.3.2.5/fs/nfsd/nfs3xdr.c
---- linux-3.0.46/fs/nfsd/nfs3xdr.c 2012-10-20 19:47:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/nfsd/nfs3xdr.c 2012-06-08 15:28:24.000000000 +0200
+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
@@ -7,6 +7,7 @@
*/
@@ -5769,9 +5769,9 @@ diff -NurpP --minimal linux-3.0.46/fs/nfsd/nfs3xdr.c linux-3.0.46-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.46/fs/nfsd/nfs4xdr.c linux-3.0.46-vs2.3.2.5/fs/nfsd/nfs4xdr.c
---- linux-3.0.46/fs/nfsd/nfs4xdr.c 2012-10-20 19:47:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/nfsd/nfs4xdr.c 2012-09-01 11:37:48.000000000 +0200
+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
@@ -45,6 +45,7 @@
#include <linux/statfs.h>
#include <linux/utsname.h>
@@ -5801,9 +5801,9 @@ diff -NurpP --minimal linux-3.0.46/fs/nfsd/nfs4xdr.c linux-3.0.46-vs2.3.2.5/fs/n
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-3.0.46/fs/nfsd/nfsxdr.c linux-3.0.46-vs2.3.2.5/fs/nfsd/nfsxdr.c
---- linux-3.0.46/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/nfsd/nfsxdr.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -6,6 +6,7 @@
#include "xdr.h"
@@ -5852,9 +5852,9 @@ diff -NurpP --minimal linux-3.0.46/fs/nfsd/nfsxdr.c linux-3.0.46-vs2.3.2.5/fs/nf
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.0.46/fs/ocfs2/dlmglue.c linux-3.0.46-vs2.3.2.5/fs/ocfs2/dlmglue.c
---- linux-3.0.46/fs/ocfs2/dlmglue.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ocfs2/dlmglue.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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);
@@ -5871,9 +5871,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ocfs2/dlmglue.c linux-3.0.46-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.46/fs/ocfs2/dlmglue.h linux-3.0.46-vs2.3.2.5/fs/ocfs2/dlmglue.h
---- linux-3.0.46/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ocfs2/dlmglue.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
@@ -5884,9 +5884,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ocfs2/dlmglue.h linux-3.0.46-vs2.3.2.5/fs/
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.0.46/fs/ocfs2/file.c linux-3.0.46-vs2.3.2.5/fs/ocfs2/file.c
---- linux-3.0.46/fs/ocfs2/file.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ocfs2/file.c 2011-06-10 22:43:33.000000000 +0200
+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
@@ -1111,7 +1111,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
@@ -5896,9 +5896,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ocfs2/file.c linux-3.0.46-vs2.3.2.5/fs/ocf
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-3.0.46/fs/ocfs2/inode.c linux-3.0.46-vs2.3.2.5/fs/ocfs2/inode.c
---- linux-3.0.46/fs/ocfs2/inode.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ocfs2/inode.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
@@ -5907,7 +5907,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ocfs2/inode.c linux-3.0.46-vs2.3.2.5/fs/oc
#include <asm/byteorder.h>
-@@ -78,11 +79,13 @@ void ocfs2_set_inode_flags(struct inode
+@@ -78,11 +79,13 @@ void ocfs2_set_inode_flags(struct inode
{
unsigned int flags = OCFS2_I(inode)->ip_attr;
@@ -5922,7 +5922,7 @@ diff -NurpP --minimal linux-3.0.46/fs/ocfs2/inode.c linux-3.0.46-vs2.3.2.5/fs/oc
if (flags & OCFS2_SYNC_FL)
inode->i_flags |= S_SYNC;
-@@ -92,25 +95,44 @@ void ocfs2_set_inode_flags(struct inode
+@@ -92,25 +95,44 @@ void ocfs2_set_inode_flags(struct inode
inode->i_flags |= S_NOATIME;
if (flags & OCFS2_DIRSYNC_FL)
inode->i_flags |= S_DIRSYNC;
@@ -5995,9 +5995,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ocfs2/inode.c linux-3.0.46-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.46/fs/ocfs2/inode.h linux-3.0.46-vs2.3.2.5/fs/ocfs2/inode.h
---- linux-3.0.46/fs/ocfs2/inode.h 2011-01-05 21:50:26.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/fs/ocfs2/inode.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -151,6 +151,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
@@ -6006,9 +6006,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ocfs2/inode.h linux-3.0.46-vs2.3.2.5/fs/oc
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-3.0.46/fs/ocfs2/ioctl.c linux-3.0.46-vs2.3.2.5/fs/ocfs2/ioctl.c
---- linux-3.0.46/fs/ocfs2/ioctl.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ocfs2/ioctl.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -78,7 +78,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
@@ -6072,9 +6072,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ocfs2/ioctl.c linux-3.0.46-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.46/fs/ocfs2/namei.c linux-3.0.46-vs2.3.2.5/fs/ocfs2/namei.c
---- linux-3.0.46/fs/ocfs2/namei.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ocfs2/namei.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
@@ -6105,9 +6105,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ocfs2/namei.c linux-3.0.46-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.46/fs/ocfs2/ocfs2.h linux-3.0.46-vs2.3.2.5/fs/ocfs2/ocfs2.h
---- linux-3.0.46/fs/ocfs2/ocfs2.h 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ocfs2/ocfs2.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -272,6 +272,7 @@ enum ocfs2_mount_options
writes */
OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
@@ -6116,9 +6116,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ocfs2/ocfs2.h linux-3.0.46-vs2.3.2.5/fs/oc
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-3.0.46/fs/ocfs2/ocfs2_fs.h linux-3.0.46-vs2.3.2.5/fs/ocfs2/ocfs2_fs.h
---- linux-3.0.46/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ocfs2/ocfs2_fs.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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 */
@@ -6131,9 +6131,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ocfs2/ocfs2_fs.h linux-3.0.46-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.46/fs/ocfs2/super.c linux-3.0.46-vs2.3.2.5/fs/ocfs2/super.c
---- linux-3.0.46/fs/ocfs2/super.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/ocfs2/super.c 2011-06-15 02:40:14.000000000 +0200
+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
@@ -184,6 +184,7 @@ enum {
Opt_coherency_full,
Opt_resv_level,
@@ -6197,9 +6197,9 @@ diff -NurpP --minimal linux-3.0.46/fs/ocfs2/super.c linux-3.0.46-vs2.3.2.5/fs/oc
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.0.46/fs/open.c linux-3.0.46-vs2.3.2.5/fs/open.c
---- linux-3.0.46/fs/open.c 2012-10-20 19:47:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/open.c 2012-09-16 18:24:54.000000000 +0200
+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
@@ -30,6 +30,11 @@
#include <linux/fs_struct.h>
#include <linux/ima.h>
@@ -6280,9 +6280,9 @@ diff -NurpP --minimal linux-3.0.46/fs/open.c linux-3.0.46-vs2.3.2.5/fs/open.c
}
void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-3.0.46/fs/proc/array.c linux-3.0.46-vs2.3.2.5/fs/proc/array.c
---- linux-3.0.46/fs/proc/array.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/proc/array.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -81,6 +81,8 @@
#include <linux/pid_namespace.h>
#include <linux/ptrace.h>
@@ -6370,7 +6370,7 @@ diff -NurpP --minimal linux-3.0.46/fs/proc/array.c linux-3.0.46-vs2.3.2.5/fs/pro
int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task)
{
-@@ -353,6 +395,7 @@ int proc_pid_status(struct seq_file *m,
+@@ -353,6 +395,7 @@ int proc_pid_status(struct seq_file *m,
task_cap(m, task);
task_cpus_allowed(m, task);
cpuset_task_status_allowed(m, task);
@@ -6378,7 +6378,7 @@ diff -NurpP --minimal linux-3.0.46/fs/proc/array.c linux-3.0.46-vs2.3.2.5/fs/pro
task_context_switch_counts(m, task);
return 0;
}
-@@ -462,6 +505,17 @@ static int do_task_stat(struct seq_file
+@@ -462,6 +505,17 @@ static int do_task_stat(struct seq_file
/* convert nsec -> ticks */
start_time = nsec_to_clock_t(start_time);
@@ -6396,9 +6396,9 @@ diff -NurpP --minimal linux-3.0.46/fs/proc/array.c linux-3.0.46-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.46/fs/proc/base.c linux-3.0.46-vs2.3.2.5/fs/proc/base.c
---- linux-3.0.46/fs/proc/base.c 2012-10-20 19:47:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/proc/base.c 2012-02-15 05:20:43.000000000 +0100
+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
@@ -83,6 +83,8 @@
#include <linux/pid_namespace.h>
#include <linux/fs_struct.h>
@@ -6569,9 +6569,9 @@ diff -NurpP --minimal linux-3.0.46/fs/proc/base.c linux-3.0.46-vs2.3.2.5/fs/proc
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-3.0.46/fs/proc/generic.c linux-3.0.46-vs2.3.2.5/fs/proc/generic.c
---- linux-3.0.46/fs/proc/generic.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/proc/generic.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
@@ -6631,9 +6631,9 @@ diff -NurpP --minimal linux-3.0.46/fs/proc/generic.c linux-3.0.46-vs2.3.2.5/fs/p
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-3.0.46/fs/proc/inode.c linux-3.0.46-vs2.3.2.5/fs/proc/inode.c
---- linux-3.0.46/fs/proc/inode.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/proc/inode.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -442,6 +442,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
@@ -6643,9 +6643,9 @@ diff -NurpP --minimal linux-3.0.46/fs/proc/inode.c linux-3.0.46-vs2.3.2.5/fs/pro
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-3.0.46/fs/proc/internal.h linux-3.0.46-vs2.3.2.5/fs/proc/internal.h
---- linux-3.0.46/fs/proc/internal.h 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/proc/internal.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -10,6 +10,7 @@
*/
@@ -6682,9 +6682,9 @@ diff -NurpP --minimal linux-3.0.46/fs/proc/internal.h linux-3.0.46-vs2.3.2.5/fs/
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-3.0.46/fs/proc/loadavg.c linux-3.0.46-vs2.3.2.5/fs/proc/loadavg.c
---- linux-3.0.46/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/proc/loadavg.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
@@ -6714,9 +6714,9 @@ diff -NurpP --minimal linux-3.0.46/fs/proc/loadavg.c linux-3.0.46-vs2.3.2.5/fs/p
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-3.0.46/fs/proc/meminfo.c linux-3.0.46-vs2.3.2.5/fs/proc/meminfo.c
---- linux-3.0.46/fs/proc/meminfo.c 2012-10-20 19:47:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/proc/meminfo.c 2011-12-23 16:09:00.000000000 +0100
+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
@@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_
allowed = ((totalram_pages - hugetlb_total_pages())
* sysctl_overcommit_ratio / 100) + total_swap_pages;
@@ -6727,9 +6727,9 @@ diff -NurpP --minimal linux-3.0.46/fs/proc/meminfo.c linux-3.0.46-vs2.3.2.5/fs/p
total_swapcache_pages - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-3.0.46/fs/proc/root.c linux-3.0.46-vs2.3.2.5/fs/proc/root.c
---- linux-3.0.46/fs/proc/root.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/proc/root.c 2011-06-22 12:39:15.000000000 +0200
+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
@@ -18,9 +18,14 @@
#include <linux/bitops.h>
#include <linux/mount.h>
@@ -6761,9 +6761,9 @@ diff -NurpP --minimal linux-3.0.46/fs/proc/root.c linux-3.0.46-vs2.3.2.5/fs/proc
};
int pid_ns_prepare_proc(struct pid_namespace *ns)
-diff -NurpP --minimal linux-3.0.46/fs/proc/uptime.c linux-3.0.46-vs2.3.2.5/fs/proc/uptime.c
---- linux-3.0.46/fs/proc/uptime.c 2012-10-20 19:47:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/proc/uptime.c 2012-01-26 08:56:00.000000000 +0100
+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
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
@@ -6783,9 +6783,9 @@ diff -NurpP --minimal linux-3.0.46/fs/proc/uptime.c linux-3.0.46-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.46/fs/quota/dquot.c linux-3.0.46-vs2.3.2.5/fs/quota/dquot.c
---- linux-3.0.46/fs/quota/dquot.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/quota/dquot.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -1548,6 +1548,9 @@ int __dquot_alloc_space(struct inode *in
int reserve = flags & DQUOT_SPACE_RESERVE;
int nofail = flags & DQUOT_SPACE_NOFAIL;
@@ -6824,9 +6824,9 @@ diff -NurpP --minimal linux-3.0.46/fs/quota/dquot.c linux-3.0.46-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.46/fs/quota/quota.c linux-3.0.46-vs2.3.2.5/fs/quota/quota.c
---- linux-3.0.46/fs/quota/quota.c 2012-10-20 19:47:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/quota/quota.c 2011-11-15 17:37:07.000000000 +0100
+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
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
@@ -6914,18 +6914,18 @@ diff -NurpP --minimal linux-3.0.46/fs/quota/quota.c linux-3.0.46-vs2.3.2.5/fs/qu
sb = get_super(bdev);
bdput(bdev);
if (!sb)
-diff -NurpP --minimal linux-3.0.46/fs/reiserfs/file.c linux-3.0.46-vs2.3.2.5/fs/reiserfs/file.c
---- linux-3.0.46/fs/reiserfs/file.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/fs/reiserfs/file.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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.46/fs/reiserfs/inode.c linux-3.0.46-vs2.3.2.5/fs/reiserfs/inode.c
---- linux-3.0.46/fs/reiserfs/inode.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/reiserfs/inode.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -18,6 +18,7 @@
#include <linux/writeback.h>
#include <linux/quotaops.h>
@@ -7003,7 +7003,7 @@ diff -NurpP --minimal linux-3.0.46/fs/reiserfs/inode.c linux-3.0.46-vs2.3.2.5/fs
set_sd_v2_mtime(sd_v2, inode->i_mtime.tv_sec);
set_sd_v2_atime(sd_v2, inode->i_atime.tv_sec);
set_sd_v2_ctime(sd_v2, inode->i_ctime.tv_sec);
-@@ -2863,14 +2874,19 @@ int reiserfs_commit_write(struct file *f
+@@ -2870,14 +2881,19 @@ int reiserfs_commit_write(struct file *f
void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode)
{
if (reiserfs_attrs(inode->i_sb)) {
@@ -7027,7 +7027,7 @@ diff -NurpP --minimal linux-3.0.46/fs/reiserfs/inode.c linux-3.0.46-vs2.3.2.5/fs
if (sd_attrs & REISERFS_APPEND_FL)
inode->i_flags |= S_APPEND;
else
-@@ -2883,6 +2899,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs,
+@@ -2890,6 +2906,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs,
REISERFS_I(inode)->i_flags |= i_nopack_mask;
else
REISERFS_I(inode)->i_flags &= ~i_nopack_mask;
@@ -7043,7 +7043,7 @@ diff -NurpP --minimal linux-3.0.46/fs/reiserfs/inode.c linux-3.0.46-vs2.3.2.5/fs
}
}
-@@ -2893,6 +2918,11 @@ void i_attrs_to_sd_attrs(struct inode *i
+@@ -2900,6 +2925,11 @@ void i_attrs_to_sd_attrs(struct inode *i
*sd_attrs |= REISERFS_IMMUTABLE_FL;
else
*sd_attrs &= ~REISERFS_IMMUTABLE_FL;
@@ -7055,7 +7055,7 @@ diff -NurpP --minimal linux-3.0.46/fs/reiserfs/inode.c linux-3.0.46-vs2.3.2.5/fs
if (inode->i_flags & S_SYNC)
*sd_attrs |= REISERFS_SYNC_FL;
else
-@@ -2905,6 +2935,15 @@ void i_attrs_to_sd_attrs(struct inode *i
+@@ -2912,6 +2942,15 @@ void i_attrs_to_sd_attrs(struct inode *i
*sd_attrs |= REISERFS_NOTAIL_FL;
else
*sd_attrs &= ~REISERFS_NOTAIL_FL;
@@ -7071,7 +7071,7 @@ diff -NurpP --minimal linux-3.0.46/fs/reiserfs/inode.c linux-3.0.46-vs2.3.2.5/fs
}
}
-@@ -3148,7 +3187,8 @@ int reiserfs_setattr(struct dentry *dent
+@@ -3154,7 +3193,8 @@ int reiserfs_setattr(struct dentry *dent
}
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
@@ -7081,7 +7081,7 @@ diff -NurpP --minimal linux-3.0.46/fs/reiserfs/inode.c linux-3.0.46-vs2.3.2.5/fs
struct reiserfs_transaction_handle th;
int jbegin_count =
2 *
-@@ -3177,6 +3217,9 @@ int reiserfs_setattr(struct dentry *dent
+@@ -3185,6 +3225,9 @@ int reiserfs_setattr(struct dentry *dent
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
@@ -7091,9 +7091,9 @@ diff -NurpP --minimal linux-3.0.46/fs/reiserfs/inode.c linux-3.0.46-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.46/fs/reiserfs/ioctl.c linux-3.0.46-vs2.3.2.5/fs/reiserfs/ioctl.c
---- linux-3.0.46/fs/reiserfs/ioctl.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/reiserfs/ioctl.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -11,6 +11,21 @@
#include <linux/pagemap.h>
#include <linux/compat.h>
@@ -7155,9 +7155,9 @@ diff -NurpP --minimal linux-3.0.46/fs/reiserfs/ioctl.c linux-3.0.46-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.46/fs/reiserfs/namei.c linux-3.0.46-vs2.3.2.5/fs/reiserfs/namei.c
---- linux-3.0.46/fs/reiserfs/namei.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/reiserfs/namei.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -18,6 +18,7 @@
#include <linux/reiserfs_acl.h>
#include <linux/reiserfs_xattr.h>
@@ -7182,10 +7182,10 @@ diff -NurpP --minimal linux-3.0.46/fs/reiserfs/namei.c linux-3.0.46-vs2.3.2.5/fs
};
/*
-diff -NurpP --minimal linux-3.0.46/fs/reiserfs/super.c linux-3.0.46-vs2.3.2.5/fs/reiserfs/super.c
---- linux-3.0.46/fs/reiserfs/super.c 2012-10-20 19:47:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/reiserfs/super.c 2012-01-18 02:58:46.000000000 +0100
-@@ -903,6 +903,14 @@ static int reiserfs_parse_options(struct
+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
+@@ -905,6 +905,14 @@ static int reiserfs_parse_options(struct
{"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
{"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
#endif
@@ -7200,7 +7200,7 @@ diff -NurpP --minimal linux-3.0.46/fs/reiserfs/super.c linux-3.0.46-vs2.3.2.5/fs
#ifdef CONFIG_REISERFS_FS_POSIX_ACL
{"acl",.setmask = 1 << REISERFS_POSIXACL},
{"noacl",.clrmask = 1 << REISERFS_POSIXACL},
-@@ -1213,6 +1221,14 @@ static int reiserfs_remount(struct super
+@@ -1215,6 +1223,14 @@ static int reiserfs_remount(struct super
handle_quota_files(s, qf_names, &qfmt);
#endif
@@ -7215,7 +7215,7 @@ diff -NurpP --minimal linux-3.0.46/fs/reiserfs/super.c linux-3.0.46-vs2.3.2.5/fs
handle_attrs(s);
/* Add options that are safe here */
-@@ -1695,6 +1711,10 @@ static int reiserfs_fill_super(struct su
+@@ -1710,6 +1726,10 @@ static int reiserfs_fill_super(struct su
goto error;
}
@@ -7226,9 +7226,9 @@ diff -NurpP --minimal linux-3.0.46/fs/reiserfs/super.c linux-3.0.46-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.46/fs/reiserfs/xattr.c linux-3.0.46-vs2.3.2.5/fs/reiserfs/xattr.c
---- linux-3.0.46/fs/reiserfs/xattr.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/reiserfs/xattr.c 2011-06-22 12:39:15.000000000 +0200
+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
@@ -40,6 +40,7 @@
#include <linux/errno.h>
#include <linux/gfp.h>
@@ -7237,9 +7237,9 @@ diff -NurpP --minimal linux-3.0.46/fs/reiserfs/xattr.c linux-3.0.46-vs2.3.2.5/fs
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/xattr.h>
-diff -NurpP --minimal linux-3.0.46/fs/stat.c linux-3.0.46-vs2.3.2.5/fs/stat.c
---- linux-3.0.46/fs/stat.c 2012-10-20 19:47:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/stat.c 2012-10-20 19:57:22.000000000 +0200
+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
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
@@ -7248,9 +7248,9 @@ diff -NurpP --minimal linux-3.0.46/fs/stat.c linux-3.0.46-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.46/fs/statfs.c linux-3.0.46-vs2.3.2.5/fs/statfs.c
---- linux-3.0.46/fs/statfs.c 2012-10-20 19:47:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/statfs.c 2011-11-15 17:37:07.000000000 +0100
+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
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
@@ -7269,9 +7269,9 @@ diff -NurpP --minimal linux-3.0.46/fs/statfs.c linux-3.0.46-vs2.3.2.5/fs/statfs.
return retval;
}
-diff -NurpP --minimal linux-3.0.46/fs/super.c linux-3.0.46-vs2.3.2.5/fs/super.c
---- linux-3.0.46/fs/super.c 2012-10-20 19:47:32.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/super.c 2012-06-08 15:28:24.000000000 +0200
+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
@@ -32,6 +32,9 @@
#include <linux/backing-dev.h>
#include <linux/rculist_bl.h>
@@ -7282,7 +7282,7 @@ diff -NurpP --minimal linux-3.0.46/fs/super.c linux-3.0.46-vs2.3.2.5/fs/super.c
#include "internal.h"
-@@ -943,6 +946,13 @@ mount_fs(struct file_system_type *type,
+@@ -943,6 +946,13 @@ mount_fs(struct file_system_type *type,
WARN_ON(sb->s_bdi == &default_backing_dev_info);
sb->s_flags |= MS_BORN;
@@ -7296,9 +7296,9 @@ diff -NurpP --minimal linux-3.0.46/fs/super.c linux-3.0.46-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.46/fs/sysfs/mount.c linux-3.0.46-vs2.3.2.5/fs/sysfs/mount.c
---- linux-3.0.46/fs/sysfs/mount.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/sysfs/mount.c 2011-06-22 12:39:15.000000000 +0200
+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
@@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super
sb->s_blocksize = PAGE_CACHE_SIZE;
@@ -7308,9 +7308,9 @@ diff -NurpP --minimal linux-3.0.46/fs/sysfs/mount.c linux-3.0.46-vs2.3.2.5/fs/sy
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-3.0.46/fs/utimes.c linux-3.0.46-vs2.3.2.5/fs/utimes.c
---- linux-3.0.46/fs/utimes.c 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/utimes.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
@@ -7340,9 +7340,9 @@ diff -NurpP --minimal linux-3.0.46/fs/utimes.c linux-3.0.46-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.46/fs/xattr.c linux-3.0.46-vs2.3.2.5/fs/xattr.c
---- linux-3.0.46/fs/xattr.c 2011-07-22 11:18:09.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/xattr.c 2011-06-10 23:10:19.000000000 +0200
+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
@@ -18,6 +18,7 @@
#include <linux/module.h>
#include <linux/fsnotify.h>
@@ -7360,9 +7360,9 @@ diff -NurpP --minimal linux-3.0.46/fs/xattr.c linux-3.0.46-vs2.3.2.5/fs/xattr.c
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-3.0.46/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.46-vs2.3.2.5/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-3.0.46/fs/xfs/linux-2.6/xfs_ioctl.c 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/xfs/linux-2.6/xfs_ioctl.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -28,7 +28,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
@@ -7431,9 +7431,9 @@ diff -NurpP --minimal linux-3.0.46/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.46-vs2
return xfs_ioc_setxflags(ip, filp, arg);
case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-3.0.46/fs/xfs/linux-2.6/xfs_ioctl.h linux-3.0.46-vs2.3.2.5/fs/xfs/linux-2.6/xfs_ioctl.h
---- linux-3.0.46/fs/xfs/linux-2.6/xfs_ioctl.h 2010-07-07 18:31:54.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/xfs/linux-2.6/xfs_ioctl.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
void __user *uhandle,
u32 hlen);
@@ -7447,9 +7447,9 @@ diff -NurpP --minimal linux-3.0.46/fs/xfs/linux-2.6/xfs_ioctl.h linux-3.0.46-vs2
extern long
xfs_file_ioctl(
struct file *filp,
-diff -NurpP --minimal linux-3.0.46/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.46-vs2.3.2.5/fs/xfs/linux-2.6/xfs_iops.c
---- linux-3.0.46/fs/xfs/linux-2.6/xfs_iops.c 2012-10-20 19:47:33.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/xfs/linux-2.6/xfs_iops.c 2011-12-19 15:55:53.000000000 +0100
+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
@@ -30,6 +30,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
@@ -7525,9 +7525,9 @@ diff -NurpP --minimal linux-3.0.46/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.46-vs2.
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-3.0.46/fs/xfs/linux-2.6/xfs_linux.h linux-3.0.46-vs2.3.2.5/fs/xfs/linux-2.6/xfs_linux.h
---- linux-3.0.46/fs/xfs/linux-2.6/xfs_linux.h 2012-10-20 19:47:33.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/xfs/linux-2.6/xfs_linux.h 2011-11-15 17:37:07.000000000 +0100
+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
@@ -117,6 +117,7 @@
#define current_cpu() (raw_smp_processor_id())
@@ -7536,9 +7536,9 @@ diff -NurpP --minimal linux-3.0.46/fs/xfs/linux-2.6/xfs_linux.h linux-3.0.46-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.46/fs/xfs/linux-2.6/xfs_super.c linux-3.0.46-vs2.3.2.5/fs/xfs/linux-2.6/xfs_super.c
---- linux-3.0.46/fs/xfs/linux-2.6/xfs_super.c 2012-10-20 19:47:33.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/xfs/linux-2.6/xfs_super.c 2012-01-10 09:19:13.000000000 +0100
+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
@@ -114,6 +114,9 @@ mempool_t *xfs_ioend_pool;
#define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */
#define MNTOPT_DISCARD "discard" /* Discard unused blocks */
@@ -7611,9 +7611,9 @@ diff -NurpP --minimal linux-3.0.46/fs/xfs/linux-2.6/xfs_super.c linux-3.0.46-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.46/fs/xfs/xfs_dinode.h linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_dinode.h
---- linux-3.0.46/fs/xfs/xfs_dinode.h 2011-01-05 21:50:28.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_dinode.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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 */
@@ -7654,9 +7654,9 @@ diff -NurpP --minimal linux-3.0.46/fs/xfs/xfs_dinode.h linux-3.0.46-vs2.3.2.5/fs
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-3.0.46/fs/xfs/xfs_fs.h linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_fs.h
---- linux-3.0.46/fs/xfs/xfs_fs.h 2011-01-05 21:50:28.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_fs.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -67,6 +67,9 @@ struct fsxattr {
#define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
#define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
@@ -7677,9 +7677,9 @@ diff -NurpP --minimal linux-3.0.46/fs/xfs/xfs_fs.h linux-3.0.46-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.46/fs/xfs/xfs_ialloc.c linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_ialloc.c
---- linux-3.0.46/fs/xfs/xfs_ialloc.c 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_ialloc.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -37,7 +37,6 @@
#include "xfs_error.h"
#include "xfs_bmap.h"
@@ -7688,9 +7688,9 @@ diff -NurpP --minimal linux-3.0.46/fs/xfs/xfs_ialloc.c linux-3.0.46-vs2.3.2.5/fs
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-3.0.46/fs/xfs/xfs_inode.c linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_inode.c
---- linux-3.0.46/fs/xfs/xfs_inode.c 2012-10-20 19:47:33.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_inode.c 2011-12-23 16:09:00.000000000 +0100
+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
@@ -243,6 +243,7 @@ xfs_inotobp(
return 0;
}
@@ -7865,9 +7865,9 @@ diff -NurpP --minimal linux-3.0.46/fs/xfs/xfs_inode.c linux-3.0.46-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.46/fs/xfs/xfs_inode.h linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_inode.h
---- linux-3.0.46/fs/xfs/xfs_inode.h 2012-10-20 19:47:33.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_inode.h 2011-12-19 15:55:53.000000000 +0100
+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
@@ -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 */
@@ -7888,9 +7888,9 @@ diff -NurpP --minimal linux-3.0.46/fs/xfs/xfs_inode.h linux-3.0.46-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.46/fs/xfs/xfs_itable.c linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_itable.c
---- linux-3.0.46/fs/xfs/xfs_itable.c 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_itable.c 2011-06-10 22:11:24.000000000 +0200
+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
@@ -98,6 +98,7 @@ xfs_bulkstat_one_int(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
@@ -7899,9 +7899,9 @@ diff -NurpP --minimal linux-3.0.46/fs/xfs/xfs_itable.c linux-3.0.46-vs2.3.2.5/fs
buf->bs_size = dic->di_size;
/*
-diff -NurpP --minimal linux-3.0.46/fs/xfs/xfs_log_recover.c linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_log_recover.c
---- linux-3.0.46/fs/xfs/xfs_log_recover.c 2012-10-20 19:47:33.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_log_recover.c 2012-04-04 12:51:44.000000000 +0200
+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
@@ -2343,7 +2343,8 @@ xlog_recover_inode_pass2(
}
@@ -7912,9 +7912,9 @@ diff -NurpP --minimal linux-3.0.46/fs/xfs/xfs_log_recover.c linux-3.0.46-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.46/fs/xfs/xfs_mount.h linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_mount.h
---- linux-3.0.46/fs/xfs/xfs_mount.h 2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_mount.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -249,6 +249,7 @@ typedef struct xfs_mount {
allocator */
#define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */
@@ -7923,9 +7923,9 @@ diff -NurpP --minimal linux-3.0.46/fs/xfs/xfs_mount.h linux-3.0.46-vs2.3.2.5/fs/
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-3.0.46/fs/xfs/xfs_vnodeops.c linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_vnodeops.c
---- linux-3.0.46/fs/xfs/xfs_vnodeops.c 2012-10-20 19:47:33.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_vnodeops.c 2012-02-07 02:05:58.000000000 +0100
+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
@@ -50,6 +50,78 @@
#include "xfs_vnodeops.h"
#include "xfs_trace.h"
@@ -8063,9 +8063,9 @@ diff -NurpP --minimal linux-3.0.46/fs/xfs/xfs_vnodeops.c linux-3.0.46-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.46/fs/xfs/xfs_vnodeops.h linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_vnodeops.h
---- linux-3.0.46/fs/xfs/xfs_vnodeops.h 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/fs/xfs/xfs_vnodeops.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -13,6 +13,7 @@ struct xfs_inode;
struct xfs_iomap;
@@ -8074,9 +8074,9 @@ diff -NurpP --minimal linux-3.0.46/fs/xfs/xfs_vnodeops.h linux-3.0.46-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.46/include/asm-generic/tlb.h linux-3.0.46-vs2.3.2.5/include/asm-generic/tlb.h
---- linux-3.0.46/include/asm-generic/tlb.h 2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/asm-generic/tlb.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -16,6 +16,7 @@
#define _ASM_GENERIC__TLB_H
@@ -8085,9 +8085,9 @@ diff -NurpP --minimal linux-3.0.46/include/asm-generic/tlb.h linux-3.0.46-vs2.3.
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.0.46/include/linux/Kbuild linux-3.0.46-vs2.3.2.5/include/linux/Kbuild
---- linux-3.0.46/include/linux/Kbuild 2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/Kbuild 2011-06-10 22:11:24.000000000 +0200
+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
@@ -17,6 +17,7 @@ header-y += netfilter_bridge/
header-y += netfilter_ipv4/
header-y += netfilter_ipv6/
@@ -8096,9 +8096,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/Kbuild linux-3.0.46-vs2.3.2.5/i
header-y += wimax/
objhdr-y += version.h
-diff -NurpP --minimal linux-3.0.46/include/linux/capability.h linux-3.0.46-vs2.3.2.5/include/linux/capability.h
---- linux-3.0.46/include/linux/capability.h 2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/capability.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -279,6 +279,7 @@ struct cpu_vfs_cap_data {
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
@@ -8121,9 +8121,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/capability.h linux-3.0.46-vs2.3
/*
* Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-3.0.46/include/linux/cred.h linux-3.0.46-vs2.3.2.5/include/linux/cred.h
---- linux-3.0.46/include/linux/cred.h 2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/cred.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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 *);
@@ -8164,18 +8164,18 @@ diff -NurpP --minimal linux-3.0.46/include/linux/cred.h linux-3.0.46-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.46/include/linux/devpts_fs.h linux-3.0.46-vs2.3.2.5/include/linux/devpts_fs.h
---- linux-3.0.46/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/devpts_fs.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-3.0.46/include/linux/ext2_fs.h linux-3.0.46-vs2.3.2.5/include/linux/ext2_fs.h
---- linux-3.0.46/include/linux/ext2_fs.h 2012-10-20 19:47:33.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/ext2_fs.h 2011-11-15 17:37:07.000000000 +0100
+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
@@ -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) */
@@ -8215,9 +8215,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/ext2_fs.h linux-3.0.46-vs2.3.2.
#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-3.0.46/include/linux/ext3_fs.h linux-3.0.46-vs2.3.2.5/include/linux/ext3_fs.h
---- linux-3.0.46/include/linux/ext3_fs.h 2012-10-20 19:47:33.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/ext3_fs.h 2011-11-15 17:37:07.000000000 +0100
+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
@@ -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) */
@@ -8261,7 +8261,7 @@ diff -NurpP --minimal linux-3.0.46/include/linux/ext3_fs.h linux-3.0.46-vs2.3.2.
/* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
#ifndef _LINUX_EXT2_FS_H
-@@ -919,6 +926,7 @@ extern void ext3_get_inode_flags(struct
+@@ -919,6 +926,7 @@ extern void ext3_get_inode_flags(struct
extern void ext3_set_aops(struct inode *inode);
extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
u64 start, u64 len);
@@ -8269,9 +8269,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/ext3_fs.h linux-3.0.46-vs2.3.2.
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.0.46/include/linux/fs.h linux-3.0.46-vs2.3.2.5/include/linux/fs.h
---- linux-3.0.46/include/linux/fs.h 2012-10-20 19:47:33.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/fs.h 2012-09-01 11:37:48.000000000 +0200
+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
@@ -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 */
@@ -8438,7 +8438,7 @@ diff -NurpP --minimal linux-3.0.46/include/linux/fs.h linux-3.0.46-vs2.3.2.5/inc
void (*truncate_range)(struct inode *, loff_t, loff_t);
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
u64 len);
-@@ -1623,6 +1661,7 @@ extern ssize_t vfs_readv(struct file *,
+@@ -1623,6 +1661,7 @@ extern ssize_t vfs_readv(struct file *,
unsigned long, loff_t *);
extern ssize_t vfs_writev(struct file *, const struct iovec __user *,
unsigned long, loff_t *);
@@ -8446,7 +8446,7 @@ diff -NurpP --minimal linux-3.0.46/include/linux/fs.h linux-3.0.46-vs2.3.2.5/inc
struct super_operations {
struct inode *(*alloc_inode)(struct super_block *sb);
-@@ -2444,6 +2483,7 @@ extern int dcache_dir_open(struct inode
+@@ -2444,6 +2483,7 @@ extern int dcache_dir_open(struct inode
extern int dcache_dir_close(struct inode *, struct file *);
extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
extern int dcache_readdir(struct file *, void *, filldir_t);
@@ -8454,9 +8454,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/fs.h linux-3.0.46-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.46/include/linux/gfs2_ondisk.h linux-3.0.46-vs2.3.2.5/include/linux/gfs2_ondisk.h
---- linux-3.0.46/include/linux/gfs2_ondisk.h 2010-07-07 18:31:55.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/gfs2_ondisk.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -211,6 +211,9 @@ enum {
gfs2fl_NoAtime = 7,
gfs2fl_Sync = 8,
@@ -8477,9 +8477,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/gfs2_ondisk.h linux-3.0.46-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.46/include/linux/if_tun.h linux-3.0.46-vs2.3.2.5/include/linux/if_tun.h
---- linux-3.0.46/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/if_tun.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -53,6 +53,7 @@
#define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
#define TUNGETVNETHDRSZ _IOR('T', 215, int)
@@ -8488,9 +8488,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/if_tun.h linux-3.0.46-vs2.3.2.5
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-3.0.46/include/linux/init_task.h linux-3.0.46-vs2.3.2.5/include/linux/init_task.h
---- linux-3.0.46/include/linux/init_task.h 2012-10-20 19:47:33.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/init_task.h 2012-10-20 19:57:22.000000000 +0200
+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
@@ -211,6 +211,10 @@ extern struct task_group root_task_group
INIT_TRACE_RECURSION \
INIT_TASK_RCU_PREEMPT(tsk) \
@@ -8502,9 +8502,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/init_task.h linux-3.0.46-vs2.3.
}
-diff -NurpP --minimal linux-3.0.46/include/linux/ipc.h linux-3.0.46-vs2.3.2.5/include/linux/ipc.h
---- linux-3.0.46/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/ipc.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -91,6 +91,7 @@ struct kern_ipc_perm
key_t key;
uid_t uid;
@@ -8513,9 +8513,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/ipc.h linux-3.0.46-vs2.3.2.5/in
uid_t cuid;
gid_t cgid;
mode_t mode;
-diff -NurpP --minimal linux-3.0.46/include/linux/ipc_namespace.h linux-3.0.46-vs2.3.2.5/include/linux/ipc_namespace.h
---- linux-3.0.46/include/linux/ipc_namespace.h 2011-05-22 16:17:55.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/ipc_namespace.h 2011-06-13 14:09:44.000000000 +0200
+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
@@ -94,7 +94,8 @@ static inline int mq_init_ns(struct ipc_
#if defined(CONFIG_IPC_NS)
@@ -8542,9 +8542,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/ipc_namespace.h linux-3.0.46-vs
}
static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-diff -NurpP --minimal linux-3.0.46/include/linux/loop.h linux-3.0.46-vs2.3.2.5/include/linux/loop.h
---- linux-3.0.46/include/linux/loop.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/loop.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -45,6 +45,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
@@ -8553,9 +8553,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/loop.h linux-3.0.46-vs2.3.2.5/i
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-3.0.46/include/linux/magic.h linux-3.0.46-vs2.3.2.5/include/linux/magic.h
---- linux-3.0.46/include/linux/magic.h 2011-05-22 16:17:55.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/magic.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -3,7 +3,7 @@
#define ADFS_SUPER_MAGIC 0xadf5
@@ -8573,9 +8573,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/magic.h linux-3.0.46-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.46/include/linux/major.h linux-3.0.46-vs2.3.2.5/include/linux/major.h
---- linux-3.0.46/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/major.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
@@ -8584,9 +8584,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/major.h linux-3.0.46-vs2.3.2.5/
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-3.0.46/include/linux/memcontrol.h linux-3.0.46-vs2.3.2.5/include/linux/memcontrol.h
---- linux-3.0.46/include/linux/memcontrol.h 2012-10-20 19:47:33.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/memcontrol.h 2012-09-01 11:37:48.000000000 +0200
+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
@@ -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);
@@ -8601,9 +8601,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/memcontrol.h linux-3.0.46-vs2.3
static inline
int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
{
-diff -NurpP --minimal linux-3.0.46/include/linux/mm_types.h linux-3.0.46-vs2.3.2.5/include/linux/mm_types.h
---- linux-3.0.46/include/linux/mm_types.h 2012-10-20 19:47:33.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/mm_types.h 2011-11-15 17:37:07.000000000 +0100
+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
@@ -282,6 +282,7 @@ struct mm_struct {
/* Architecture-specific MM context */
@@ -8612,9 +8612,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/mm_types.h linux-3.0.46-vs2.3.2
/* Swap token stuff */
/*
-diff -NurpP --minimal linux-3.0.46/include/linux/mmzone.h linux-3.0.46-vs2.3.2.5/include/linux/mmzone.h
---- linux-3.0.46/include/linux/mmzone.h 2012-10-20 19:47:33.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/mmzone.h 2012-09-01 11:37:48.000000000 +0200
+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
@@ -668,6 +668,13 @@ typedef struct pglist_data {
__pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
})
@@ -8629,9 +8629,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/mmzone.h linux-3.0.46-vs2.3.2.5
#include <linux/memory_hotplug.h>
extern struct mutex zonelists_mutex;
-diff -NurpP --minimal linux-3.0.46/include/linux/mount.h linux-3.0.46-vs2.3.2.5/include/linux/mount.h
---- linux-3.0.46/include/linux/mount.h 2011-03-15 18:07:39.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/mount.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -52,6 +52,9 @@ struct mnt_pcp {
int mnt_writers;
};
@@ -8650,9 +8650,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/mount.h linux-3.0.46-vs2.3.2.5/
};
struct file; /* forward dec */
-diff -NurpP --minimal linux-3.0.46/include/linux/net.h linux-3.0.46-vs2.3.2.5/include/linux/net.h
---- linux-3.0.46/include/linux/net.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/net.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -72,6 +72,7 @@ struct net;
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
@@ -8661,9 +8661,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/net.h linux-3.0.46-vs2.3.2.5/in
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-3.0.46/include/linux/netdevice.h linux-3.0.46-vs2.3.2.5/include/linux/netdevice.h
---- linux-3.0.46/include/linux/netdevice.h 2012-10-20 19:47:33.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/netdevice.h 2012-10-20 19:57:22.000000000 +0200
+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
@@ -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);
@@ -8672,9 +8672,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/netdevice.h linux-3.0.46-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.46/include/linux/nfs_mount.h linux-3.0.46-vs2.3.2.5/include/linux/nfs_mount.h
---- linux-3.0.46/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/nfs_mount.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -63,7 +63,8 @@ struct nfs_mount_data {
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
#define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
@@ -8685,9 +8685,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/nfs_mount.h linux-3.0.46-vs2.3.
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-3.0.46/include/linux/nsproxy.h linux-3.0.46-vs2.3.2.5/include/linux/nsproxy.h
---- linux-3.0.46/include/linux/nsproxy.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/nsproxy.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -8736,9 +8736,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/nsproxy.h linux-3.0.46-vs2.3.2.
}
#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/pid.h linux-3.0.46-vs2.3.2.5/include/linux/pid.h
---- linux-3.0.46/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/pid.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
@@ -8757,9 +8757,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/pid.h linux-3.0.46-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.46/include/linux/proc_fs.h linux-3.0.46-vs2.3.2.5/include/linux/proc_fs.h
---- linux-3.0.46/include/linux/proc_fs.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/proc_fs.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -56,6 +56,7 @@ struct proc_dir_entry {
nlink_t nlink;
uid_t uid;
@@ -8795,9 +8795,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/proc_fs.h linux-3.0.46-vs2.3.2.
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-3.0.46/include/linux/quotaops.h linux-3.0.46-vs2.3.2.5/include/linux/quotaops.h
---- linux-3.0.46/include/linux/quotaops.h 2011-05-22 16:17:57.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/quotaops.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -8820,7 +8820,7 @@ diff -NurpP --minimal linux-3.0.46/include/linux/quotaops.h linux-3.0.46-vs2.3.2
}
static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
-@@ -219,6 +221,10 @@ static inline int dquot_transfer(struct
+@@ -219,6 +221,10 @@ static inline int dquot_transfer(struct
static inline int __dquot_alloc_space(struct inode *inode, qsize_t number,
int flags)
{
@@ -8839,9 +8839,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/quotaops.h linux-3.0.46-vs2.3.2
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.0.46/include/linux/reboot.h linux-3.0.46-vs2.3.2.5/include/linux/reboot.h
---- linux-3.0.46/include/linux/reboot.h 2010-07-07 18:31:56.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/reboot.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -33,6 +33,7 @@
#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
@@ -8850,9 +8850,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/reboot.h linux-3.0.46-vs2.3.2.5
#ifdef __KERNEL__
-diff -NurpP --minimal linux-3.0.46/include/linux/reiserfs_fs.h linux-3.0.46-vs2.3.2.5/include/linux/reiserfs_fs.h
---- linux-3.0.46/include/linux/reiserfs_fs.h 2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/reiserfs_fs.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -976,6 +976,11 @@ struct stat_data_v1 {
#define REISERFS_COMPR_FL FS_COMPR_FL
#define REISERFS_NOTAIL_FL FS_NOTAIL_FL
@@ -8883,9 +8883,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/reiserfs_fs.h linux-3.0.46-vs2.
int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
-diff -NurpP --minimal linux-3.0.46/include/linux/reiserfs_fs_sb.h linux-3.0.46-vs2.3.2.5/include/linux/reiserfs_fs_sb.h
---- linux-3.0.46/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/reiserfs_fs_sb.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -476,6 +476,7 @@ enum reiserfs_mount_options {
REISERFS_EXPOSE_PRIVROOT,
REISERFS_BARRIER_NONE,
@@ -8894,9 +8894,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/reiserfs_fs_sb.h linux-3.0.46-v
/* Actions on error */
REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-3.0.46/include/linux/sched.h linux-3.0.46-vs2.3.2.5/include/linux/sched.h
---- linux-3.0.46/include/linux/sched.h 2012-10-20 19:47:34.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/sched.h 2012-10-20 19:57:22.000000000 +0200
+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
@@ -1409,6 +1409,14 @@ struct task_struct {
#endif
seccomp_t seccomp;
@@ -8943,9 +8943,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/sched.h linux-3.0.46-vs2.3.2.5/
}
-diff -NurpP --minimal linux-3.0.46/include/linux/shmem_fs.h linux-3.0.46-vs2.3.2.5/include/linux/shmem_fs.h
---- linux-3.0.46/include/linux/shmem_fs.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/shmem_fs.h 2011-07-01 11:35:35.000000000 +0200
+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
@@ -12,6 +12,9 @@
#define SHMEM_SYMLINK_INLINE_LEN (SHMEM_NR_DIRECT * sizeof(swp_entry_t))
@@ -8956,9 +8956,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/shmem_fs.h linux-3.0.46-vs2.3.2
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-3.0.46/include/linux/stat.h linux-3.0.46-vs2.3.2.5/include/linux/stat.h
---- linux-3.0.46/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/stat.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -66,6 +66,7 @@ struct kstat {
unsigned int nlink;
uid_t uid;
@@ -8967,9 +8967,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/stat.h linux-3.0.46-vs2.3.2.5/i
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-3.0.46/include/linux/sunrpc/auth.h linux-3.0.46-vs2.3.2.5/include/linux/sunrpc/auth.h
---- linux-3.0.46/include/linux/sunrpc/auth.h 2011-03-15 18:07:39.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/sunrpc/auth.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -25,6 +25,7 @@
struct auth_cred {
uid_t uid;
@@ -8978,9 +8978,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/sunrpc/auth.h linux-3.0.46-vs2.
struct group_info *group_info;
unsigned char machine_cred : 1;
};
-diff -NurpP --minimal linux-3.0.46/include/linux/sunrpc/clnt.h linux-3.0.46-vs2.3.2.5/include/linux/sunrpc/clnt.h
---- linux-3.0.46/include/linux/sunrpc/clnt.h 2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/sunrpc/clnt.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -49,7 +49,8 @@ struct rpc_clnt {
unsigned int cl_softrtry : 1,/* soft timeouts */
cl_discrtry : 1,/* disconnect before retry */
@@ -8991,9 +8991,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/sunrpc/clnt.h linux-3.0.46-vs2.
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-3.0.46/include/linux/syscalls.h linux-3.0.46-vs2.3.2.5/include/linux/syscalls.h
---- linux-3.0.46/include/linux/syscalls.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/syscalls.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -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,
@@ -9003,9 +9003,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/syscalls.h linux-3.0.46-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.46/include/linux/sysctl.h linux-3.0.46-vs2.3.2.5/include/linux/sysctl.h
---- linux-3.0.46/include/linux/sysctl.h 2011-03-15 18:07:40.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/sysctl.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -60,6 +60,7 @@ enum
CTL_ABI=9, /* Binary emulation */
CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
@@ -9022,9 +9022,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/sysctl.h linux-3.0.46-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.46/include/linux/sysfs.h linux-3.0.46-vs2.3.2.5/include/linux/sysfs.h
---- linux-3.0.46/include/linux/sysfs.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/sysfs.h 2011-06-22 12:39:15.000000000 +0200
+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
@@ -19,6 +19,8 @@
#include <linux/kobject_ns.h>
#include <asm/atomic.h>
@@ -9034,9 +9034,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/sysfs.h linux-3.0.46-vs2.3.2.5/
struct kobject;
struct module;
enum kobj_ns_type;
-diff -NurpP --minimal linux-3.0.46/include/linux/time.h linux-3.0.46-vs2.3.2.5/include/linux/time.h
---- linux-3.0.46/include/linux/time.h 2012-10-20 19:47:34.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/time.h 2012-10-20 19:57:22.000000000 +0200
+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
@@ -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;
@@ -9047,9 +9047,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/time.h linux-3.0.46-vs2.3.2.5/i
#endif /* __KERNEL__ */
#define NFDBITS __NFDBITS
-diff -NurpP --minimal linux-3.0.46/include/linux/types.h linux-3.0.46-vs2.3.2.5/include/linux/types.h
---- linux-3.0.46/include/linux/types.h 2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/types.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -40,6 +40,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
@@ -9060,9 +9060,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/types.h linux-3.0.46-vs2.3.2.5/
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-3.0.46/include/linux/utsname.h linux-3.0.46-vs2.3.2.5/include/linux/utsname.h
---- linux-3.0.46/include/linux/utsname.h 2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0.46-vs2.3.2.5/include/linux/utsname.h 2011-06-13 14:36:48.000000000 +0200
+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
@@ -54,7 +54,8 @@ static inline void get_uts_ns(struct uts
}
@@ -9089,9 +9089,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/utsname.h linux-3.0.46-vs2.3.2.
}
#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vroot.h linux-3.0.46-vs2.3.2.5/include/linux/vroot.h
---- linux-3.0.46/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vroot.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,51 @@
+
+/*
@@ -9144,9 +9144,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vroot.h linux-3.0.46-vs2.3.2.5/
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.0.46/include/linux/vs_base.h linux-3.0.46-vs2.3.2.5/include/linux/vs_base.h
---- linux-3.0.46/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vs_base.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
@@ -9158,9 +9158,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vs_base.h linux-3.0.46-vs2.3.2.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vs_context.h linux-3.0.46-vs2.3.2.5/include/linux/vs_context.h
---- linux-3.0.46/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vs_context.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
@@ -9404,9 +9404,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vs_context.h linux-3.0.46-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vs_cowbl.h linux-3.0.46-vs2.3.2.5/include/linux/vs_cowbl.h
---- linux-3.0.46/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vs_cowbl.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
@@ -9456,9 +9456,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vs_cowbl.h linux-3.0.46-vs2.3.2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vs_cvirt.h linux-3.0.46-vs2.3.2.5/include/linux/vs_cvirt.h
---- linux-3.0.46/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vs_cvirt.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
@@ -9510,9 +9510,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vs_cvirt.h linux-3.0.46-vs2.3.2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vs_device.h linux-3.0.46-vs2.3.2.5/include/linux/vs_device.h
---- linux-3.0.46/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vs_device.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
@@ -9559,9 +9559,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vs_device.h linux-3.0.46-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vs_dlimit.h linux-3.0.46-vs2.3.2.5/include/linux/vs_dlimit.h
---- linux-3.0.46/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vs_dlimit.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
@@ -9778,9 +9778,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vs_dlimit.h linux-3.0.46-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vs_inet.h linux-3.0.46-vs2.3.2.5/include/linux/vs_inet.h
---- linux-3.0.46/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vs_inet.h 2011-08-18 17:01:00.000000000 +0200
+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
@@ -0,0 +1,353 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
@@ -10135,9 +10135,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vs_inet.h linux-3.0.46-vs2.3.2.
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vs_inet6.h linux-3.0.46-vs2.3.2.5/include/linux/vs_inet6.h
---- linux-3.0.46/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vs_inet6.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,246 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
@@ -10385,9 +10385,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vs_inet6.h linux-3.0.46-vs2.3.2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vs_limit.h linux-3.0.46-vs2.3.2.5/include/linux/vs_limit.h
---- linux-3.0.46/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vs_limit.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
@@ -10529,9 +10529,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vs_limit.h linux-3.0.46-vs2.3.2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vs_memory.h linux-3.0.46-vs2.3.2.5/include/linux/vs_memory.h
---- linux-3.0.46/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vs_memory.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,58 @@
+#ifndef _VS_MEMORY_H
+#define _VS_MEMORY_H
@@ -10591,9 +10591,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vs_memory.h linux-3.0.46-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vs_network.h linux-3.0.46-vs2.3.2.5/include/linux/vs_network.h
---- linux-3.0.46/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vs_network.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
@@ -10764,9 +10764,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vs_network.h linux-3.0.46-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vs_pid.h linux-3.0.46-vs2.3.2.5/include/linux/vs_pid.h
---- linux-3.0.46/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vs_pid.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
@@ -10818,9 +10818,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vs_pid.h linux-3.0.46-vs2.3.2.5
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vs_sched.h linux-3.0.46-vs2.3.2.5/include/linux/vs_sched.h
---- linux-3.0.46/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vs_sched.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
@@ -10862,9 +10862,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vs_sched.h linux-3.0.46-vs2.3.2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vs_socket.h linux-3.0.46-vs2.3.2.5/include/linux/vs_socket.h
---- linux-3.0.46/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vs_socket.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
@@ -10933,9 +10933,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vs_socket.h linux-3.0.46-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vs_tag.h linux-3.0.46-vs2.3.2.5/include/linux/vs_tag.h
---- linux-3.0.46/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vs_tag.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
@@ -10984,9 +10984,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vs_tag.h linux-3.0.46-vs2.3.2.5
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vs_time.h linux-3.0.46-vs2.3.2.5/include/linux/vs_time.h
---- linux-3.0.46/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vs_time.h 2011-06-13 14:57:45.000000000 +0200
+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
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
@@ -11007,9 +11007,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vs_time.h linux-3.0.46-vs2.3.2.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vserver/Kbuild linux-3.0.46-vs2.3.2.5/include/linux/vserver/Kbuild
---- linux-3.0.46/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vserver/Kbuild 2011-08-08 18:02:46.000000000 +0200
+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
@@ -0,0 +1,8 @@
+
+header-y += context_cmd.h network_cmd.h space_cmd.h \
@@ -11019,9 +11019,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vserver/Kbuild linux-3.0.46-vs2
+
+header-y += switch.h network.h monitor.h inode.h device.h
+
-diff -NurpP --minimal linux-3.0.46/include/linux/vserver/base.h linux-3.0.46-vs2.3.2.5/include/linux/vserver/base.h
---- linux-3.0.46/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vserver/base.h 2011-08-01 18:26:07.000000000 +0200
+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
@@ -0,0 +1,178 @@
+#ifndef _VX_BASE_H
+#define _VX_BASE_H
@@ -11201,9 +11201,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vserver/base.h linux-3.0.46-vs2
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vserver/cacct.h linux-3.0.46-vs2.3.2.5/include/linux/vserver/cacct.h
---- linux-3.0.46/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vserver/cacct.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,15 @@
+#ifndef _VX_CACCT_H
+#define _VX_CACCT_H
@@ -11220,9 +11220,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vserver/cacct.h linux-3.0.46-vs
+};
+
+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-3.0.46/include/linux/vserver/cacct_cmd.h linux-3.0.46-vs2.3.2.5/include/linux/vserver/cacct_cmd.h
---- linux-3.0.46/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vserver/cacct_cmd.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,23 @@
+#ifndef _VX_CACCT_CMD_H
+#define _VX_CACCT_CMD_H
@@ -11247,9 +11247,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vserver/cacct_cmd.h linux-3.0.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.0.46/include/linux/vserver/cacct_def.h linux-3.0.46-vs2.3.2.5/include/linux/vserver/cacct_def.h
---- linux-3.0.46/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vserver/cacct_def.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,43 @@
+#ifndef _VX_CACCT_DEF_H
+#define _VX_CACCT_DEF_H
@@ -11294,9 +11294,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vserver/cacct_def.h linux-3.0.4
+#endif
+
+#endif /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.0.46/include/linux/vserver/cacct_int.h linux-3.0.46-vs2.3.2.5/include/linux/vserver/cacct_int.h
---- linux-3.0.46/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vserver/cacct_int.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,21 @@
+#ifndef _VX_CACCT_INT_H
+#define _VX_CACCT_INT_H
@@ -11319,9 +11319,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vserver/cacct_int.h linux-3.0.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-3.0.46/include/linux/vserver/check.h linux-3.0.46-vs2.3.2.5/include/linux/vserver/check.h
---- linux-3.0.46/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vserver/check.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,89 @@
+#ifndef _VS_CHECK_H
+#define _VS_CHECK_H
@@ -11412,9 +11412,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vserver/check.h linux-3.0.46-vs
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-3.0.46/include/linux/vserver/context.h linux-3.0.46-vs2.3.2.5/include/linux/vserver/context.h
---- linux-3.0.46/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vserver/context.h 2011-10-27 13:59:29.000000000 +0200
+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
@@ -0,0 +1,188 @@
+#ifndef _VX_CONTEXT_H
+#define _VX_CONTEXT_H
@@ -11604,9 +11604,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vserver/context.h linux-3.0.46-
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-3.0.46/include/linux/vserver/context_cmd.h linux-3.0.46-vs2.3.2.5/include/linux/vserver/context_cmd.h
---- linux-3.0.46/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vserver/context_cmd.h 2011-08-01 18:25:07.000000000 +0200
+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
@@ -0,0 +1,162 @@
+#ifndef _VX_CONTEXT_CMD_H
+#define _VX_CONTEXT_CMD_H
@@ -11770,9 +11770,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vserver/context_cmd.h linux-3.0
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.0.46/include/linux/vserver/cvirt.h linux-3.0.46-vs2.3.2.5/include/linux/vserver/cvirt.h
---- linux-3.0.46/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vserver/cvirt.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,20 @@
+#ifndef _VX_CVIRT_H
+#define _VX_CVIRT_H
@@ -11794,9 +11794,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vserver/cvirt.h linux-3.0.46-vs
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-3.0.46/include/linux/vserver/cvirt_cmd.h linux-3.0.46-vs2.3.2.5/include/linux/vserver/cvirt_cmd.h
---- linux-3.0.46/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vserver/cvirt_cmd.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,53 @@
+#ifndef _VX_CVIRT_CMD_H
+#define _VX_CVIRT_CMD_H
@@ -11851,9 +11851,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vserver/cvirt_cmd.h linux-3.0.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.0.46/include/linux/vserver/cvirt_def.h linux-3.0.46-vs2.3.2.5/include/linux/vserver/cvirt_def.h
---- linux-3.0.46/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vserver/cvirt_def.h 2011-06-10 22:11:24.000000000 +0200
+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
@@ -0,0 +1,80 @@
+#ifndef _VX_CVIRT_DEF_H
+#define _VX_CVIRT_DEF_H
@@ -11935,9 +11935,9 @@ diff -NurpP --minimal linux-3.0.46/include/linux/vserver/cvirt_def.h linux-3.0.4
+#endif
+
+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.0.46/include/linux/vserver/debug.h linux-3.0.46-vs2.3.2.5/include/linux/vserver/debug.h
---- linux-3.0.46/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.46-vs2.3.2.5/include/linux/vserver/debug.h 2011-11-17 21:25:04.000000000 +0100
+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
@@ -0,0 +1,145 @@
<Skipped 2434 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/08a7fbfe096f0045fb9eb989f7fccdeee6d164eb
More information about the pld-cvs-commit
mailing list