[kernel] r9695 - in dists/sid/linux-2.6/debian: . patches/features/all/vserver patches/series
Bastian Blank
waldi at alioth.debian.org
Sun Nov 4 00:19:32 UTC 2007
Author: waldi
Date: Sun Nov 4 00:19:32 2007
New Revision: 9695
Log:
Update vserver patch to 2.2.0.5.
* debian/changelog: Update.
* debian/patches/features/all/vserver/vs2.2.0.4.patch: Remove.
* debian/patches/features/all/vserver/vs2.2.0.5.patch: Add.
* debian/patches/series/5-extra: Remove.
* debian/patches/series/6-extra: Add.
Added:
dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.2.0.5.patch
- copied, changed from r9612, /dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.2.0.4.patch
dists/sid/linux-2.6/debian/patches/series/6-extra
Removed:
dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.2.0.4.patch
dists/sid/linux-2.6/debian/patches/series/5-extra
Modified:
dists/sid/linux-2.6/debian/changelog
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog (original)
+++ dists/sid/linux-2.6/debian/changelog Sun Nov 4 00:19:32 2007
@@ -45,7 +45,10 @@
- dm snapshot: fix invalidation deadlock
- Revert "x86_64: allocate sparsemem memmap above 4G"
- -- maximilian attems <maks at debian.org> Sat, 03 Nov 2007 22:50:32 +0100
+ [ Bastian Blank ]
+ * Update vserver patch to 2.2.0.5.
+
+ -- Bastian Blank <waldi at debian.org> Sun, 04 Nov 2007 01:16:25 +0100
linux-2.6 (2.6.22-5) unstable; urgency=low
Copied: dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.2.0.5.patch (from r9612, /dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.2.0.4.patch)
==============================================================================
--- /dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.2.0.4.patch (original)
+++ dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.2.0.5.patch Sun Nov 4 00:19:32 2007
@@ -1,6 +1,5 @@
-diff -NurpP --minimal linux-2.6.22.9/Documentation/vserver/debug.txt linux-2.6.22.9-vs2.2.0.4/Documentation/vserver/debug.txt
---- linux-2.6.22.9/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/Documentation/vserver/debug.txt 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/Documentation/vserver/debug.txt 2007-06-15 02:37:02 +0200
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -156,9 +155,8 @@
+ 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-2.6.22.9/arch/alpha/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/alpha/Kconfig
---- linux-2.6.22.9/arch/alpha/Kconfig 2007-07-09 13:17:31 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/alpha/Kconfig 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/alpha/Kconfig 2007-07-09 13:17:31 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/alpha/Kconfig 2007-06-15 02:37:02 +0200
@@ -662,6 +662,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -168,9 +166,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/alpha/kernel/asm-offsets.c linux-2.6.22.9-vs2.2.0.4/arch/alpha/kernel/asm-offsets.c
---- linux-2.6.22.9/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/arch/alpha/kernel/asm-offsets.c 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/alpha/kernel/asm-offsets.c 2007-06-15 02:37:02 +0200
@@ -36,6 +36,7 @@ void foo(void)
DEFINE(PT_PTRACED, PT_PTRACED);
DEFINE(CLONE_VM, CLONE_VM);
@@ -179,9 +176,8 @@
DEFINE(SIGCHLD, SIGCHLD);
BLANK();
-diff -NurpP --minimal linux-2.6.22.9/arch/alpha/kernel/entry.S linux-2.6.22.9-vs2.2.0.4/arch/alpha/kernel/entry.S
---- linux-2.6.22.9/arch/alpha/kernel/entry.S 2007-07-09 13:17:31 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/alpha/kernel/entry.S 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/alpha/kernel/entry.S 2007-07-09 13:17:31 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/alpha/kernel/entry.S 2007-06-15 02:37:02 +0200
@@ -643,7 +643,7 @@ kernel_thread:
stq $2, 152($sp) /* HAE */
@@ -223,9 +219,8 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.22.9/arch/alpha/kernel/osf_sys.c linux-2.6.22.9-vs2.2.0.4/arch/alpha/kernel/osf_sys.c
---- linux-2.6.22.9/arch/alpha/kernel/osf_sys.c 2007-07-09 13:17:31 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/alpha/kernel/osf_sys.c 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/alpha/kernel/osf_sys.c 2007-07-09 13:17:31 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/alpha/kernel/osf_sys.c 2007-06-15 02:37:02 +0200
@@ -883,7 +883,7 @@ osf_gettimeofday(struct timeval32 __user
{
if (tv) {
@@ -235,9 +230,8 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.22.9/arch/alpha/kernel/ptrace.c linux-2.6.22.9-vs2.2.0.4/arch/alpha/kernel/ptrace.c
---- linux-2.6.22.9/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/alpha/kernel/ptrace.c 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/alpha/kernel/ptrace.c 2007-06-15 02:37:02 +0200
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -258,9 +252,8 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out;
-diff -NurpP --minimal linux-2.6.22.9/arch/alpha/kernel/semaphore.c linux-2.6.22.9-vs2.2.0.4/arch/alpha/kernel/semaphore.c
---- linux-2.6.22.9/arch/alpha/kernel/semaphore.c 2004-08-14 12:55:32 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/alpha/kernel/semaphore.c 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/alpha/kernel/semaphore.c 2004-08-14 12:55:32 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/alpha/kernel/semaphore.c 2007-06-15 02:37:02 +0200
@@ -68,8 +68,8 @@ __down_failed(struct semaphore *sem)
DECLARE_WAITQUEUE(wait, tsk);
@@ -294,9 +287,8 @@
#endif
tsk->state = TASK_INTERRUPTIBLE;
-diff -NurpP --minimal linux-2.6.22.9/arch/alpha/kernel/systbls.S linux-2.6.22.9-vs2.2.0.4/arch/alpha/kernel/systbls.S
---- linux-2.6.22.9/arch/alpha/kernel/systbls.S 2007-07-09 13:17:31 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/alpha/kernel/systbls.S 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/alpha/kernel/systbls.S 2007-07-09 13:17:31 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/alpha/kernel/systbls.S 2007-06-15 02:37:02 +0200
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -306,9 +298,8 @@
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-2.6.22.9/arch/alpha/kernel/traps.c linux-2.6.22.9-vs2.2.0.4/arch/alpha/kernel/traps.c
---- linux-2.6.22.9/arch/alpha/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/alpha/kernel/traps.c 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/alpha/kernel/traps.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/alpha/kernel/traps.c 2007-06-15 02:37:02 +0200
@@ -182,7 +182,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -319,9 +310,8 @@
dik_show_regs(regs, r9_15);
dik_show_trace((unsigned long *)(regs+1));
dik_show_code((unsigned int *)regs->pc);
-diff -NurpP --minimal linux-2.6.22.9/arch/alpha/mm/fault.c linux-2.6.22.9-vs2.2.0.4/arch/alpha/mm/fault.c
---- linux-2.6.22.9/arch/alpha/mm/fault.c 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/alpha/mm/fault.c 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/alpha/mm/fault.c 2007-07-09 13:17:32 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/alpha/mm/fault.c 2007-06-15 02:37:02 +0200
@@ -197,8 +197,8 @@ do_page_fault(unsigned long address, uns
down_read(&mm->mmap_sem);
goto survive;
@@ -333,9 +323,8 @@
if (!user_mode(regs))
goto no_context;
do_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.22.9/arch/arm/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/arm/Kconfig
---- linux-2.6.22.9/arch/arm/Kconfig 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/arm/Kconfig 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/arm/Kconfig 2007-07-09 13:17:32 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/arm/Kconfig 2007-06-15 02:37:02 +0200
@@ -1042,6 +1042,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -345,9 +334,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/arm/kernel/calls.S linux-2.6.22.9-vs2.2.0.4/arch/arm/kernel/calls.S
---- linux-2.6.22.9/arch/arm/kernel/calls.S 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/arm/kernel/calls.S 2007-07-07 03:52:53 +0200
+--- linux-2.6.22.10/arch/arm/kernel/calls.S 2007-07-09 13:17:32 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/arm/kernel/calls.S 2007-07-07 03:52:53 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -357,9 +345,8 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.22.9/arch/arm/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/arm/kernel/process.c
---- linux-2.6.22.9/arch/arm/kernel/process.c 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/arm/kernel/process.c 2007-07-07 03:52:53 +0200
+--- linux-2.6.22.10/arch/arm/kernel/process.c 2007-07-09 13:17:32 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/arm/kernel/process.c 2007-07-07 03:52:53 +0200
@@ -261,7 +261,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
@@ -380,9 +367,8 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.22.9/arch/arm/kernel/traps.c linux-2.6.22.9-vs2.2.0.4/arch/arm/kernel/traps.c
---- linux-2.6.22.9/arch/arm/kernel/traps.c 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/arm/kernel/traps.c 2007-07-09 13:11:53 +0200
+--- linux-2.6.22.10/arch/arm/kernel/traps.c 2007-07-09 13:17:32 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/arm/kernel/traps.c 2007-07-09 13:11:53 +0200
@@ -222,8 +222,8 @@ static void __die(const char *str, int e
str, err, ++die_counter);
print_modules();
@@ -394,9 +380,8 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem("Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.22.9/arch/arm/mm/fault.c linux-2.6.22.9-vs2.2.0.4/arch/arm/mm/fault.c
---- linux-2.6.22.9/arch/arm/mm/fault.c 2007-07-09 13:17:39 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/arm/mm/fault.c 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/arm/mm/fault.c 2007-07-09 13:17:39 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/arm/mm/fault.c 2007-06-15 02:37:02 +0200
@@ -266,7 +266,8 @@ do_page_fault(unsigned long addr, unsign
* happened to us that made us unable to handle
* the page fault gracefully.
@@ -407,9 +392,8 @@
do_exit(SIGKILL);
return 0;
-diff -NurpP --minimal linux-2.6.22.9/arch/arm26/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/arm26/Kconfig
---- linux-2.6.22.9/arch/arm26/Kconfig 2007-07-09 13:17:40 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/arm26/Kconfig 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/arm26/Kconfig 2007-07-09 13:17:40 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/arm26/Kconfig 2007-06-15 02:37:02 +0200
@@ -243,6 +243,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -419,9 +403,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/arm26/kernel/calls.S linux-2.6.22.9-vs2.2.0.4/arch/arm26/kernel/calls.S
---- linux-2.6.22.9/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/arch/arm26/kernel/calls.S 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/arm26/kernel/calls.S 2007-06-15 02:37:02 +0200
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -434,9 +417,8 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.22.9/arch/arm26/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/arm26/kernel/process.c
---- linux-2.6.22.9/arch/arm26/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/arm26/kernel/process.c 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/arm26/kernel/process.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/arm26/kernel/process.c 2007-06-15 02:37:02 +0200
@@ -365,7 +365,8 @@ pid_t kernel_thread(int (*fn)(void *), v
regs.ARM_r3 = (unsigned long)do_exit;
regs.ARM_pc = (unsigned long)kernel_thread_helper | MODE_SVC26;
@@ -447,9 +429,8 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.22.9/arch/arm26/kernel/traps.c linux-2.6.22.9-vs2.2.0.4/arch/arm26/kernel/traps.c
---- linux-2.6.22.9/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/arm26/kernel/traps.c 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/arm26/kernel/traps.c 2007-06-15 02:37:02 +0200
@@ -185,8 +185,9 @@ NORET_TYPE void die(const char *str, str
printk("Internal error: %s: %x\n", str, err);
printk("CPU: %d\n", smp_processor_id());
@@ -462,9 +443,8 @@
if (!user_mode(regs) || in_interrupt()) {
__dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.22.9/arch/cris/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/cris/Kconfig
---- linux-2.6.22.9/arch/cris/Kconfig 2007-05-02 19:24:19 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/cris/Kconfig 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/cris/Kconfig 2007-05-02 19:24:19 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/cris/Kconfig 2007-06-15 02:37:02 +0200
@@ -200,6 +200,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -474,9 +454,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/cris/arch-v10/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/cris/arch-v10/kernel/process.c
---- linux-2.6.22.9/arch/cris/arch-v10/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/cris/arch-v10/kernel/process.c 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/cris/arch-v10/kernel/process.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/cris/arch-v10/kernel/process.c 2007-06-15 02:37:02 +0200
@@ -103,7 +103,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.dccr = 1 << I_DCCR_BITNR;
@@ -487,9 +466,8 @@
}
/* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.22.9/arch/cris/arch-v32/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/cris/arch-v32/kernel/process.c
---- linux-2.6.22.9/arch/cris/arch-v32/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/cris/arch-v32/kernel/process.c 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/cris/arch-v32/kernel/process.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/cris/arch-v32/kernel/process.c 2007-06-15 02:37:02 +0200
@@ -120,7 +120,8 @@ kernel_thread(int (*fn)(void *), void *
regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
@@ -500,9 +478,8 @@
}
/*
-diff -NurpP --minimal linux-2.6.22.9/arch/frv/kernel/kernel_thread.S linux-2.6.22.9-vs2.2.0.4/arch/frv/kernel/kernel_thread.S
---- linux-2.6.22.9/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/arch/frv/kernel/kernel_thread.S 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/frv/kernel/kernel_thread.S 2007-06-15 02:37:02 +0200
@@ -13,6 +13,8 @@
#include <asm/unistd.h>
@@ -521,9 +498,8 @@
sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
setlo #0xe4e4,gr9
setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
-diff -NurpP --minimal linux-2.6.22.9/arch/h8300/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/h8300/Kconfig
---- linux-2.6.22.9/arch/h8300/Kconfig 2007-07-09 13:17:41 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/h8300/Kconfig 2007-06-15 02:37:02 +0200
+--- linux-2.6.22.10/arch/h8300/Kconfig 2007-07-09 13:17:41 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/h8300/Kconfig 2007-06-15 02:37:02 +0200
@@ -222,6 +222,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -533,9 +509,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/h8300/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/h8300/kernel/process.c
---- linux-2.6.22.9/arch/h8300/kernel/process.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/h8300/kernel/process.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/h8300/kernel/process.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/h8300/kernel/process.c 2007-06-15 02:37:03 +0200
@@ -134,7 +134,7 @@ int kernel_thread(int (*fn)(void *), voi
fs = get_fs();
@@ -545,9 +520,8 @@
__asm__("mov.l sp,er3\n\t"
"sub.l er2,er2\n\t"
"mov.l %2,er1\n\t"
-diff -NurpP --minimal linux-2.6.22.9/arch/i386/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/i386/Kconfig
---- linux-2.6.22.9/arch/i386/Kconfig 2007-07-09 13:17:41 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/i386/Kconfig 2007-07-09 13:11:53 +0200
+--- linux-2.6.22.10/arch/i386/Kconfig 2007-07-09 13:17:41 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/i386/Kconfig 2007-07-09 13:11:53 +0200
@@ -1230,6 +1230,8 @@ endmenu
source "arch/i386/Kconfig.debug"
@@ -557,9 +531,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/i386/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/i386/kernel/process.c
---- linux-2.6.22.9/arch/i386/kernel/process.c 2007-07-09 13:17:42 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/i386/kernel/process.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/i386/kernel/process.c 2007-07-09 13:17:42 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/i386/kernel/process.c 2007-06-15 02:37:03 +0200
@@ -302,8 +302,10 @@ void show_regs(struct pt_regs * regs)
unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
@@ -583,9 +556,8 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.22.9/arch/i386/kernel/syscall_table.S linux-2.6.22.9-vs2.2.0.4/arch/i386/kernel/syscall_table.S
---- linux-2.6.22.9/arch/i386/kernel/syscall_table.S 2007-07-09 13:17:42 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/i386/kernel/syscall_table.S 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/i386/kernel/syscall_table.S 2007-07-09 13:17:42 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/i386/kernel/syscall_table.S 2007-06-15 02:37:03 +0200
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
@@ -595,9 +567,8 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.22.9/arch/i386/kernel/sysenter.c linux-2.6.22.9-vs2.2.0.4/arch/i386/kernel/sysenter.c
---- linux-2.6.22.9/arch/i386/kernel/sysenter.c 2007-09-05 03:37:48 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/i386/kernel/sysenter.c 2007-09-05 03:05:52 +0200
+--- linux-2.6.22.10/arch/i386/kernel/sysenter.c 2007-10-30 01:57:12 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/i386/kernel/sysenter.c 2007-09-05 03:05:52 +0200
@@ -17,6 +17,7 @@
#include <linux/elf.h>
#include <linux/mm.h>
@@ -606,9 +577,8 @@
#include <asm/cpufeature.h>
#include <asm/msr.h>
-diff -NurpP --minimal linux-2.6.22.9/arch/i386/kernel/traps.c linux-2.6.22.9-vs2.2.0.4/arch/i386/kernel/traps.c
---- linux-2.6.22.9/arch/i386/kernel/traps.c 2007-07-09 13:17:42 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/i386/kernel/traps.c 2007-06-15 02:38:37 +0200
+--- linux-2.6.22.10/arch/i386/kernel/traps.c 2007-07-09 13:17:42 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/i386/kernel/traps.c 2007-06-15 02:38:37 +0200
@@ -56,6 +56,8 @@
#include <asm/stacktrace.h>
@@ -650,9 +620,8 @@
/* Executive summary in case the oops scrolled away */
esp = (unsigned long) (®s->esp);
savesegment(ss, ss);
-diff -NurpP --minimal linux-2.6.22.9/arch/i386/mm/fault.c linux-2.6.22.9-vs2.2.0.4/arch/i386/mm/fault.c
---- linux-2.6.22.9/arch/i386/mm/fault.c 2007-09-05 03:37:48 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/i386/mm/fault.c 2007-09-05 03:05:52 +0200
+--- linux-2.6.22.10/arch/i386/mm/fault.c 2007-10-30 01:57:12 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/i386/mm/fault.c 2007-09-05 03:05:52 +0200
@@ -587,7 +587,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -663,9 +632,8 @@
if (error_code & 4)
do_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.22.9/arch/ia64/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/ia64/Kconfig
---- linux-2.6.22.9/arch/ia64/Kconfig 2007-07-09 13:17:43 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/ia64/Kconfig 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/ia64/Kconfig 2007-07-09 13:17:43 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/ia64/Kconfig 2007-06-15 02:37:03 +0200
@@ -592,6 +592,8 @@ endmenu
source "arch/ia64/Kconfig.debug"
@@ -675,9 +643,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/ia64/ia32/binfmt_elf32.c linux-2.6.22.9-vs2.2.0.4/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.22.9/arch/ia64/ia32/binfmt_elf32.c 2007-05-02 19:24:20 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/ia64/ia32/binfmt_elf32.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/ia64/ia32/binfmt_elf32.c 2007-05-02 19:24:20 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/ia64/ia32/binfmt_elf32.c 2007-06-15 02:37:03 +0200
@@ -233,7 +233,8 @@ ia32_setup_arg_pages (struct linux_binpr
kmem_cache_free(vm_area_cachep, mpnt);
return ret;
@@ -688,9 +655,8 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.22.9/arch/ia64/ia32/ia32_entry.S linux-2.6.22.9-vs2.2.0.4/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.22.9/arch/ia64/ia32/ia32_entry.S 2007-07-09 13:17:43 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/ia64/ia32/ia32_entry.S 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/ia64/ia32/ia32_entry.S 2007-07-09 13:17:43 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/ia64/ia32/ia32_entry.S 2007-06-15 02:37:03 +0200
@@ -446,7 +446,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -700,9 +666,8 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.22.9/arch/ia64/ia32/sys_ia32.c linux-2.6.22.9-vs2.2.0.4/arch/ia64/ia32/sys_ia32.c
---- linux-2.6.22.9/arch/ia64/ia32/sys_ia32.c 2007-05-02 19:24:20 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/ia64/ia32/sys_ia32.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/ia64/ia32/sys_ia32.c 2007-05-02 19:24:20 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/ia64/ia32/sys_ia32.c 2007-06-15 02:37:03 +0200
@@ -1182,7 +1182,7 @@ sys32_gettimeofday (struct compat_timeva
{
if (tv) {
@@ -712,9 +677,8 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.22.9/arch/ia64/kernel/asm-offsets.c linux-2.6.22.9-vs2.2.0.4/arch/ia64/kernel/asm-offsets.c
---- linux-2.6.22.9/arch/ia64/kernel/asm-offsets.c 2007-05-02 19:24:20 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/ia64/kernel/asm-offsets.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/ia64/kernel/asm-offsets.c 2007-05-02 19:24:20 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/ia64/kernel/asm-offsets.c 2007-06-15 02:37:03 +0200
@@ -192,6 +192,7 @@ void foo(void)
/* for assembly files which can't include sched.h: */
DEFINE(IA64_CLONE_VFORK, CLONE_VFORK);
@@ -723,9 +687,8 @@
BLANK();
DEFINE(IA64_CPUINFO_NSEC_PER_CYC_OFFSET,
-diff -NurpP --minimal linux-2.6.22.9/arch/ia64/kernel/entry.S linux-2.6.22.9-vs2.2.0.4/arch/ia64/kernel/entry.S
---- linux-2.6.22.9/arch/ia64/kernel/entry.S 2007-07-09 13:17:43 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/ia64/kernel/entry.S 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/ia64/kernel/entry.S 2007-07-09 13:17:43 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/ia64/kernel/entry.S 2007-06-15 02:37:03 +0200
@@ -1547,7 +1547,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -735,9 +698,8 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.22.9/arch/ia64/kernel/perfmon.c linux-2.6.22.9-vs2.2.0.4/arch/ia64/kernel/perfmon.c
---- linux-2.6.22.9/arch/ia64/kernel/perfmon.c 2007-07-09 13:17:43 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/ia64/kernel/perfmon.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/ia64/kernel/perfmon.c 2007-07-09 13:17:43 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/ia64/kernel/perfmon.c 2007-06-15 02:37:03 +0200
@@ -40,6 +40,7 @@
#include <linux/capability.h>
#include <linux/rcupdate.h>
@@ -755,9 +717,8 @@
vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
vma_pages(vma));
up_write(&task->mm->mmap_sem);
-diff -NurpP --minimal linux-2.6.22.9/arch/ia64/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/ia64/kernel/process.c
---- linux-2.6.22.9/arch/ia64/kernel/process.c 2007-07-09 13:17:43 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/ia64/kernel/process.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/ia64/kernel/process.c 2007-07-09 13:17:43 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/ia64/kernel/process.c 2007-06-15 02:37:03 +0200
@@ -105,7 +105,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -778,9 +739,8 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.22.9/arch/ia64/kernel/ptrace.c linux-2.6.22.9-vs2.2.0.4/arch/ia64/kernel/ptrace.c
---- linux-2.6.22.9/arch/ia64/kernel/ptrace.c 2007-05-02 19:24:20 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/ia64/kernel/ptrace.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/ia64/kernel/ptrace.c 2007-05-02 19:24:20 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/ia64/kernel/ptrace.c 2007-06-15 02:37:03 +0200
@@ -17,6 +17,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -799,9 +759,8 @@
ret = -EPERM;
if (pid == 1) /* no messing around with init! */
goto out_tsk;
-diff -NurpP --minimal linux-2.6.22.9/arch/ia64/kernel/traps.c linux-2.6.22.9-vs2.2.0.4/arch/ia64/kernel/traps.c
---- linux-2.6.22.9/arch/ia64/kernel/traps.c 2007-07-09 13:17:43 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/ia64/kernel/traps.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/ia64/kernel/traps.c 2007-07-09 13:17:43 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/ia64/kernel/traps.c 2007-06-15 02:37:03 +0200
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -826,9 +785,8 @@
}
}
}
-diff -NurpP --minimal linux-2.6.22.9/arch/ia64/mm/fault.c linux-2.6.22.9-vs2.2.0.4/arch/ia64/mm/fault.c
---- linux-2.6.22.9/arch/ia64/mm/fault.c 2007-07-09 13:17:43 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/ia64/mm/fault.c 2007-06-15 02:39:01 +0200
+--- linux-2.6.22.10/arch/ia64/mm/fault.c 2007-07-09 13:17:43 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/ia64/mm/fault.c 2007-06-15 02:39:01 +0200
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
@@ -837,9 +795,8 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.22.9/arch/m32r/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/m32r/kernel/process.c
---- linux-2.6.22.9/arch/m32r/kernel/process.c 2007-05-02 19:24:21 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/m32r/kernel/process.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/m32r/kernel/process.c 2007-05-02 19:24:21 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/m32r/kernel/process.c 2007-06-15 02:37:03 +0200
@@ -211,8 +211,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.psw = M32R_PSW_BIE;
@@ -851,9 +808,8 @@
}
/*
-diff -NurpP --minimal linux-2.6.22.9/arch/m32r/kernel/traps.c linux-2.6.22.9-vs2.2.0.4/arch/m32r/kernel/traps.c
---- linux-2.6.22.9/arch/m32r/kernel/traps.c 2006-11-30 21:18:28 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/arch/m32r/kernel/traps.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/m32r/kernel/traps.c 2006-11-30 21:18:28 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/m32r/kernel/traps.c 2007-06-15 02:37:03 +0200
@@ -195,8 +195,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -866,9 +822,8 @@
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.22.9/arch/m68k/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/m68k/Kconfig
---- linux-2.6.22.9/arch/m68k/Kconfig 2007-07-09 13:17:47 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/m68k/Kconfig 2007-07-07 03:52:53 +0200
+--- linux-2.6.22.10/arch/m68k/Kconfig 2007-07-09 13:17:47 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/m68k/Kconfig 2007-07-07 03:52:53 +0200
@@ -678,6 +678,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -878,9 +833,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/m68k/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/m68k/kernel/process.c
---- linux-2.6.22.9/arch/m68k/kernel/process.c 2006-11-30 21:18:28 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/arch/m68k/kernel/process.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/m68k/kernel/process.c 2006-11-30 21:18:28 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/m68k/kernel/process.c 2007-06-15 02:37:03 +0200
@@ -159,7 +159,8 @@ int kernel_thread(int (*fn)(void *), voi
{
@@ -891,9 +845,8 @@
retval = __NR_clone;
__asm__ __volatile__
-diff -NurpP --minimal linux-2.6.22.9/arch/m68k/kernel/ptrace.c linux-2.6.22.9-vs2.2.0.4/arch/m68k/kernel/ptrace.c
---- linux-2.6.22.9/arch/m68k/kernel/ptrace.c 2007-07-09 13:17:47 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/m68k/kernel/ptrace.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/m68k/kernel/ptrace.c 2007-07-09 13:17:47 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/m68k/kernel/ptrace.c 2007-06-15 02:37:03 +0200
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/user.h>
@@ -911,9 +864,8 @@
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.22.9/arch/m68k/kernel/traps.c linux-2.6.22.9-vs2.2.0.4/arch/m68k/kernel/traps.c
---- linux-2.6.22.9/arch/m68k/kernel/traps.c 2007-05-02 19:24:21 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/m68k/kernel/traps.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/m68k/kernel/traps.c 2007-05-02 19:24:21 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/m68k/kernel/traps.c 2007-06-15 02:37:03 +0200
@@ -899,8 +899,8 @@ void show_registers(struct pt_regs *regs
printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
regs->d4, regs->d5, regs->a0, regs->a1);
@@ -925,9 +877,8 @@
addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format);
switch (regs->format) {
-diff -NurpP --minimal linux-2.6.22.9/arch/m68knommu/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/m68knommu/Kconfig
---- linux-2.6.22.9/arch/m68knommu/Kconfig 2007-07-09 13:17:47 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/m68knommu/Kconfig 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/m68knommu/Kconfig 2007-07-09 13:17:47 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/m68knommu/Kconfig 2007-06-15 02:37:03 +0200
@@ -670,6 +670,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
@@ -937,9 +888,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/m68knommu/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/m68knommu/kernel/process.c
---- linux-2.6.22.9/arch/m68knommu/kernel/process.c 2007-02-06 03:00:08 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/arch/m68knommu/kernel/process.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/m68knommu/kernel/process.c 2007-02-06 03:00:08 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/m68knommu/kernel/process.c 2007-06-15 02:37:03 +0200
@@ -122,7 +122,7 @@ void show_regs(struct pt_regs * regs)
int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
{
@@ -949,9 +899,8 @@
mm_segment_t fs;
fs = get_fs();
-diff -NurpP --minimal linux-2.6.22.9/arch/m68knommu/kernel/traps.c linux-2.6.22.9-vs2.2.0.4/arch/m68knommu/kernel/traps.c
---- linux-2.6.22.9/arch/m68knommu/kernel/traps.c 2007-05-02 19:24:21 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/m68knommu/kernel/traps.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/m68knommu/kernel/traps.c 2007-05-02 19:24:21 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/m68knommu/kernel/traps.c 2007-06-15 02:37:03 +0200
@@ -80,8 +80,9 @@ void die_if_kernel(char *str, struct pt_
printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
fp->d4, fp->d5, fp->a0, fp->a1);
@@ -964,9 +913,8 @@
show_stack(NULL, (unsigned long *)fp);
do_exit(SIGSEGV);
}
-diff -NurpP --minimal linux-2.6.22.9/arch/mips/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/mips/Kconfig
---- linux-2.6.22.9/arch/mips/Kconfig 2007-07-09 13:17:47 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/mips/Kconfig 2007-07-07 03:52:53 +0200
+--- linux-2.6.22.10/arch/mips/Kconfig 2007-07-09 13:17:47 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/mips/Kconfig 2007-07-07 03:52:53 +0200
@@ -1959,6 +1959,8 @@ source "arch/mips/oprofile/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -976,9 +924,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/mips/kernel/linux32.c linux-2.6.22.9-vs2.2.0.4/arch/mips/kernel/linux32.c
---- linux-2.6.22.9/arch/mips/kernel/linux32.c 2007-07-09 13:17:48 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/mips/kernel/linux32.c 2007-06-17 05:54:16 +0200
+--- linux-2.6.22.10/arch/mips/kernel/linux32.c 2007-07-09 13:17:48 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/mips/kernel/linux32.c 2007-06-17 05:54:16 +0200
@@ -229,7 +229,7 @@ sys32_gettimeofday(struct compat_timeval
{
if (tv) {
@@ -988,9 +935,8 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.22.9/arch/mips/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/mips/kernel/process.c
---- linux-2.6.22.9/arch/mips/kernel/process.c 2007-05-02 19:24:23 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/mips/kernel/process.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/mips/kernel/process.c 2007-05-02 19:24:23 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/mips/kernel/process.c 2007-06-15 02:37:03 +0200
@@ -236,7 +236,8 @@ long kernel_thread(int (*fn)(void *), vo
#endif
@@ -1001,9 +947,8 @@
}
/*
-diff -NurpP --minimal linux-2.6.22.9/arch/mips/kernel/ptrace.c linux-2.6.22.9-vs2.2.0.4/arch/mips/kernel/ptrace.c
---- linux-2.6.22.9/arch/mips/kernel/ptrace.c 2007-07-09 13:17:48 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/mips/kernel/ptrace.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/mips/kernel/ptrace.c 2007-07-09 13:17:48 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/mips/kernel/ptrace.c 2007-06-15 02:37:03 +0200
@@ -25,6 +25,7 @@
#include <linux/user.h>
#include <linux/security.h>
@@ -1022,9 +967,8 @@
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-2.6.22.9/arch/mips/kernel/scall32-o32.S linux-2.6.22.9-vs2.2.0.4/arch/mips/kernel/scall32-o32.S
---- linux-2.6.22.9/arch/mips/kernel/scall32-o32.S 2007-07-09 13:17:48 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/mips/kernel/scall32-o32.S 2007-06-17 05:54:16 +0200
+--- linux-2.6.22.10/arch/mips/kernel/scall32-o32.S 2007-07-09 13:17:48 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/mips/kernel/scall32-o32.S 2007-06-17 05:54:16 +0200
@@ -619,7 +619,7 @@ einval: li v0, -EINVAL
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
@@ -1034,9 +978,8 @@
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-2.6.22.9/arch/mips/kernel/scall64-64.S linux-2.6.22.9-vs2.2.0.4/arch/mips/kernel/scall64-64.S
---- linux-2.6.22.9/arch/mips/kernel/scall64-64.S 2007-07-09 13:17:48 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/mips/kernel/scall64-64.S 2007-06-17 05:54:16 +0200
+--- linux-2.6.22.10/arch/mips/kernel/scall64-64.S 2007-07-09 13:17:48 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/mips/kernel/scall64-64.S 2007-06-17 05:54:16 +0200
@@ -434,7 +434,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -1046,9 +989,8 @@
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.22.9/arch/mips/kernel/scall64-n32.S linux-2.6.22.9-vs2.2.0.4/arch/mips/kernel/scall64-n32.S
---- linux-2.6.22.9/arch/mips/kernel/scall64-n32.S 2007-07-09 13:17:48 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/mips/kernel/scall64-n32.S 2007-06-17 05:54:16 +0200
+--- linux-2.6.22.10/arch/mips/kernel/scall64-n32.S 2007-07-09 13:17:48 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/mips/kernel/scall64-n32.S 2007-06-17 05:54:16 +0200
@@ -360,7 +360,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -1058,9 +1000,8 @@
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.22.9/arch/mips/kernel/scall64-o32.S linux-2.6.22.9-vs2.2.0.4/arch/mips/kernel/scall64-o32.S
---- linux-2.6.22.9/arch/mips/kernel/scall64-o32.S 2007-07-09 13:17:48 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/mips/kernel/scall64-o32.S 2007-06-17 05:54:16 +0200
+--- linux-2.6.22.10/arch/mips/kernel/scall64-o32.S 2007-07-09 13:17:48 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/mips/kernel/scall64-o32.S 2007-06-17 05:54:16 +0200
@@ -482,7 +482,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -1070,9 +1011,8 @@
PTR sys32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.22.9/arch/mips/kernel/traps.c linux-2.6.22.9-vs2.2.0.4/arch/mips/kernel/traps.c
---- linux-2.6.22.9/arch/mips/kernel/traps.c 2007-07-09 13:17:48 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/mips/kernel/traps.c 2007-07-09 13:11:53 +0200
+--- linux-2.6.22.10/arch/mips/kernel/traps.c 2007-07-09 13:17:48 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/mips/kernel/traps.c 2007-07-09 13:11:53 +0200
@@ -302,8 +302,9 @@ void show_registers(struct pt_regs *regs
{
show_regs(regs);
@@ -1085,9 +1025,8 @@
show_stacktrace(current, regs);
show_code((unsigned int *) regs->cp0_epc);
printk("\n");
-diff -NurpP --minimal linux-2.6.22.9/arch/mips/mm/fault.c linux-2.6.22.9-vs2.2.0.4/arch/mips/mm/fault.c
---- linux-2.6.22.9/arch/mips/mm/fault.c 2007-07-09 13:17:48 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/mips/mm/fault.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/mips/mm/fault.c 2007-07-09 13:17:48 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/mips/mm/fault.c 2007-06-15 02:37:03 +0200
@@ -179,7 +179,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -1098,9 +1037,8 @@
if (user_mode(regs))
do_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.22.9/arch/parisc/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/parisc/Kconfig
---- linux-2.6.22.9/arch/parisc/Kconfig 2007-05-02 19:24:26 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/parisc/Kconfig 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/parisc/Kconfig 2007-05-02 19:24:26 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/parisc/Kconfig 2007-06-15 02:37:03 +0200
@@ -271,6 +271,8 @@ source "arch/parisc/oprofile/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -1110,9 +1048,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/parisc/kernel/entry.S linux-2.6.22.9-vs2.2.0.4/arch/parisc/kernel/entry.S
---- linux-2.6.22.9/arch/parisc/kernel/entry.S 2007-07-09 13:17:50 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/parisc/kernel/entry.S 2007-06-17 05:54:16 +0200
+--- linux-2.6.22.10/arch/parisc/kernel/entry.S 2007-07-09 13:17:50 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/parisc/kernel/entry.S 2007-06-17 05:54:16 +0200
@@ -761,6 +761,7 @@ END(fault_vector_11)
#define CLONE_VM 0x100 /* Must agree with <linux/sched.h> */
@@ -1121,9 +1058,8 @@
.import do_fork
ENTRY(__kernel_thread)
-diff -NurpP --minimal linux-2.6.22.9/arch/parisc/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/parisc/kernel/process.c
---- linux-2.6.22.9/arch/parisc/kernel/process.c 2007-07-09 13:17:50 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/parisc/kernel/process.c 2007-06-17 05:54:16 +0200
+--- linux-2.6.22.10/arch/parisc/kernel/process.c 2007-07-09 13:17:50 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/parisc/kernel/process.c 2007-06-17 05:54:16 +0200
@@ -173,7 +173,7 @@ pid_t kernel_thread(int (*fn)(void *), v
* kernel_thread can become a #define.
*/
@@ -1133,9 +1069,8 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.22.9/arch/parisc/kernel/sys_parisc32.c linux-2.6.22.9-vs2.2.0.4/arch/parisc/kernel/sys_parisc32.c
---- linux-2.6.22.9/arch/parisc/kernel/sys_parisc32.c 2007-07-09 13:17:50 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/parisc/kernel/sys_parisc32.c 2007-06-17 05:54:16 +0200
+--- linux-2.6.22.10/arch/parisc/kernel/sys_parisc32.c 2007-07-09 13:17:50 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/parisc/kernel/sys_parisc32.c 2007-06-17 05:54:16 +0200
@@ -204,11 +204,11 @@ static inline long get_ts32(struct times
asmlinkage int
sys32_gettimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)
@@ -1150,9 +1085,8 @@
if (put_compat_timeval(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.22.9/arch/parisc/kernel/syscall_table.S linux-2.6.22.9-vs2.2.0.4/arch/parisc/kernel/syscall_table.S
---- linux-2.6.22.9/arch/parisc/kernel/syscall_table.S 2007-07-09 13:17:50 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/parisc/kernel/syscall_table.S 2007-06-17 05:54:16 +0200
+--- linux-2.6.22.10/arch/parisc/kernel/syscall_table.S 2007-07-09 13:17:50 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/parisc/kernel/syscall_table.S 2007-06-17 05:54:16 +0200
@@ -363,7 +363,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -1162,9 +1096,8 @@
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-2.6.22.9/arch/parisc/kernel/traps.c linux-2.6.22.9-vs2.2.0.4/arch/parisc/kernel/traps.c
---- linux-2.6.22.9/arch/parisc/kernel/traps.c 2007-07-09 13:17:50 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/parisc/kernel/traps.c 2007-06-17 05:54:16 +0200
+--- linux-2.6.22.10/arch/parisc/kernel/traps.c 2007-07-09 13:17:50 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/parisc/kernel/traps.c 2007-06-17 05:54:16 +0200
@@ -218,8 +218,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
@@ -1188,9 +1121,8 @@
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-2.6.22.9/arch/parisc/mm/fault.c linux-2.6.22.9-vs2.2.0.4/arch/parisc/mm/fault.c
---- linux-2.6.22.9/arch/parisc/mm/fault.c 2007-05-02 19:24:26 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/parisc/mm/fault.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/parisc/mm/fault.c 2007-05-02 19:24:26 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/parisc/mm/fault.c 2007-06-15 02:37:03 +0200
@@ -209,8 +209,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
@@ -1213,9 +1145,8 @@
if (user_mode(regs))
do_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.22.9/arch/powerpc/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/powerpc/Kconfig
---- linux-2.6.22.9/arch/powerpc/Kconfig 2007-07-09 13:17:50 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/powerpc/Kconfig 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/powerpc/Kconfig 2007-07-09 13:17:50 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/powerpc/Kconfig 2007-06-15 02:37:03 +0200
@@ -906,6 +906,8 @@ endmenu
source "arch/powerpc/Kconfig.debug"
@@ -1225,9 +1156,8 @@
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.22.9/arch/powerpc/kernel/asm-offsets.c linux-2.6.22.9-vs2.2.0.4/arch/powerpc/kernel/asm-offsets.c
---- linux-2.6.22.9/arch/powerpc/kernel/asm-offsets.c 2007-07-09 13:17:51 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/powerpc/kernel/asm-offsets.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/powerpc/kernel/asm-offsets.c 2007-07-09 13:17:51 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/powerpc/kernel/asm-offsets.c 2007-06-15 02:37:03 +0200
@@ -250,6 +250,7 @@ int main(void)
DEFINE(CLONE_VM, CLONE_VM);
@@ -1236,9 +1166,8 @@
#ifndef CONFIG_PPC64
DEFINE(MM_PGD, offsetof(struct mm_struct, pgd));
-diff -NurpP --minimal linux-2.6.22.9/arch/powerpc/kernel/irq.c linux-2.6.22.9-vs2.2.0.4/arch/powerpc/kernel/irq.c
---- linux-2.6.22.9/arch/powerpc/kernel/irq.c 2007-07-09 13:17:51 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/powerpc/kernel/irq.c 2007-07-09 13:11:53 +0200
+--- linux-2.6.22.10/arch/powerpc/kernel/irq.c 2007-07-09 13:17:51 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/powerpc/kernel/irq.c 2007-07-09 13:11:53 +0200
@@ -53,6 +53,7 @@
#include <linux/mutex.h>
#include <linux/bootmem.h>
@@ -1247,9 +1176,8 @@
#include <asm/uaccess.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.22.9/arch/powerpc/kernel/misc_32.S linux-2.6.22.9-vs2.2.0.4/arch/powerpc/kernel/misc_32.S
---- linux-2.6.22.9/arch/powerpc/kernel/misc_32.S 2007-07-09 13:17:51 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/powerpc/kernel/misc_32.S 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/powerpc/kernel/misc_32.S 2007-07-09 13:17:51 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/powerpc/kernel/misc_32.S 2007-06-15 02:37:03 +0200
@@ -745,7 +745,7 @@ _GLOBAL(kernel_thread)
mr r30,r3 /* function */
mr r31,r4 /* argument */
@@ -1259,9 +1187,8 @@
li r4,0 /* new sp (unused) */
li r0,__NR_clone
sc
-diff -NurpP --minimal linux-2.6.22.9/arch/powerpc/kernel/misc_64.S linux-2.6.22.9-vs2.2.0.4/arch/powerpc/kernel/misc_64.S
---- linux-2.6.22.9/arch/powerpc/kernel/misc_64.S 2007-05-02 19:24:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/powerpc/kernel/misc_64.S 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/powerpc/kernel/misc_64.S 2007-05-02 19:24:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/powerpc/kernel/misc_64.S 2007-06-15 02:37:03 +0200
@@ -434,7 +434,7 @@ _GLOBAL(kernel_thread)
mr r29,r3
mr r30,r4
@@ -1271,9 +1198,8 @@
li r4,0 /* new sp (unused) */
li r0,__NR_clone
sc
-diff -NurpP --minimal linux-2.6.22.9/arch/powerpc/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/powerpc/kernel/process.c
---- linux-2.6.22.9/arch/powerpc/kernel/process.c 2007-09-30 15:54:33 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/powerpc/kernel/process.c 2007-10-01 15:25:34 +0200
+--- linux-2.6.22.10/arch/powerpc/kernel/process.c 2007-10-30 01:57:12 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/powerpc/kernel/process.c 2007-10-01 15:25:34 +0200
@@ -422,8 +422,9 @@ void show_regs(struct pt_regs * regs)
trap = TRAP(regs);
if (trap == 0x300 || trap == 0x600)
@@ -1286,9 +1212,8 @@
#ifdef CONFIG_SMP
printk(" CPU: %d", smp_processor_id());
-diff -NurpP --minimal linux-2.6.22.9/arch/powerpc/kernel/sys_ppc32.c linux-2.6.22.9-vs2.2.0.4/arch/powerpc/kernel/sys_ppc32.c
---- linux-2.6.22.9/arch/powerpc/kernel/sys_ppc32.c 2007-07-09 13:17:51 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/powerpc/kernel/sys_ppc32.c 2007-07-07 03:52:53 +0200
+--- linux-2.6.22.10/arch/powerpc/kernel/sys_ppc32.c 2007-07-09 13:17:51 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/powerpc/kernel/sys_ppc32.c 2007-07-07 03:52:53 +0200
@@ -205,7 +205,7 @@ asmlinkage long compat_sys_gettimeofday(
{
if (tv) {
@@ -1298,9 +1223,8 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.22.9/arch/powerpc/kernel/traps.c linux-2.6.22.9-vs2.2.0.4/arch/powerpc/kernel/traps.c
---- linux-2.6.22.9/arch/powerpc/kernel/traps.c 2007-07-09 13:17:51 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/powerpc/kernel/traps.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/powerpc/kernel/traps.c 2007-07-09 13:17:51 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/powerpc/kernel/traps.c 2007-06-15 02:37:03 +0200
@@ -878,8 +878,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
@@ -1313,9 +1237,8 @@
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-2.6.22.9/arch/powerpc/kernel/vdso.c linux-2.6.22.9-vs2.2.0.4/arch/powerpc/kernel/vdso.c
---- linux-2.6.22.9/arch/powerpc/kernel/vdso.c 2007-07-09 13:17:51 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/powerpc/kernel/vdso.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/powerpc/kernel/vdso.c 2007-07-09 13:17:51 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/powerpc/kernel/vdso.c 2007-06-15 02:37:03 +0200
@@ -21,6 +21,7 @@
#include <linux/elf.h>
#include <linux/security.h>
@@ -1324,9 +1247,8 @@
#include <asm/pgtable.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.22.9/arch/powerpc/mm/fault.c linux-2.6.22.9-vs2.2.0.4/arch/powerpc/mm/fault.c
---- linux-2.6.22.9/arch/powerpc/mm/fault.c 2007-07-09 13:17:51 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/powerpc/mm/fault.c 2007-07-07 03:52:53 +0200
+--- linux-2.6.22.10/arch/powerpc/mm/fault.c 2007-07-09 13:17:51 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/powerpc/mm/fault.c 2007-07-07 03:52:53 +0200
@@ -378,7 +378,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -1337,9 +1259,8 @@
if (user_mode(regs))
do_exit(SIGKILL);
return SIGKILL;
-diff -NurpP --minimal linux-2.6.22.9/arch/ppc/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/ppc/Kconfig
---- linux-2.6.22.9/arch/ppc/Kconfig 2007-05-02 19:24:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/ppc/Kconfig 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/ppc/Kconfig 2007-05-02 19:24:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/ppc/Kconfig 2007-06-15 02:37:03 +0200
@@ -1455,6 +1455,8 @@ source "arch/powerpc/oprofile/Kconfig"
source "arch/ppc/Kconfig.debug"
@@ -1349,9 +1270,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/ppc/kernel/asm-offsets.c linux-2.6.22.9-vs2.2.0.4/arch/ppc/kernel/asm-offsets.c
---- linux-2.6.22.9/arch/ppc/kernel/asm-offsets.c 2007-07-09 13:18:01 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/ppc/kernel/asm-offsets.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/ppc/kernel/asm-offsets.c 2007-07-09 13:18:01 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/ppc/kernel/asm-offsets.c 2007-06-15 02:37:03 +0200
@@ -120,6 +120,7 @@ main(void)
DEFINE(TRAP, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, trap));
DEFINE(CLONE_VM, CLONE_VM);
@@ -1360,9 +1280,8 @@
DEFINE(MM_PGD, offsetof(struct mm_struct, pgd));
/* About the CPU features table */
-diff -NurpP --minimal linux-2.6.22.9/arch/ppc/kernel/misc.S linux-2.6.22.9-vs2.2.0.4/arch/ppc/kernel/misc.S
---- linux-2.6.22.9/arch/ppc/kernel/misc.S 2006-11-30 21:18:32 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/arch/ppc/kernel/misc.S 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/ppc/kernel/misc.S 2006-11-30 21:18:32 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/ppc/kernel/misc.S 2007-06-15 02:37:03 +0200
@@ -848,7 +848,7 @@ _GLOBAL(kernel_thread)
mr r30,r3 /* function */
mr r31,r4 /* argument */
@@ -1372,9 +1291,8 @@
li r4,0 /* new sp (unused) */
li r0,__NR_clone
sc
-diff -NurpP --minimal linux-2.6.22.9/arch/ppc/kernel/traps.c linux-2.6.22.9-vs2.2.0.4/arch/ppc/kernel/traps.c
---- linux-2.6.22.9/arch/ppc/kernel/traps.c 2007-07-09 13:18:01 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/ppc/kernel/traps.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/ppc/kernel/traps.c 2007-07-09 13:18:01 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/ppc/kernel/traps.c 2007-06-15 02:37:03 +0200
@@ -696,8 +696,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
@@ -1387,9 +1305,8 @@
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-2.6.22.9/arch/ppc/mm/fault.c linux-2.6.22.9-vs2.2.0.4/arch/ppc/mm/fault.c
---- linux-2.6.22.9/arch/ppc/mm/fault.c 2006-11-30 21:18:32 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/arch/ppc/mm/fault.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/ppc/mm/fault.c 2006-11-30 21:18:32 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/ppc/mm/fault.c 2007-06-15 02:37:03 +0200
@@ -296,7 +296,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -1400,9 +1317,8 @@
if (user_mode(regs))
do_exit(SIGKILL);
return SIGKILL;
-diff -NurpP --minimal linux-2.6.22.9/arch/s390/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/s390/Kconfig
---- linux-2.6.22.9/arch/s390/Kconfig 2007-07-09 13:18:02 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/s390/Kconfig 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/s390/Kconfig 2007-07-09 13:18:02 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/s390/Kconfig 2007-06-15 02:37:03 +0200
@@ -551,6 +551,8 @@ endmenu
source "arch/s390/Kconfig.debug"
@@ -1412,9 +1328,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/s390/kernel/compat_linux.c linux-2.6.22.9-vs2.2.0.4/arch/s390/kernel/compat_linux.c
---- linux-2.6.22.9/arch/s390/kernel/compat_linux.c 2007-07-09 13:18:02 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/s390/kernel/compat_linux.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/s390/kernel/compat_linux.c 2007-07-09 13:18:02 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/s390/kernel/compat_linux.c 2007-06-15 02:37:03 +0200
@@ -567,7 +567,7 @@ asmlinkage long sys32_gettimeofday(struc
{
if (tv) {
@@ -1424,9 +1339,8 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.22.9/arch/s390/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/s390/kernel/process.c
---- linux-2.6.22.9/arch/s390/kernel/process.c 2007-07-09 13:18:02 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/s390/kernel/process.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/s390/kernel/process.c 2007-07-09 13:18:02 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/s390/kernel/process.c 2007-06-15 02:37:03 +0200
@@ -164,9 +164,9 @@ void show_regs(struct pt_regs *regs)
struct task_struct *tsk = current;
@@ -1449,9 +1363,8 @@
0, ®s, 0, NULL, NULL);
}
-diff -NurpP --minimal linux-2.6.22.9/arch/s390/kernel/ptrace.c linux-2.6.22.9-vs2.2.0.4/arch/s390/kernel/ptrace.c
---- linux-2.6.22.9/arch/s390/kernel/ptrace.c 2007-05-02 19:24:29 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/s390/kernel/ptrace.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/s390/kernel/ptrace.c 2007-05-02 19:24:29 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/s390/kernel/ptrace.c 2007-06-15 02:37:03 +0200
@@ -33,6 +33,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -1474,9 +1387,8 @@
put_task_struct(child);
out:
unlock_kernel();
-diff -NurpP --minimal linux-2.6.22.9/arch/s390/kernel/syscalls.S linux-2.6.22.9-vs2.2.0.4/arch/s390/kernel/syscalls.S
---- linux-2.6.22.9/arch/s390/kernel/syscalls.S 2007-07-09 13:18:02 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/s390/kernel/syscalls.S 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/s390/kernel/syscalls.S 2007-07-09 13:18:02 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/s390/kernel/syscalls.S 2007-06-15 02:37:03 +0200
@@ -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)
@@ -1486,9 +1398,8 @@
SYSCALL(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-2.6.22.9/arch/s390/mm/fault.c linux-2.6.22.9-vs2.2.0.4/arch/s390/mm/fault.c
---- linux-2.6.22.9/arch/s390/mm/fault.c 2007-07-09 13:18:02 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/s390/mm/fault.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/s390/mm/fault.c 2007-07-09 13:18:02 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/s390/mm/fault.c 2007-06-15 02:37:03 +0200
@@ -216,7 +216,8 @@ static int do_out_of_memory(struct pt_re
down_read(&mm->mmap_sem);
return 1;
@@ -1499,9 +1410,8 @@
if (regs->psw.mask & PSW_MASK_PSTATE)
do_exit(SIGKILL);
do_no_context(regs, error_code, address);
-diff -NurpP --minimal linux-2.6.22.9/arch/sh/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/sh/Kconfig
---- linux-2.6.22.9/arch/sh/Kconfig 2007-07-09 13:18:02 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sh/Kconfig 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sh/Kconfig 2007-07-09 13:18:02 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/sh/Kconfig 2007-06-15 02:37:03 +0200
@@ -723,6 +723,8 @@ source "arch/sh/oprofile/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -1511,9 +1421,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/sh/kernel/irq.c linux-2.6.22.9-vs2.2.0.4/arch/sh/kernel/irq.c
---- linux-2.6.22.9/arch/sh/kernel/irq.c 2007-07-09 13:18:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sh/kernel/irq.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sh/kernel/irq.c 2007-07-09 13:18:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/sh/kernel/irq.c 2007-06-15 02:37:03 +0200
@@ -12,6 +12,7 @@
#include <linux/kernel_stat.h>
#include <linux/seq_file.h>
@@ -1522,9 +1431,8 @@
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.22.9/arch/sh/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/sh/kernel/process.c
---- linux-2.6.22.9/arch/sh/kernel/process.c 2007-07-09 13:18:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sh/kernel/process.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sh/kernel/process.c 2007-07-09 13:18:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/sh/kernel/process.c 2007-06-15 02:37:03 +0200
@@ -118,7 +118,8 @@ void machine_power_off(void)
void show_regs(struct pt_regs * regs)
{
@@ -1544,9 +1452,8 @@
®s, 0, NULL, NULL);
}
-diff -NurpP --minimal linux-2.6.22.9/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.22.9-vs2.2.0.4/arch/sh/kernel/vsyscall/vsyscall.c
---- linux-2.6.22.9/arch/sh/kernel/vsyscall/vsyscall.c 2007-07-09 13:18:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sh/kernel/vsyscall/vsyscall.c 2007-06-15 02:39:24 +0200
+--- linux-2.6.22.10/arch/sh/kernel/vsyscall/vsyscall.c 2007-07-09 13:18:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/sh/kernel/vsyscall/vsyscall.c 2007-06-15 02:39:24 +0200
@@ -18,6 +18,7 @@
#include <linux/module.h>
#include <linux/elf.h>
@@ -1555,9 +1462,8 @@
/*
* Should the kernel map a VDSO page into processes and pass its
-diff -NurpP --minimal linux-2.6.22.9/arch/sh/mm/fault.c linux-2.6.22.9-vs2.2.0.4/arch/sh/mm/fault.c
---- linux-2.6.22.9/arch/sh/mm/fault.c 2007-07-09 13:18:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sh/mm/fault.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sh/mm/fault.c 2007-07-09 13:18:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/sh/mm/fault.c 2007-06-15 02:37:03 +0200
@@ -201,7 +201,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -1568,9 +1474,8 @@
if (user_mode(regs))
do_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.22.9/arch/sh64/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/sh64/kernel/process.c
---- linux-2.6.22.9/arch/sh64/kernel/process.c 2007-07-09 13:18:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sh64/kernel/process.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sh64/kernel/process.c 2007-07-09 13:18:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/sh64/kernel/process.c 2007-06-15 02:37:03 +0200
@@ -400,8 +400,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.pc = (unsigned long)kernel_thread_helper;
regs.sr = (1 << 30);
@@ -1582,9 +1487,8 @@
}
/*
-diff -NurpP --minimal linux-2.6.22.9/arch/sh64/mm/fault.c linux-2.6.22.9-vs2.2.0.4/arch/sh64/mm/fault.c
---- linux-2.6.22.9/arch/sh64/mm/fault.c 2007-07-09 13:18:04 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sh64/mm/fault.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sh64/mm/fault.c 2007-07-09 13:18:04 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/sh64/mm/fault.c 2007-06-15 02:37:03 +0200
@@ -81,7 +81,7 @@ static inline void print_vma(struct vm_a
static inline void print_task(struct task_struct *tsk)
@@ -1604,9 +1508,8 @@
if (user_mode(regs))
do_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.22.9/arch/sparc/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/sparc/Kconfig
---- linux-2.6.22.9/arch/sparc/Kconfig 2007-07-09 13:18:04 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sparc/Kconfig 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sparc/Kconfig 2007-07-09 13:18:04 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/sparc/Kconfig 2007-06-15 02:37:03 +0200
@@ -317,6 +317,8 @@ endmenu
source "arch/sparc/Kconfig.debug"
@@ -1616,9 +1519,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/sparc/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/sparc/kernel/process.c
---- linux-2.6.22.9/arch/sparc/kernel/process.c 2007-07-09 13:18:04 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sparc/kernel/process.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sparc/kernel/process.c 2007-07-09 13:18:04 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/sparc/kernel/process.c 2007-06-15 02:37:03 +0200
@@ -705,7 +705,8 @@ pid_t kernel_thread(int (*fn)(void *), v
/* Notreached by child. */
"1: mov %%o0, %0\n\t" :
@@ -1629,9 +1531,8 @@
"i" (__NR_exit), "r" (fn), "r" (arg) :
"g1", "g2", "g3", "o0", "o1", "memory", "cc");
return retval;
-diff -NurpP --minimal linux-2.6.22.9/arch/sparc/kernel/ptrace.c linux-2.6.22.9-vs2.2.0.4/arch/sparc/kernel/ptrace.c
---- linux-2.6.22.9/arch/sparc/kernel/ptrace.c 2007-02-06 03:00:18 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sparc/kernel/ptrace.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sparc/kernel/ptrace.c 2007-02-06 03:00:18 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/sparc/kernel/ptrace.c 2007-06-15 02:37:03 +0200
@@ -19,6 +19,7 @@
#include <linux/smp_lock.h>
#include <linux/security.h>
@@ -1651,9 +1552,8 @@
if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
|| (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
-diff -NurpP --minimal linux-2.6.22.9/arch/sparc/kernel/systbls.S linux-2.6.22.9-vs2.2.0.4/arch/sparc/kernel/systbls.S
---- linux-2.6.22.9/arch/sparc/kernel/systbls.S 2007-07-09 13:18:04 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sparc/kernel/systbls.S 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sparc/kernel/systbls.S 2007-07-09 13:18:04 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/sparc/kernel/systbls.S 2007-06-15 02:37:03 +0200
@@ -71,7 +71,7 @@ sys_call_table:
/*250*/ .long sparc_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
@@ -1663,9 +1563,8 @@
/*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-2.6.22.9/arch/sparc/kernel/traps.c linux-2.6.22.9-vs2.2.0.4/arch/sparc/kernel/traps.c
---- linux-2.6.22.9/arch/sparc/kernel/traps.c 2007-07-09 13:18:05 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sparc/kernel/traps.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sparc/kernel/traps.c 2007-07-09 13:18:05 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/sparc/kernel/traps.c 2007-06-15 02:37:03 +0200
@@ -99,7 +99,8 @@ void die_if_kernel(char *str, struct pt_
" /_| \\__/ |_\\\n"
" \\__U_/\n");
@@ -1676,9 +1575,8 @@
show_regs(regs);
__SAVE; __SAVE; __SAVE; __SAVE;
-diff -NurpP --minimal linux-2.6.22.9/arch/sparc/mm/fault.c linux-2.6.22.9-vs2.2.0.4/arch/sparc/mm/fault.c
---- linux-2.6.22.9/arch/sparc/mm/fault.c 2007-07-09 13:18:05 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sparc/mm/fault.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sparc/mm/fault.c 2007-07-09 13:18:05 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/sparc/mm/fault.c 2007-06-15 02:37:03 +0200
@@ -367,7 +367,8 @@ no_context:
*/
out_of_memory:
@@ -1689,9 +1587,8 @@
if (from_user)
do_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.22.9/arch/sparc64/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/sparc64/Kconfig
---- linux-2.6.22.9/arch/sparc64/Kconfig 2007-07-09 13:18:06 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sparc64/Kconfig 2007-06-17 05:54:16 +0200
+--- linux-2.6.22.10/arch/sparc64/Kconfig 2007-07-09 13:18:06 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/sparc64/Kconfig 2007-06-17 05:54:16 +0200
@@ -451,6 +451,8 @@ endmenu
source "arch/sparc64/Kconfig.debug"
@@ -1701,9 +1598,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/sparc64/kernel/binfmt_aout32.c linux-2.6.22.9-vs2.2.0.4/arch/sparc64/kernel/binfmt_aout32.c
---- linux-2.6.22.9/arch/sparc64/kernel/binfmt_aout32.c 2007-02-06 03:00:18 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sparc64/kernel/binfmt_aout32.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sparc64/kernel/binfmt_aout32.c 2007-02-06 03:00:18 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/sparc64/kernel/binfmt_aout32.c 2007-06-15 02:37:03 +0200
@@ -27,6 +27,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
@@ -1712,9 +1608,8 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.22.9/arch/sparc64/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/sparc64/kernel/process.c
---- linux-2.6.22.9/arch/sparc64/kernel/process.c 2007-07-09 13:18:06 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sparc64/kernel/process.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sparc64/kernel/process.c 2007-07-09 13:18:06 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/sparc64/kernel/process.c 2007-06-15 02:37:03 +0200
@@ -707,7 +707,8 @@ pid_t kernel_thread(int (*fn)(void *), v
/* Notreached by child. */
"1:" :
@@ -1725,9 +1620,8 @@
"i" (__NR_exit), "r" (fn), "r" (arg) :
"g1", "g2", "g3", "o0", "o1", "memory", "cc");
return retval;
-diff -NurpP --minimal linux-2.6.22.9/arch/sparc64/kernel/ptrace.c linux-2.6.22.9-vs2.2.0.4/arch/sparc64/kernel/ptrace.c
---- linux-2.6.22.9/arch/sparc64/kernel/ptrace.c 2007-02-06 03:00:18 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sparc64/kernel/ptrace.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sparc64/kernel/ptrace.c 2007-02-06 03:00:18 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/sparc64/kernel/ptrace.c 2007-06-15 02:37:03 +0200
@@ -22,6 +22,7 @@
#include <linux/seccomp.h>
#include <linux/audit.h>
@@ -1747,9 +1641,8 @@
if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
|| (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
-diff -NurpP --minimal linux-2.6.22.9/arch/sparc64/kernel/sys_sparc32.c linux-2.6.22.9-vs2.2.0.4/arch/sparc64/kernel/sys_sparc32.c
---- linux-2.6.22.9/arch/sparc64/kernel/sys_sparc32.c 2007-07-09 13:18:06 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sparc64/kernel/sys_sparc32.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sparc64/kernel/sys_sparc32.c 2007-07-09 13:18:06 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/sparc64/kernel/sys_sparc32.c 2007-06-15 02:37:03 +0200
@@ -729,7 +729,7 @@ asmlinkage long sys32_gettimeofday(struc
{
if (tv) {
@@ -1759,9 +1652,8 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.22.9/arch/sparc64/kernel/systbls.S linux-2.6.22.9-vs2.2.0.4/arch/sparc64/kernel/systbls.S
---- linux-2.6.22.9/arch/sparc64/kernel/systbls.S 2007-07-09 13:18:06 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sparc64/kernel/systbls.S 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sparc64/kernel/systbls.S 2007-07-09 13:18:06 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/sparc64/kernel/systbls.S 2007-06-15 02:37:03 +0200
@@ -72,7 +72,7 @@ sys_call_table32:
/*250*/ .word sys32_mremap, sys32_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
@@ -1780,9 +1672,8 @@
/*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-2.6.22.9/arch/sparc64/kernel/traps.c linux-2.6.22.9-vs2.2.0.4/arch/sparc64/kernel/traps.c
---- linux-2.6.22.9/arch/sparc64/kernel/traps.c 2007-09-05 03:37:48 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sparc64/kernel/traps.c 2007-09-05 03:05:52 +0200
+--- linux-2.6.22.10/arch/sparc64/kernel/traps.c 2007-10-30 01:57:12 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/sparc64/kernel/traps.c 2007-09-05 03:05:52 +0200
@@ -2225,7 +2225,8 @@ void die_if_kernel(char *str, struct pt_
" /_| \\__/ |_\\\n"
" \\__U_/\n");
@@ -1793,9 +1684,8 @@
notify_die(DIE_OOPS, str, regs, 0, 255, SIGSEGV);
__asm__ __volatile__("flushw");
__show_regs(regs);
-diff -NurpP --minimal linux-2.6.22.9/arch/sparc64/mm/fault.c linux-2.6.22.9-vs2.2.0.4/arch/sparc64/mm/fault.c
---- linux-2.6.22.9/arch/sparc64/mm/fault.c 2007-09-05 03:37:48 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sparc64/mm/fault.c 2007-09-05 03:05:52 +0200
+--- linux-2.6.22.10/arch/sparc64/mm/fault.c 2007-10-30 01:57:12 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/sparc64/mm/fault.c 2007-09-05 03:05:52 +0200
@@ -463,7 +463,8 @@ handle_kernel_fault:
out_of_memory:
insn = get_fault_insn(regs, insn);
@@ -1806,9 +1696,8 @@
if (!(regs->tstate & TSTATE_PRIV))
do_exit(SIGKILL);
goto handle_kernel_fault;
-diff -NurpP --minimal linux-2.6.22.9/arch/sparc64/solaris/fs.c linux-2.6.22.9-vs2.2.0.4/arch/sparc64/solaris/fs.c
---- linux-2.6.22.9/arch/sparc64/solaris/fs.c 2007-02-06 03:00:21 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/arch/sparc64/solaris/fs.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/sparc64/solaris/fs.c 2007-02-06 03:00:21 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/sparc64/solaris/fs.c 2007-06-15 02:37:03 +0200
@@ -368,7 +368,7 @@ static int report_statvfs(struct vfsmoun
int j = strlen (p);
@@ -1827,9 +1716,8 @@
if (mnt->mnt_flags & MNT_NOSUID) i |= 2;
if (!sysv_valid_dev(inode->i_sb->s_dev))
return -EOVERFLOW;
-diff -NurpP --minimal linux-2.6.22.9/arch/um/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/um/Kconfig
---- linux-2.6.22.9/arch/um/Kconfig 2007-07-09 13:18:07 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/um/Kconfig 2007-06-17 05:54:16 +0200
+--- linux-2.6.22.10/arch/um/Kconfig 2007-07-09 13:18:07 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/um/Kconfig 2007-06-17 05:54:16 +0200
@@ -316,6 +316,8 @@ source "drivers/connector/Kconfig"
source "fs/Kconfig"
@@ -1839,9 +1727,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/um/kernel/trap.c linux-2.6.22.9-vs2.2.0.4/arch/um/kernel/trap.c
---- linux-2.6.22.9/arch/um/kernel/trap.c 2007-07-09 13:18:07 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/um/kernel/trap.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/um/kernel/trap.c 2007-07-09 13:18:07 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/um/kernel/trap.c 2007-06-15 02:37:03 +0200
@@ -210,7 +210,8 @@ unsigned long segv(struct faultinfo fi,
current->thread.arch.faultinfo = fi;
force_sig_info(SIGBUS, &si, current);
@@ -1852,9 +1739,8 @@
do_exit(SIGKILL);
} else {
BUG_ON(err != -EFAULT);
-diff -NurpP --minimal linux-2.6.22.9/arch/v850/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/v850/Kconfig
---- linux-2.6.22.9/arch/v850/Kconfig 2007-07-09 13:18:08 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/v850/Kconfig 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/v850/Kconfig 2007-07-09 13:18:08 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/v850/Kconfig 2007-06-15 02:37:03 +0200
@@ -333,6 +333,8 @@ source "drivers/usb/Kconfig"
source "arch/v850/Kconfig.debug"
@@ -1864,9 +1750,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/v850/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/v850/kernel/process.c
---- linux-2.6.22.9/arch/v850/kernel/process.c 2007-07-09 13:18:08 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/v850/kernel/process.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/v850/kernel/process.c 2007-07-09 13:18:08 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/v850/kernel/process.c 2007-06-15 02:37:03 +0200
@@ -82,7 +82,7 @@ int kernel_thread (int (*fn)(void *), vo
/* Clone this thread. Note that we don't pass the clone syscall's
second argument -- it's ignored for calls from kernel mode (the
@@ -1876,9 +1761,8 @@
syscall = __NR_clone;
asm volatile ("trap " SYSCALL_SHORT_TRAP
: "=r" (ret), "=r" (syscall)
-diff -NurpP --minimal linux-2.6.22.9/arch/v850/kernel/ptrace.c linux-2.6.22.9-vs2.2.0.4/arch/v850/kernel/ptrace.c
---- linux-2.6.22.9/arch/v850/kernel/ptrace.c 2007-07-09 13:18:08 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/v850/kernel/ptrace.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/v850/kernel/ptrace.c 2007-07-09 13:18:08 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/v850/kernel/ptrace.c 2007-06-15 02:37:03 +0200
@@ -23,6 +23,7 @@
#include <linux/sched.h>
#include <linux/ptrace.h>
@@ -1897,9 +1781,8 @@
switch (request) {
unsigned long val, copied;
-diff -NurpP --minimal linux-2.6.22.9/arch/x86_64/Kconfig linux-2.6.22.9-vs2.2.0.4/arch/x86_64/Kconfig
---- linux-2.6.22.9/arch/x86_64/Kconfig 2007-07-09 13:18:08 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/x86_64/Kconfig 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/x86_64/Kconfig 2007-07-09 13:18:08 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/x86_64/Kconfig 2007-06-15 02:37:03 +0200
@@ -782,6 +782,8 @@ endmenu
source "arch/x86_64/Kconfig.debug"
@@ -1909,9 +1792,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.9/arch/x86_64/ia32/ia32_aout.c linux-2.6.22.9-vs2.2.0.4/arch/x86_64/ia32/ia32_aout.c
---- linux-2.6.22.9/arch/x86_64/ia32/ia32_aout.c 2007-02-06 03:00:21 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/arch/x86_64/ia32/ia32_aout.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/x86_64/ia32/ia32_aout.c 2007-02-06 03:00:21 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/x86_64/ia32/ia32_aout.c 2007-06-15 02:37:03 +0200
@@ -25,6 +25,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
@@ -1920,9 +1802,8 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.22.9/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.22.9-vs2.2.0.4/arch/x86_64/ia32/ia32_binfmt.c
---- linux-2.6.22.9/arch/x86_64/ia32/ia32_binfmt.c 2007-07-09 13:18:08 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/x86_64/ia32/ia32_binfmt.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/x86_64/ia32/ia32_binfmt.c 2007-07-09 13:18:08 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/x86_64/ia32/ia32_binfmt.c 2007-06-15 02:37:03 +0200
@@ -324,7 +324,8 @@ int ia32_setup_arg_pages(struct linux_bi
kmem_cache_free(vm_area_cachep, mpnt);
return ret;
@@ -1933,9 +1814,8 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.22.9/arch/x86_64/ia32/ia32entry.S linux-2.6.22.9-vs2.2.0.4/arch/x86_64/ia32/ia32entry.S
---- linux-2.6.22.9/arch/x86_64/ia32/ia32entry.S 2007-09-30 15:54:33 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/x86_64/ia32/ia32entry.S 2007-10-01 15:25:34 +0200
+--- linux-2.6.22.10/arch/x86_64/ia32/ia32entry.S 2007-10-30 01:57:12 +0100
++++ linux-2.6.22.10-vs2.2.0.5/arch/x86_64/ia32/ia32entry.S 2007-10-01 15:25:34 +0200
@@ -680,7 +680,7 @@ ia32_sys_call_table:
.quad sys_tgkill /* 270 */
.quad compat_sys_utimes
@@ -1945,9 +1825,8 @@
.quad sys_mbind
.quad compat_sys_get_mempolicy /* 275 */
.quad sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.22.9/arch/x86_64/ia32/sys_ia32.c linux-2.6.22.9-vs2.2.0.4/arch/x86_64/ia32/sys_ia32.c
---- linux-2.6.22.9/arch/x86_64/ia32/sys_ia32.c 2007-07-09 13:18:08 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/x86_64/ia32/sys_ia32.c 2007-07-07 03:52:53 +0200
+--- linux-2.6.22.10/arch/x86_64/ia32/sys_ia32.c 2007-07-09 13:18:08 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/x86_64/ia32/sys_ia32.c 2007-07-07 03:52:53 +0200
@@ -454,7 +454,7 @@ sys32_gettimeofday(struct compat_timeval
{
if (tv) {
@@ -1957,9 +1836,8 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.22.9/arch/x86_64/ia32/syscall32.c linux-2.6.22.9-vs2.2.0.4/arch/x86_64/ia32/syscall32.c
---- linux-2.6.22.9/arch/x86_64/ia32/syscall32.c 2007-07-09 13:18:08 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/x86_64/ia32/syscall32.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/x86_64/ia32/syscall32.c 2007-07-09 13:18:08 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/x86_64/ia32/syscall32.c 2007-06-15 02:37:03 +0200
@@ -10,6 +10,7 @@
#include <linux/init.h>
#include <linux/stringify.h>
@@ -1968,9 +1846,8 @@
#include <asm/proto.h>
#include <asm/tlbflush.h>
#include <asm/ia32_unistd.h>
-diff -NurpP --minimal linux-2.6.22.9/arch/x86_64/kernel/process.c linux-2.6.22.9-vs2.2.0.4/arch/x86_64/kernel/process.c
---- linux-2.6.22.9/arch/x86_64/kernel/process.c 2007-07-09 13:18:08 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/x86_64/kernel/process.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/arch/x86_64/kernel/process.c 2007-07-09 13:18:08 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/x86_64/kernel/process.c 2007-06-15 02:37:03 +0200
@@ -54,7 +54,8 @@
asmlinkage extern void ret_from_fork(void);
@@ -1992,9 +1869,8 @@
init_utsname()->release,
(int)strcspn(init_utsname()->version, " "),
init_utsname()->version);
-diff -NurpP --minimal linux-2.6.22.9/arch/x86_64/kernel/traps.c linux-2.6.22.9-vs2.2.0.4/arch/x86_64/kernel/traps.c
---- linux-2.6.22.9/arch/x86_64/kernel/traps.c 2007-07-09 13:18:08 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/x86_64/kernel/traps.c 2007-06-17 05:54:16 +0200
+--- linux-2.6.22.10/arch/x86_64/kernel/traps.c 2007-07-09 13:18:08 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/x86_64/kernel/traps.c 2007-06-17 05:54:16 +0200
@@ -413,8 +413,9 @@ void show_registers(struct pt_regs *regs
rsp = regs->rsp;
printk("CPU %d ", cpu);
@@ -2029,9 +1905,8 @@
regs->rip, regs->rsp, error_code);
force_sig(SIGSEGV, tsk);
-diff -NurpP --minimal linux-2.6.22.9/arch/x86_64/mm/fault.c linux-2.6.22.9-vs2.2.0.4/arch/x86_64/mm/fault.c
---- linux-2.6.22.9/arch/x86_64/mm/fault.c 2007-07-09 13:18:08 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/arch/x86_64/mm/fault.c 2007-06-17 05:54:16 +0200
+--- linux-2.6.22.10/arch/x86_64/mm/fault.c 2007-07-09 13:18:08 +0200
++++ linux-2.6.22.10-vs2.2.0.5/arch/x86_64/mm/fault.c 2007-06-17 05:54:16 +0200
@@ -497,10 +497,10 @@ bad_area_nosemaphore:
if (exception_trace && unhandled_signal(tsk, SIGSEGV)) {
@@ -2056,9 +1931,8 @@
if (error_code & 4)
do_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.22.9/drivers/block/Kconfig linux-2.6.22.9-vs2.2.0.4/drivers/block/Kconfig
---- linux-2.6.22.9/drivers/block/Kconfig 2007-07-09 13:18:16 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/drivers/block/Kconfig 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/drivers/block/Kconfig 2007-07-09 13:18:16 +0200
++++ linux-2.6.22.10-vs2.2.0.5/drivers/block/Kconfig 2007-06-15 02:37:03 +0200
@@ -311,6 +311,13 @@ config BLK_DEV_CRYPTOLOOP
instead, which can be configured to be on-disk compatible with the
cryptoloop device.
@@ -2073,18 +1947,16 @@
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-2.6.22.9/drivers/block/Makefile linux-2.6.22.9-vs2.2.0.4/drivers/block/Makefile
---- linux-2.6.22.9/drivers/block/Makefile 2007-02-06 03:00:26 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/drivers/block/Makefile 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/drivers/block/Makefile 2007-02-06 03:00:26 +0100
++++ linux-2.6.22.10-vs2.2.0.5/drivers/block/Makefile 2007-06-15 02:37:03 +0200
@@ -28,4 +28,5 @@ obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryp
obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_BLK_DEV_UB) += ub.o
+obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o
-diff -NurpP --minimal linux-2.6.22.9/drivers/block/loop.c linux-2.6.22.9-vs2.2.0.4/drivers/block/loop.c
---- linux-2.6.22.9/drivers/block/loop.c 2007-07-09 13:18:16 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/drivers/block/loop.c 2007-08-16 04:07:14 +0200
+--- linux-2.6.22.10/drivers/block/loop.c 2007-07-09 13:18:16 +0200
++++ linux-2.6.22.10-vs2.2.0.5/drivers/block/loop.c 2007-08-16 04:07:14 +0200
@@ -74,6 +74,7 @@
#include <linux/highmem.h>
#include <linux/gfp.h>
@@ -2138,9 +2010,8 @@
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-2.6.22.9/drivers/block/vroot.c linux-2.6.22.9-vs2.2.0.4/drivers/block/vroot.c
---- linux-2.6.22.9/drivers/block/vroot.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/drivers/block/vroot.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/drivers/block/vroot.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/drivers/block/vroot.c 2007-06-15 02:37:03 +0200
@@ -0,0 +1,281 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -2423,9 +2294,8 @@
+
+#endif
+
-diff -NurpP --minimal linux-2.6.22.9/drivers/char/sysrq.c linux-2.6.22.9-vs2.2.0.4/drivers/char/sysrq.c
---- linux-2.6.22.9/drivers/char/sysrq.c 2007-07-09 13:18:20 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/drivers/char/sysrq.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/drivers/char/sysrq.c 2007-07-09 13:18:20 +0200
++++ linux-2.6.22.10-vs2.2.0.5/drivers/char/sysrq.c 2007-06-15 02:37:03 +0200
@@ -36,6 +36,7 @@
#include <linux/kexec.h>
#include <linux/irq.h>
@@ -2478,9 +2348,8 @@
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-2.6.22.9/drivers/char/tty_io.c linux-2.6.22.9-vs2.2.0.4/drivers/char/tty_io.c
---- linux-2.6.22.9/drivers/char/tty_io.c 2007-07-09 13:18:20 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/drivers/char/tty_io.c 2007-07-17 03:02:15 +0200
+--- linux-2.6.22.10/drivers/char/tty_io.c 2007-07-09 13:18:20 +0200
++++ linux-2.6.22.10-vs2.2.0.5/drivers/char/tty_io.c 2007-07-17 03:02:15 +0200
@@ -103,6 +103,7 @@
#include <linux/selection.h>
@@ -2514,9 +2383,8 @@
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-2.6.22.9/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.22.9-vs2.2.0.4/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-2.6.22.9/drivers/infiniband/hw/ipath/ipath_user_pages.c 2007-02-06 03:00:37 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/drivers/infiniband/hw/ipath/ipath_user_pages.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/drivers/infiniband/hw/ipath/ipath_user_pages.c 2007-02-06 03:00:37 +0100
++++ linux-2.6.22.10-vs2.2.0.5/drivers/infiniband/hw/ipath/ipath_user_pages.c 2007-06-15 02:37:03 +0200
@@ -33,6 +33,7 @@
#include <linux/mm.h>
@@ -2562,9 +2430,8 @@
up_write(&work->mm->mmap_sem);
mmput(work->mm);
kfree(work);
-diff -NurpP --minimal linux-2.6.22.9/drivers/md/dm-ioctl.c linux-2.6.22.9-vs2.2.0.4/drivers/md/dm-ioctl.c
---- linux-2.6.22.9/drivers/md/dm-ioctl.c 2007-05-02 19:24:50 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/drivers/md/dm-ioctl.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/drivers/md/dm-ioctl.c 2007-05-02 19:24:50 +0200
++++ linux-2.6.22.10-vs2.2.0.5/drivers/md/dm-ioctl.c 2007-06-15 02:37:03 +0200
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/dm-ioctl.h>
@@ -2646,9 +2513,8 @@
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-2.6.22.9/drivers/md/dm.c linux-2.6.22.9-vs2.2.0.4/drivers/md/dm.c
---- linux-2.6.22.9/drivers/md/dm.c 2007-09-05 03:37:49 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/drivers/md/dm.c 2007-08-12 12:21:50 +0200
+--- linux-2.6.22.10/drivers/md/dm.c 2007-10-30 01:57:13 +0100
++++ linux-2.6.22.10-vs2.2.0.5/drivers/md/dm.c 2007-08-12 12:21:50 +0200
@@ -21,6 +21,7 @@
#include <linux/hdreg.h>
#include <linux/blktrace_api.h>
@@ -2722,9 +2588,8 @@
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
-diff -NurpP --minimal linux-2.6.22.9/drivers/md/dm.h linux-2.6.22.9-vs2.2.0.4/drivers/md/dm.h
---- linux-2.6.22.9/drivers/md/dm.h 2007-02-06 03:00:41 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/drivers/md/dm.h 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/drivers/md/dm.h 2007-02-06 03:00:41 +0100
++++ linux-2.6.22.10-vs2.2.0.5/drivers/md/dm.h 2007-06-15 02:37:03 +0200
@@ -91,6 +91,8 @@ void dm_put_target_type(struct target_ty
int dm_target_iterate(void (*iter_func)(struct target_type *tt,
void *param), void *param);
@@ -2734,9 +2599,8 @@
/*-----------------------------------------------------------------
* Useful inlines.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-2.6.22.9/fs/attr.c linux-2.6.22.9-vs2.2.0.4/fs/attr.c
---- linux-2.6.22.9/fs/attr.c 2007-07-09 13:19:22 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/attr.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/attr.c 2007-07-09 13:19:22 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/attr.c 2007-10-29 23:34:23 +0100
@@ -14,6 +14,9 @@
#include <linux/fcntl.h>
#include <linux/quotaops.h>
@@ -2747,7 +2611,7 @@
/* Taken over from the old code... */
-@@ -55,6 +58,30 @@ int inode_change_ok(struct inode *inode,
+@@ -55,6 +58,27 @@ int inode_change_ok(struct inode *inode,
if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
goto error;
}
@@ -2757,28 +2621,25 @@
+ goto fine;
+
+ if (IS_BARRIER(inode)) {
-+ vxwprintk(1, "xid=%d messing with the barrier.",
-+ vx_current_xid());
++ vxwprintk_task(1, "messing with the barrier.");
+ goto error;
+ }
+ switch (inode->i_sb->s_magic) {
+ case PROC_SUPER_MAGIC:
+ /* maybe allow that in the future? */
-+ vxwprintk(1, "xid=%d messing with the procfs.",
-+ vx_current_xid());
++ vxwprintk_task(1, "messing with the procfs.");
+ goto error;
+ case DEVPTS_SUPER_MAGIC:
+ /* devpts is xid tagged */
+ if (vx_check((xid_t)inode->i_tag, VS_IDENT))
+ goto fine;
-+ vxwprintk(1, "xid=%d messing with the devpts.",
-+ vx_current_xid());
++ vxwprintk_task(1, "messing with the devpts.");
+ goto error;
+ }
fine:
retval = 0;
error:
-@@ -78,6 +105,8 @@ int inode_setattr(struct inode * inode,
+@@ -78,6 +102,8 @@ int inode_setattr(struct inode * inode,
inode->i_uid = attr->ia_uid;
if (ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
@@ -2787,7 +2648,7 @@
if (ia_valid & ATTR_ATIME)
inode->i_atime = timespec_trunc(attr->ia_atime,
inode->i_sb->s_time_gran);
-@@ -152,7 +181,8 @@ int notify_change(struct dentry * dentry
+@@ -152,7 +178,8 @@ int notify_change(struct dentry * dentry
error = security_inode_setattr(dentry, attr);
if (!error) {
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
@@ -2797,9 +2658,8 @@
error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;
if (!error)
error = inode_setattr(inode, attr);
-diff -NurpP --minimal linux-2.6.22.9/fs/binfmt_aout.c linux-2.6.22.9-vs2.2.0.4/fs/binfmt_aout.c
---- linux-2.6.22.9/fs/binfmt_aout.c 2007-02-06 03:01:16 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/binfmt_aout.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/binfmt_aout.c 2007-02-06 03:01:16 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/binfmt_aout.c 2007-06-15 02:37:03 +0200
@@ -24,6 +24,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
@@ -2808,9 +2668,8 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.22.9/fs/binfmt_elf.c linux-2.6.22.9-vs2.2.0.4/fs/binfmt_elf.c
---- linux-2.6.22.9/fs/binfmt_elf.c 2007-07-09 13:19:22 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/binfmt_elf.c 2007-07-09 13:11:54 +0200
+--- linux-2.6.22.10/fs/binfmt_elf.c 2007-07-09 13:19:22 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/binfmt_elf.c 2007-07-09 13:11:54 +0200
@@ -39,6 +39,7 @@
#include <linux/random.h>
#include <linux/elf.h>
@@ -2819,9 +2678,8 @@
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-2.6.22.9/fs/binfmt_flat.c linux-2.6.22.9-vs2.2.0.4/fs/binfmt_flat.c
---- linux-2.6.22.9/fs/binfmt_flat.c 2007-07-09 13:19:22 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/binfmt_flat.c 2007-06-17 05:54:17 +0200
+--- linux-2.6.22.10/fs/binfmt_flat.c 2007-07-09 13:19:22 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/binfmt_flat.c 2007-06-17 05:54:17 +0200
@@ -36,6 +36,7 @@
#include <linux/init.h>
#include <linux/flat.h>
@@ -2830,9 +2688,8 @@
#include <asm/byteorder.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.22.9/fs/binfmt_som.c linux-2.6.22.9-vs2.2.0.4/fs/binfmt_som.c
---- linux-2.6.22.9/fs/binfmt_som.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/binfmt_som.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/binfmt_som.c 2006-11-30 21:19:19 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/binfmt_som.c 2007-06-15 02:37:03 +0200
@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/personality.h>
@@ -2841,9 +2698,8 @@
#include <asm/a.out.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.22.9/fs/dcache.c linux-2.6.22.9-vs2.2.0.4/fs/dcache.c
---- linux-2.6.22.9/fs/dcache.c 2007-07-09 13:19:23 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/dcache.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/dcache.c 2007-07-09 13:19:23 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/dcache.c 2007-06-15 02:37:03 +0200
@@ -31,6 +31,7 @@
#include <linux/seqlock.h>
#include <linux/swap.h>
@@ -2903,9 +2759,8 @@
found = dentry;
}
spin_unlock(&dentry->d_lock);
-diff -NurpP --minimal linux-2.6.22.9/fs/devpts/inode.c linux-2.6.22.9-vs2.2.0.4/fs/devpts/inode.c
---- linux-2.6.22.9/fs/devpts/inode.c 2007-07-09 13:19:23 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/devpts/inode.c 2007-06-15 02:41:30 +0200
+--- linux-2.6.22.10/fs/devpts/inode.c 2007-07-09 13:19:23 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/devpts/inode.c 2007-06-15 02:41:30 +0200
@@ -20,8 +20,22 @@
#include <linux/devpts_fs.h>
#include <linux/parser.h>
@@ -2978,9 +2833,8 @@
inode->i_private = tty;
dentry = get_node(number);
-diff -NurpP --minimal linux-2.6.22.9/fs/ecryptfs/inode.c linux-2.6.22.9-vs2.2.0.4/fs/ecryptfs/inode.c
---- linux-2.6.22.9/fs/ecryptfs/inode.c 2007-09-05 03:37:49 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ecryptfs/inode.c 2007-08-12 12:21:51 +0200
+--- linux-2.6.22.10/fs/ecryptfs/inode.c 2007-10-30 01:57:14 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/ecryptfs/inode.c 2007-08-12 12:21:51 +0200
@@ -423,7 +423,7 @@ static int ecryptfs_link(struct dentry *
dget(lower_new_dentry);
lower_dir_dentry = lock_parent(lower_new_dentry);
@@ -3035,9 +2889,8 @@
if (rc || !lower_dentry->d_inode)
goto out;
rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0);
-diff -NurpP --minimal linux-2.6.22.9/fs/exec.c linux-2.6.22.9-vs2.2.0.4/fs/exec.c
---- linux-2.6.22.9/fs/exec.c 2007-09-05 03:37:49 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/exec.c 2007-09-05 03:05:52 +0200
+--- linux-2.6.22.10/fs/exec.c 2007-10-30 01:57:14 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/exec.c 2007-09-05 03:05:52 +0200
@@ -51,6 +51,7 @@
#include <linux/cn_proc.h>
#include <linux/audit.h>
@@ -3065,9 +2918,8 @@
rc = snprintf(out_ptr, out_end - out_ptr,
"%lu", tv.tv_sec);
if (rc > out_end - out_ptr)
-diff -NurpP --minimal linux-2.6.22.9/fs/ext2/balloc.c linux-2.6.22.9-vs2.2.0.4/fs/ext2/balloc.c
---- linux-2.6.22.9/fs/ext2/balloc.c 2007-05-02 19:25:17 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext2/balloc.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ext2/balloc.c 2007-05-02 19:25:17 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext2/balloc.c 2007-06-15 02:37:03 +0200
@@ -16,6 +16,8 @@
#include <linux/sched.h>
#include <linux/buffer_head.h>
@@ -3121,9 +2973,8 @@
release_blocks(sb, es_alloc);
out_dquot:
DQUOT_FREE_BLOCK(inode, dq_alloc);
-diff -NurpP --minimal linux-2.6.22.9/fs/ext2/ext2.h linux-2.6.22.9-vs2.2.0.4/fs/ext2/ext2.h
---- linux-2.6.22.9/fs/ext2/ext2.h 2007-07-09 13:19:23 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext2/ext2.h 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ext2/ext2.h 2007-07-09 13:19:23 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext2/ext2.h 2007-06-15 02:37:03 +0200
@@ -167,6 +167,7 @@ extern const struct file_operations ext2
extern const struct address_space_operations ext2_aops;
extern const struct address_space_operations ext2_aops_xip;
@@ -3132,26 +2983,16 @@
/* namei.c */
extern const struct inode_operations ext2_dir_inode_operations;
-diff -NurpP --minimal linux-2.6.22.9/fs/ext2/file.c linux-2.6.22.9-vs2.2.0.4/fs/ext2/file.c
---- linux-2.6.22.9/fs/ext2/file.c 2007-05-02 19:25:17 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext2/file.c 2007-06-15 02:37:03 +0200
-@@ -54,6 +54,7 @@ const struct file_operations ext2_file_o
- .release = ext2_release_file,
- .fsync = ext2_sync_file,
- .sendfile = generic_file_sendfile,
-+ .sendpage = generic_file_sendpage,
- .splice_read = generic_file_splice_read,
- .splice_write = generic_file_splice_write,
- };
-@@ -85,4 +86,5 @@ const struct inode_operations ext2_file_
+--- linux-2.6.22.10/fs/ext2/file.c 2007-05-02 19:25:17 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext2/file.c 2007-10-29 23:24:21 +0100
+@@ -85,4 +85,5 @@ const struct inode_operations ext2_file_
#endif
.setattr = ext2_setattr,
.permission = ext2_permission,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.22.9/fs/ext2/ialloc.c linux-2.6.22.9-vs2.2.0.4/fs/ext2/ialloc.c
---- linux-2.6.22.9/fs/ext2/ialloc.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext2/ialloc.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ext2/ialloc.c 2006-11-30 21:19:19 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext2/ialloc.c 2007-06-15 02:37:03 +0200
@@ -17,6 +17,8 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
@@ -3207,9 +3048,8 @@
make_bad_inode(inode);
iput(inode);
return ERR_PTR(err);
-diff -NurpP --minimal linux-2.6.22.9/fs/ext2/inode.c linux-2.6.22.9-vs2.2.0.4/fs/ext2/inode.c
---- linux-2.6.22.9/fs/ext2/inode.c 2007-07-09 13:19:23 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext2/inode.c 2007-06-15 02:57:56 +0200
+--- linux-2.6.22.10/fs/ext2/inode.c 2007-07-09 13:19:23 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext2/inode.c 2007-06-15 02:57:56 +0200
@@ -31,6 +31,7 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -3342,9 +3182,8 @@
error = DQUOT_TRANSFER(inode, iattr) ? -EDQUOT : 0;
if (error)
return error;
-diff -NurpP --minimal linux-2.6.22.9/fs/ext2/ioctl.c linux-2.6.22.9-vs2.2.0.4/fs/ext2/ioctl.c
---- linux-2.6.22.9/fs/ext2/ioctl.c 2007-07-09 13:19:23 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext2/ioctl.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ext2/ioctl.c 2007-07-09 13:19:23 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext2/ioctl.c 2007-06-15 02:37:03 +0200
@@ -13,6 +13,7 @@
#include <linux/sched.h>
#include <linux/compat.h>
@@ -3384,9 +3223,8 @@
return -EROFS;
if (get_user(inode->i_generation, (int __user *) arg))
return -EFAULT;
-diff -NurpP --minimal linux-2.6.22.9/fs/ext2/namei.c linux-2.6.22.9-vs2.2.0.4/fs/ext2/namei.c
---- linux-2.6.22.9/fs/ext2/namei.c 2007-05-02 19:25:17 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext2/namei.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ext2/namei.c 2007-05-02 19:25:17 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext2/namei.c 2007-06-15 02:37:03 +0200
@@ -31,6 +31,7 @@
*/
@@ -3417,9 +3255,8 @@
.permission = ext2_permission,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.22.9/fs/ext2/super.c linux-2.6.22.9-vs2.2.0.4/fs/ext2/super.c
---- linux-2.6.22.9/fs/ext2/super.c 2007-07-09 13:19:23 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext2/super.c 2007-07-07 03:52:53 +0200
+--- linux-2.6.22.10/fs/ext2/super.c 2007-07-09 13:19:23 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext2/super.c 2007-07-07 03:52:53 +0200
@@ -321,7 +321,7 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
@@ -3484,9 +3321,8 @@
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-2.6.22.9/fs/ext2/symlink.c linux-2.6.22.9-vs2.2.0.4/fs/ext2/symlink.c
---- linux-2.6.22.9/fs/ext2/symlink.c 2007-05-02 19:25:17 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext2/symlink.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ext2/symlink.c 2007-05-02 19:25:17 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext2/symlink.c 2007-06-15 02:37:03 +0200
@@ -38,6 +38,7 @@ const struct inode_operations ext2_symli
.listxattr = ext2_listxattr,
.removexattr = generic_removexattr,
@@ -3501,9 +3337,8 @@
#endif
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.22.9/fs/ext2/xattr.c linux-2.6.22.9-vs2.2.0.4/fs/ext2/xattr.c
---- linux-2.6.22.9/fs/ext2/xattr.c 2007-02-06 03:01:18 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext2/xattr.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ext2/xattr.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext2/xattr.c 2007-06-15 02:37:03 +0200
@@ -60,6 +60,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
@@ -3541,9 +3376,8 @@
DQUOT_FREE_BLOCK(inode, 1);
}
EXT2_I(inode)->i_file_acl = 0;
-diff -NurpP --minimal linux-2.6.22.9/fs/ext3/balloc.c linux-2.6.22.9-vs2.2.0.4/fs/ext3/balloc.c
---- linux-2.6.22.9/fs/ext3/balloc.c 2007-05-02 19:25:17 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext3/balloc.c 2007-07-16 06:31:34 +0200
+--- linux-2.6.22.10/fs/ext3/balloc.c 2007-05-02 19:25:17 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext3/balloc.c 2007-07-16 06:31:34 +0200
@@ -19,6 +19,8 @@
#include <linux/ext3_jbd.h>
#include <linux/quotaops.h>
@@ -3650,27 +3484,17 @@
if (fatal) {
*errp = fatal;
ext3_std_error(sb, fatal);
-diff -NurpP --minimal linux-2.6.22.9/fs/ext3/file.c linux-2.6.22.9-vs2.2.0.4/fs/ext3/file.c
---- linux-2.6.22.9/fs/ext3/file.c 2007-05-02 19:25:17 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext3/file.c 2007-06-15 02:37:03 +0200
-@@ -121,6 +121,7 @@ const struct file_operations ext3_file_o
- .release = ext3_release_file,
- .fsync = ext3_sync_file,
- .sendfile = generic_file_sendfile,
-+ .sendpage = generic_file_sendpage,
- .splice_read = generic_file_splice_read,
- .splice_write = generic_file_splice_write,
- };
-@@ -135,5 +136,6 @@ const struct inode_operations ext3_file_
+--- linux-2.6.22.10/fs/ext3/file.c 2007-05-02 19:25:17 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext3/file.c 2007-10-29 23:24:21 +0100
+@@ -135,5 +135,6 @@ const struct inode_operations ext3_file_
.removexattr = generic_removexattr,
#endif
.permission = ext3_permission,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.22.9/fs/ext3/ialloc.c linux-2.6.22.9-vs2.2.0.4/fs/ext3/ialloc.c
---- linux-2.6.22.9/fs/ext3/ialloc.c 2006-11-30 21:19:19 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext3/ialloc.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ext3/ialloc.c 2006-11-30 21:19:19 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext3/ialloc.c 2007-06-15 02:37:03 +0200
@@ -23,6 +23,8 @@
#include <linux/buffer_head.h>
#include <linux/random.h>
@@ -3728,9 +3552,8 @@
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
iput(inode);
-diff -NurpP --minimal linux-2.6.22.9/fs/ext3/inode.c linux-2.6.22.9-vs2.2.0.4/fs/ext3/inode.c
---- linux-2.6.22.9/fs/ext3/inode.c 2007-07-09 13:19:23 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext3/inode.c 2007-07-07 03:52:53 +0200
+--- linux-2.6.22.10/fs/ext3/inode.c 2007-07-09 13:19:23 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext3/inode.c 2007-07-07 03:52:53 +0200
@@ -36,6 +36,7 @@
#include <linux/mpage.h>
#include <linux/uio.h>
@@ -3916,9 +3739,8 @@
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-2.6.22.9/fs/ext3/ioctl.c linux-2.6.22.9-vs2.2.0.4/fs/ext3/ioctl.c
---- linux-2.6.22.9/fs/ext3/ioctl.c 2007-07-09 13:19:23 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext3/ioctl.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ext3/ioctl.c 2007-07-09 13:19:23 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext3/ioctl.c 2007-06-15 02:37:03 +0200
@@ -8,6 +8,7 @@
*/
@@ -4035,9 +3857,8 @@
default:
return -ENOTTY;
-diff -NurpP --minimal linux-2.6.22.9/fs/ext3/namei.c linux-2.6.22.9-vs2.2.0.4/fs/ext3/namei.c
---- linux-2.6.22.9/fs/ext3/namei.c 2007-09-30 15:54:34 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext3/namei.c 2007-10-01 15:25:35 +0200
+--- linux-2.6.22.10/fs/ext3/namei.c 2007-10-30 01:57:14 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext3/namei.c 2007-10-01 15:25:35 +0200
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -4068,9 +3889,8 @@
.permission = ext3_permission,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.22.9/fs/ext3/super.c linux-2.6.22.9-vs2.2.0.4/fs/ext3/super.c
---- linux-2.6.22.9/fs/ext3/super.c 2007-07-09 13:19:23 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext3/super.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ext3/super.c 2007-07-09 13:19:23 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext3/super.c 2007-06-15 02:37:03 +0200
@@ -674,7 +674,7 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
@@ -4135,9 +3955,8 @@
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-2.6.22.9/fs/ext3/symlink.c linux-2.6.22.9-vs2.2.0.4/fs/ext3/symlink.c
---- linux-2.6.22.9/fs/ext3/symlink.c 2007-05-02 19:25:17 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext3/symlink.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ext3/symlink.c 2007-05-02 19:25:17 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext3/symlink.c 2007-06-15 02:37:03 +0200
@@ -40,6 +40,7 @@ const struct inode_operations ext3_symli
.listxattr = ext3_listxattr,
.removexattr = generic_removexattr,
@@ -4152,9 +3971,8 @@
#endif
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.22.9/fs/ext3/xattr.c linux-2.6.22.9-vs2.2.0.4/fs/ext3/xattr.c
---- linux-2.6.22.9/fs/ext3/xattr.c 2007-05-02 19:25:17 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext3/xattr.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ext3/xattr.c 2007-05-02 19:25:17 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext3/xattr.c 2007-06-15 02:37:03 +0200
@@ -58,6 +58,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
@@ -4196,9 +4014,8 @@
goto cleanup;
bad_block:
-diff -NurpP --minimal linux-2.6.22.9/fs/ext4/balloc.c linux-2.6.22.9-vs2.2.0.4/fs/ext4/balloc.c
---- linux-2.6.22.9/fs/ext4/balloc.c 2007-07-09 13:19:23 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext4/balloc.c 2007-07-16 06:31:34 +0200
+--- linux-2.6.22.10/fs/ext4/balloc.c 2007-07-09 13:19:23 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext4/balloc.c 2007-07-16 06:31:34 +0200
@@ -19,6 +19,8 @@
#include <linux/ext4_jbd2.h>
#include <linux/quotaops.h>
@@ -4304,27 +4121,17 @@
if (fatal) {
*errp = fatal;
ext4_std_error(sb, fatal);
-diff -NurpP --minimal linux-2.6.22.9/fs/ext4/file.c linux-2.6.22.9-vs2.2.0.4/fs/ext4/file.c
---- linux-2.6.22.9/fs/ext4/file.c 2007-05-02 19:25:17 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext4/file.c 2007-06-15 02:37:03 +0200
-@@ -121,6 +121,7 @@ const struct file_operations ext4_file_o
- .release = ext4_release_file,
- .fsync = ext4_sync_file,
- .sendfile = generic_file_sendfile,
-+ .sendpage = generic_file_sendpage,
- .splice_read = generic_file_splice_read,
- .splice_write = generic_file_splice_write,
- };
-@@ -135,5 +136,6 @@ const struct inode_operations ext4_file_
+--- linux-2.6.22.10/fs/ext4/file.c 2007-05-02 19:25:17 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext4/file.c 2007-10-29 23:24:21 +0100
+@@ -135,5 +135,6 @@ const struct inode_operations ext4_file_
.removexattr = generic_removexattr,
#endif
.permission = ext4_permission,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-2.6.22.9/fs/ext4/ialloc.c linux-2.6.22.9-vs2.2.0.4/fs/ext4/ialloc.c
---- linux-2.6.22.9/fs/ext4/ialloc.c 2006-11-30 21:19:20 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext4/ialloc.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ext4/ialloc.c 2006-11-30 21:19:20 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext4/ialloc.c 2007-06-15 02:37:03 +0200
@@ -24,6 +24,8 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -4382,9 +4189,8 @@
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
iput(inode);
-diff -NurpP --minimal linux-2.6.22.9/fs/ext4/inode.c linux-2.6.22.9-vs2.2.0.4/fs/ext4/inode.c
---- linux-2.6.22.9/fs/ext4/inode.c 2007-07-09 13:19:23 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext4/inode.c 2007-07-07 03:52:53 +0200
+--- linux-2.6.22.10/fs/ext4/inode.c 2007-07-09 13:19:23 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext4/inode.c 2007-07-07 03:52:53 +0200
@@ -36,6 +36,7 @@
#include <linux/mpage.h>
#include <linux/uio.h>
@@ -4569,9 +4375,8 @@
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-2.6.22.9/fs/ext4/ioctl.c linux-2.6.22.9-vs2.2.0.4/fs/ext4/ioctl.c
---- linux-2.6.22.9/fs/ext4/ioctl.c 2007-02-06 03:01:18 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext4/ioctl.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ext4/ioctl.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext4/ioctl.c 2007-06-15 02:37:03 +0200
@@ -8,6 +8,7 @@
*/
@@ -4689,9 +4494,8 @@
default:
return -ENOTTY;
}
-diff -NurpP --minimal linux-2.6.22.9/fs/ext4/namei.c linux-2.6.22.9-vs2.2.0.4/fs/ext4/namei.c
---- linux-2.6.22.9/fs/ext4/namei.c 2007-09-30 15:54:34 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext4/namei.c 2007-10-01 15:25:35 +0200
+--- linux-2.6.22.10/fs/ext4/namei.c 2007-10-30 01:57:14 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext4/namei.c 2007-10-01 15:25:35 +0200
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -4722,9 +4526,8 @@
.permission = ext4_permission,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-2.6.22.9/fs/ext4/super.c linux-2.6.22.9-vs2.2.0.4/fs/ext4/super.c
---- linux-2.6.22.9/fs/ext4/super.c 2007-07-09 13:19:23 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext4/super.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ext4/super.c 2007-07-09 13:19:23 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext4/super.c 2007-06-15 02:37:03 +0200
@@ -725,7 +725,7 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
@@ -4789,9 +4592,8 @@
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT4_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-2.6.22.9/fs/ext4/symlink.c linux-2.6.22.9-vs2.2.0.4/fs/ext4/symlink.c
---- linux-2.6.22.9/fs/ext4/symlink.c 2007-05-02 19:25:17 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext4/symlink.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ext4/symlink.c 2007-05-02 19:25:17 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext4/symlink.c 2007-06-15 02:37:03 +0200
@@ -40,6 +40,7 @@ const struct inode_operations ext4_symli
.listxattr = ext4_listxattr,
.removexattr = generic_removexattr,
@@ -4806,9 +4608,8 @@
#endif
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-2.6.22.9/fs/ext4/xattr.c linux-2.6.22.9-vs2.2.0.4/fs/ext4/xattr.c
---- linux-2.6.22.9/fs/ext4/xattr.c 2007-05-02 19:25:17 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ext4/xattr.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ext4/xattr.c 2007-05-02 19:25:17 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ext4/xattr.c 2007-06-15 02:37:03 +0200
@@ -58,6 +58,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
@@ -4850,9 +4651,8 @@
goto cleanup;
bad_block:
-diff -NurpP --minimal linux-2.6.22.9/fs/fcntl.c linux-2.6.22.9-vs2.2.0.4/fs/fcntl.c
---- linux-2.6.22.9/fs/fcntl.c 2007-02-06 03:01:18 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/fcntl.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/fcntl.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/fcntl.c 2007-06-15 02:37:03 +0200
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/signal.h>
@@ -4888,9 +4688,8 @@
err = newfd;
out:
return err;
-diff -NurpP --minimal linux-2.6.22.9/fs/file_table.c linux-2.6.22.9-vs2.2.0.4/fs/file_table.c
---- linux-2.6.22.9/fs/file_table.c 2007-07-09 13:19:23 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/file_table.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/file_table.c 2007-07-09 13:19:23 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/file_table.c 2007-06-15 02:37:03 +0200
@@ -20,6 +20,8 @@
#include <linux/fsnotify.h>
#include <linux/sysctl.h>
@@ -4927,9 +4726,8 @@
file_kill(file);
file_free(file);
}
-diff -NurpP --minimal linux-2.6.22.9/fs/hfsplus/ioctl.c linux-2.6.22.9-vs2.2.0.4/fs/hfsplus/ioctl.c
---- linux-2.6.22.9/fs/hfsplus/ioctl.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/hfsplus/ioctl.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/hfsplus/ioctl.c 2006-11-30 21:19:25 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/hfsplus/ioctl.c 2007-06-15 02:37:03 +0200
@@ -16,6 +16,7 @@
#include <linux/fs.h>
#include <linux/sched.h>
@@ -4948,9 +4746,8 @@
return -EROFS;
if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
-diff -NurpP --minimal linux-2.6.22.9/fs/inode.c linux-2.6.22.9-vs2.2.0.4/fs/inode.c
---- linux-2.6.22.9/fs/inode.c 2007-07-09 13:19:24 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/inode.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/inode.c 2007-07-09 13:19:24 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/inode.c 2007-06-15 02:37:03 +0200
@@ -115,6 +115,9 @@ static struct inode *alloc_inode(struct
struct address_space * const mapping = &inode->i_data;
@@ -4970,9 +4767,8 @@
/**
* clear_inode - clear an inode
* @inode: inode to clear
-diff -NurpP --minimal linux-2.6.22.9/fs/ioctl.c linux-2.6.22.9-vs2.2.0.4/fs/ioctl.c
---- linux-2.6.22.9/fs/ioctl.c 2007-07-09 13:19:24 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ioctl.c 2007-06-15 03:12:40 +0200
+--- linux-2.6.22.10/fs/ioctl.c 2007-07-09 13:19:24 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ioctl.c 2007-06-15 03:12:40 +0200
@@ -13,10 +13,19 @@
#include <linux/security.h>
#include <linux/module.h>
@@ -5042,9 +4838,8 @@
default:
if (S_ISREG(filp->f_path.dentry->d_inode->i_mode))
error = file_ioctl(filp, cmd, arg);
-diff -NurpP --minimal linux-2.6.22.9/fs/ioprio.c linux-2.6.22.9-vs2.2.0.4/fs/ioprio.c
---- linux-2.6.22.9/fs/ioprio.c 2007-05-02 19:25:18 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ioprio.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ioprio.c 2007-05-02 19:25:18 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ioprio.c 2007-06-15 02:37:03 +0200
@@ -25,6 +25,7 @@
#include <linux/capability.h>
#include <linux/syscalls.h>
@@ -5089,9 +4884,8 @@
if (!user)
break;
-diff -NurpP --minimal linux-2.6.22.9/fs/jfs/acl.c linux-2.6.22.9-vs2.2.0.4/fs/jfs/acl.c
---- linux-2.6.22.9/fs/jfs/acl.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/jfs/acl.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/jfs/acl.c 2006-11-30 21:19:25 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/jfs/acl.c 2007-06-15 02:37:03 +0200
@@ -232,7 +232,8 @@ int jfs_setattr(struct dentry *dentry, s
return rc;
@@ -5102,9 +4896,8 @@
if (DQUOT_TRANSFER(inode, iattr))
return -EDQUOT;
}
-diff -NurpP --minimal linux-2.6.22.9/fs/jfs/file.c linux-2.6.22.9-vs2.2.0.4/fs/jfs/file.c
---- linux-2.6.22.9/fs/jfs/file.c 2007-05-02 19:25:18 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/jfs/file.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/jfs/file.c 2007-05-02 19:25:18 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/jfs/file.c 2007-10-29 23:24:21 +0100
@@ -98,6 +98,7 @@ const struct inode_operations jfs_file_i
.setattr = jfs_setattr,
.permission = jfs_permission,
@@ -5113,17 +4906,8 @@
};
const struct file_operations jfs_file_operations = {
-@@ -109,6 +110,7 @@ const struct file_operations jfs_file_op
- .aio_write = generic_file_aio_write,
- .mmap = generic_file_mmap,
- .sendfile = generic_file_sendfile,
-+ .sendpage = generic_file_sendpage,
- .splice_read = generic_file_splice_read,
- .splice_write = generic_file_splice_write,
- .fsync = jfs_fsync,
-diff -NurpP --minimal linux-2.6.22.9/fs/jfs/inode.c linux-2.6.22.9-vs2.2.0.4/fs/jfs/inode.c
---- linux-2.6.22.9/fs/jfs/inode.c 2007-07-09 13:19:26 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/jfs/inode.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/jfs/inode.c 2007-07-09 13:19:26 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/jfs/inode.c 2007-06-15 02:37:03 +0200
@@ -22,6 +22,7 @@
#include <linux/buffer_head.h>
#include <linux/pagemap.h>
@@ -5140,9 +4924,8 @@
}
clear_inode(inode);
-diff -NurpP --minimal linux-2.6.22.9/fs/jfs/ioctl.c linux-2.6.22.9-vs2.2.0.4/fs/jfs/ioctl.c
---- linux-2.6.22.9/fs/jfs/ioctl.c 2007-07-09 13:19:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/jfs/ioctl.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/jfs/ioctl.c 2007-07-09 13:19:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/jfs/ioctl.c 2007-06-15 02:37:03 +0200
@@ -10,6 +10,7 @@
#include <linux/capability.h>
#include <linux/time.h>
@@ -5172,9 +4955,8 @@
if (!capable(CAP_LINUX_IMMUTABLE))
return -EPERM;
}
-diff -NurpP --minimal linux-2.6.22.9/fs/jfs/jfs_dinode.h linux-2.6.22.9-vs2.2.0.4/fs/jfs/jfs_dinode.h
---- linux-2.6.22.9/fs/jfs/jfs_dinode.h 2006-11-30 21:19:25 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/jfs/jfs_dinode.h 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/jfs/jfs_dinode.h 2006-11-30 21:19:25 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/jfs/jfs_dinode.h 2007-06-15 02:37:03 +0200
@@ -162,9 +162,12 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
#define JFS_IMMUTABLE_FL 0x02000000 /* Immutable file */
@@ -5190,9 +4972,8 @@
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
#define JFS_IOC_GETFLAGS _IOR('f', 1, long)
-diff -NurpP --minimal linux-2.6.22.9/fs/jfs/jfs_dtree.c linux-2.6.22.9-vs2.2.0.4/fs/jfs/jfs_dtree.c
---- linux-2.6.22.9/fs/jfs/jfs_dtree.c 2007-02-06 03:01:24 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/jfs/jfs_dtree.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/jfs/jfs_dtree.c 2007-02-06 03:01:24 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/jfs/jfs_dtree.c 2007-06-15 02:37:03 +0200
@@ -102,6 +102,7 @@
#include <linux/fs.h>
@@ -5304,9 +5085,8 @@
/* Free quota allocation */
DQUOT_FREE_BLOCK(ip, xlen);
-diff -NurpP --minimal linux-2.6.22.9/fs/jfs/jfs_extent.c linux-2.6.22.9-vs2.2.0.4/fs/jfs/jfs_extent.c
---- linux-2.6.22.9/fs/jfs/jfs_extent.c 2006-11-30 21:19:25 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/jfs/jfs_extent.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/jfs/jfs_extent.c 2006-11-30 21:19:25 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/jfs/jfs_extent.c 2007-06-15 02:37:03 +0200
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -5368,9 +5148,8 @@
DQUOT_FREE_BLOCK(ip, nxlen);
goto exit;
}
-diff -NurpP --minimal linux-2.6.22.9/fs/jfs/jfs_filsys.h linux-2.6.22.9-vs2.2.0.4/fs/jfs/jfs_filsys.h
---- linux-2.6.22.9/fs/jfs/jfs_filsys.h 2007-02-06 03:01:24 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/jfs/jfs_filsys.h 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/jfs/jfs_filsys.h 2007-02-06 03:01:24 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/jfs/jfs_filsys.h 2007-06-15 02:37:03 +0200
@@ -264,6 +264,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
@@ -5379,9 +5158,8 @@
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-2.6.22.9/fs/jfs/jfs_imap.c linux-2.6.22.9-vs2.2.0.4/fs/jfs/jfs_imap.c
---- linux-2.6.22.9/fs/jfs/jfs_imap.c 2007-07-09 13:19:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/jfs/jfs_imap.c 2007-06-15 03:01:50 +0200
+--- linux-2.6.22.10/fs/jfs/jfs_imap.c 2007-07-09 13:19:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/jfs/jfs_imap.c 2007-06-15 03:01:50 +0200
@@ -45,6 +45,7 @@
#include <linux/buffer_head.h>
#include <linux/pagemap.h>
@@ -5441,9 +5219,8 @@
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-2.6.22.9/fs/jfs/jfs_inode.c linux-2.6.22.9-vs2.2.0.4/fs/jfs/jfs_inode.c
---- linux-2.6.22.9/fs/jfs/jfs_inode.c 2007-07-09 13:19:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/jfs/jfs_inode.c 2007-07-19 08:09:20 +0200
+--- linux-2.6.22.10/fs/jfs/jfs_inode.c 2007-07-09 13:19:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/jfs/jfs_inode.c 2007-07-19 08:09:20 +0200
@@ -18,6 +18,8 @@
#include <linux/fs.h>
@@ -5523,9 +5300,8 @@
DQUOT_DROP(inode);
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
-diff -NurpP --minimal linux-2.6.22.9/fs/jfs/jfs_inode.h linux-2.6.22.9-vs2.2.0.4/fs/jfs/jfs_inode.h
---- linux-2.6.22.9/fs/jfs/jfs_inode.h 2007-07-09 13:19:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/jfs/jfs_inode.h 2007-06-15 03:02:28 +0200
+--- linux-2.6.22.10/fs/jfs/jfs_inode.h 2007-07-09 13:19:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/jfs/jfs_inode.h 2007-06-15 03:02:28 +0200
@@ -33,6 +33,7 @@ extern void jfs_free_zero_link(struct in
extern struct dentry *jfs_get_parent(struct dentry *dentry);
extern void jfs_get_inode_flags(struct jfs_inode_info *);
@@ -5534,9 +5310,8 @@
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern const struct address_space_operations jfs_aops;
-diff -NurpP --minimal linux-2.6.22.9/fs/jfs/jfs_xtree.c linux-2.6.22.9-vs2.2.0.4/fs/jfs/jfs_xtree.c
---- linux-2.6.22.9/fs/jfs/jfs_xtree.c 2007-05-02 19:25:18 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/jfs/jfs_xtree.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/jfs/jfs_xtree.c 2007-05-02 19:25:18 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/jfs/jfs_xtree.c 2007-06-15 02:37:03 +0200
@@ -21,6 +21,7 @@
#include <linux/fs.h>
@@ -5620,9 +5395,8 @@
/* update quota allocation to reflect freed blocks */
DQUOT_FREE_BLOCK(ip, nfreed);
-diff -NurpP --minimal linux-2.6.22.9/fs/jfs/namei.c linux-2.6.22.9-vs2.2.0.4/fs/jfs/namei.c
---- linux-2.6.22.9/fs/jfs/namei.c 2007-05-02 19:25:18 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/jfs/namei.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/jfs/namei.c 2007-05-02 19:25:18 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/jfs/namei.c 2007-06-15 02:37:03 +0200
@@ -20,6 +20,7 @@
#include <linux/fs.h>
#include <linux/ctype.h>
@@ -5647,9 +5421,8 @@
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-2.6.22.9/fs/jfs/super.c linux-2.6.22.9-vs2.2.0.4/fs/jfs/super.c
---- linux-2.6.22.9/fs/jfs/super.c 2007-07-09 13:19:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/jfs/super.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/jfs/super.c 2007-07-09 13:19:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/jfs/super.c 2007-06-15 02:37:03 +0200
@@ -194,7 +194,8 @@ static void jfs_put_super(struct super_b
enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
@@ -5716,9 +5489,8 @@
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-2.6.22.9/fs/jfs/xattr.c linux-2.6.22.9-vs2.2.0.4/fs/jfs/xattr.c
---- linux-2.6.22.9/fs/jfs/xattr.c 2006-11-30 21:19:26 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/jfs/xattr.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/jfs/xattr.c 2006-11-30 21:19:26 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/jfs/xattr.c 2007-06-15 02:37:03 +0200
@@ -23,6 +23,7 @@
#include <linux/posix_acl_xattr.h>
#include <linux/quotaops.h>
@@ -5796,9 +5568,8 @@
inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-2.6.22.9/fs/libfs.c linux-2.6.22.9-vs2.2.0.4/fs/libfs.c
---- linux-2.6.22.9/fs/libfs.c 2007-07-09 13:19:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/libfs.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/libfs.c 2007-07-09 13:19:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/libfs.c 2007-06-15 02:37:03 +0200
@@ -124,7 +124,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
@@ -5845,9 +5616,8 @@
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(get_sb_pseudo);
EXPORT_SYMBOL(simple_commit_write);
-diff -NurpP --minimal linux-2.6.22.9/fs/locks.c linux-2.6.22.9-vs2.2.0.4/fs/locks.c
---- linux-2.6.22.9/fs/locks.c 2007-09-30 15:54:34 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/locks.c 2007-10-01 15:26:40 +0200
+--- linux-2.6.22.10/fs/locks.c 2007-10-30 01:57:14 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/locks.c 2007-10-01 15:26:40 +0200
@@ -125,6 +125,8 @@
#include <linux/syscalls.h>
#include <linux/time.h>
@@ -6033,10 +5803,9 @@
lock_get_status(q, fl, ++i, "");
move_lock_status(&q, &pos, offset);
-diff -NurpP --minimal linux-2.6.22.9/fs/namei.c linux-2.6.22.9-vs2.2.0.4/fs/namei.c
---- linux-2.6.22.9/fs/namei.c 2007-07-09 13:19:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/namei.c 2007-10-01 15:50:20 +0200
-@@ -31,6 +31,11 @@
+--- linux-2.6.22.10/fs/namei.c 2007-07-09 13:19:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/namei.c 2007-10-30 02:31:28 +0100
+@@ -31,6 +31,12 @@
#include <linux/file.h>
#include <linux/fcntl.h>
#include <linux/namei.h>
@@ -6045,18 +5814,18 @@
+#include <linux/vs_base.h>
+#include <linux/vs_tag.h>
+#include <linux/vs_cowbl.h>
++#include <linux/vs_context.h>
#include <asm/namei.h>
#include <asm/uaccess.h>
-@@ -224,6 +229,31 @@ int generic_permission(struct inode *ino
+@@ -224,6 +230,29 @@ int generic_permission(struct inode *ino
return -EACCES;
}
+static inline int dx_barrier(struct inode *inode)
+{
+ if (IS_BARRIER(inode) && !vx_check(0, VS_ADMIN)) {
-+ vxwprintk(1, "xid=%d did hit the barrier.",
-+ vx_current_xid());
++ vxwprintk_task(1, "did hit the barrier.");
+ return 1;
+ }
+ return 0;
@@ -6071,16 +5840,15 @@
+ if (dx_check(inode->i_tag, DX_ADMIN|DX_WATCH|DX_IDENT))
+ return 0;
+
-+ vxwprintk(1, "xid=%d denied access to %p[#%d,%lu] »%s«.",
-+ vx_current_xid(), inode, inode->i_tag, inode->i_ino,
-+ vxd_cond_path(nd));
++ vxwprintk_task(1, "denied access to %p[#%d,%lu] »%s«.",
++ inode, inode->i_tag, inode->i_ino, vxd_cond_path(nd));
+ return -EACCES;
+}
+
int permission(struct inode *inode, int mask, struct nameidata *nd)
{
umode_t mode = inode->i_mode;
-@@ -234,14 +264,14 @@ int permission(struct inode *inode, int
+@@ -234,14 +263,14 @@ int permission(struct inode *inode, int
/*
* Nobody gets write access to a read-only fs.
*/
@@ -6097,7 +5865,7 @@
return -EACCES;
}
-@@ -257,6 +287,8 @@ int permission(struct inode *inode, int
+@@ -257,6 +286,8 @@ int permission(struct inode *inode, int
/* Ordinary permission routines do not understand MAY_APPEND. */
submask = mask & ~MAY_APPEND;
@@ -6106,7 +5874,7 @@
if (inode->i_op && inode->i_op->permission)
retval = inode->i_op->permission(inode, submask, nd);
else
-@@ -432,6 +464,8 @@ static int exec_permission_lite(struct i
+@@ -432,6 +463,8 @@ static int exec_permission_lite(struct i
{
umode_t mode = inode->i_mode;
@@ -6115,7 +5883,7 @@
if (inode->i_op && inode->i_op->permission)
return -EAGAIN;
-@@ -732,7 +766,8 @@ static __always_inline void follow_dotdo
+@@ -732,7 +765,8 @@ static __always_inline void follow_dotdo
if (nd->dentry == fs->root &&
nd->mnt == fs->rootmnt) {
read_unlock(&fs->lock);
@@ -6125,7 +5893,7 @@
}
read_unlock(&fs->lock);
spin_lock(&dcache_lock);
-@@ -769,16 +804,34 @@ static int do_lookup(struct nameidata *n
+@@ -769,16 +803,33 @@ static int do_lookup(struct nameidata *n
{
struct vfsmount *mnt = nd->mnt;
struct dentry *dentry = __d_lookup(nd->dentry, name);
@@ -6152,15 +5920,14 @@
__follow_mount(path);
return 0;
+hidden:
-+ vxwprintk(1, "xid=%d did lookup hidden %p[#%d,%lu] »%s«.",
-+ vx_current_xid(), inode, inode->i_tag, inode->i_ino,
-+ vxd_path(dentry, mnt));
++ vxwprintk_task(1, "did lookup hidden %p[#%d,%lu] »%s«.",
++ inode, inode->i_tag, inode->i_ino, vxd_path(dentry, mnt));
+ dput(dentry);
+ return -ENOENT;
need_lookup:
dentry = real_lookup(nd->dentry, name, nd);
-@@ -1399,7 +1452,8 @@ static inline int check_sticky(struct in
+@@ -1399,7 +1450,8 @@ static inline int check_sticky(struct in
* 10. We don't allow removal of NFS sillyrenamed files; it's handled by
* nfs_async_unlink().
*/
@@ -6170,7 +5937,7 @@
{
int error;
-@@ -1409,13 +1463,13 @@ static int may_delete(struct inode *dir,
+@@ -1409,13 +1461,13 @@ static int may_delete(struct inode *dir,
BUG_ON(victim->d_parent->d_inode != dir);
audit_inode_child(victim->d_name.name, victim->d_inode, dir);
@@ -6186,7 +5953,7 @@
return -EPERM;
if (isdir) {
if (!S_ISDIR(victim->d_inode->i_mode))
-@@ -1546,6 +1600,14 @@ int may_open(struct nameidata *nd, int a
+@@ -1546,6 +1598,14 @@ int may_open(struct nameidata *nd, int a
if (S_ISDIR(inode->i_mode) && (flag & FMODE_WRITE))
return -EISDIR;
@@ -6201,7 +5968,7 @@
error = vfs_permission(nd, acc_mode);
if (error)
return error;
-@@ -1562,7 +1624,8 @@ int may_open(struct nameidata *nd, int a
+@@ -1562,7 +1622,8 @@ int may_open(struct nameidata *nd, int a
return -EACCES;
flag &= ~O_TRUNC;
@@ -6211,7 +5978,7 @@
return -EROFS;
/*
* An append-only file must be opened in append mode for writing.
-@@ -1650,6 +1713,11 @@ int open_namei(int dfd, const char *path
+@@ -1650,6 +1711,11 @@ int open_namei(int dfd, const char *path
struct dentry *dir;
int count = 0;
@@ -6223,7 +5990,7 @@
acc_mode = ACC_MODE(flag);
/* O_TRUNC implies we need access checks for write permissions */
-@@ -1743,6 +1811,22 @@ do_last:
+@@ -1743,6 +1809,22 @@ do_last:
goto exit;
ok:
error = may_open(nd, acc_mode, flag);
@@ -6246,7 +6013,7 @@
if (error)
goto exit;
return 0;
-@@ -1854,9 +1938,10 @@ fail:
+@@ -1854,9 +1936,10 @@ fail:
}
EXPORT_SYMBOL_GPL(lookup_create);
@@ -6259,7 +6026,7 @@
if (error)
return error;
-@@ -1906,11 +1991,12 @@ asmlinkage long sys_mknodat(int dfd, con
+@@ -1906,11 +1989,12 @@ asmlinkage long sys_mknodat(int dfd, con
error = vfs_create(nd.dentry->d_inode,dentry,mode,&nd);
break;
case S_IFCHR: case S_IFBLK:
@@ -6275,7 +6042,7 @@
break;
case S_IFDIR:
error = -EPERM;
-@@ -1933,9 +2019,10 @@ asmlinkage long sys_mknod(const char __u
+@@ -1933,9 +2017,10 @@ asmlinkage long sys_mknod(const char __u
return sys_mknodat(AT_FDCWD, filename, mode, dev);
}
@@ -6288,7 +6055,7 @@
if (error)
return error;
-@@ -1977,7 +2064,7 @@ asmlinkage long sys_mkdirat(int dfd, con
+@@ -1977,7 +2062,7 @@ asmlinkage long sys_mkdirat(int dfd, con
if (!IS_POSIXACL(nd.dentry->d_inode))
mode &= ~current->fs->umask;
@@ -6297,7 +6064,7 @@
dput(dentry);
out_unlock:
mutex_unlock(&nd.dentry->d_inode->i_mutex);
-@@ -2020,9 +2107,10 @@ void dentry_unhash(struct dentry *dentry
+@@ -2020,9 +2105,10 @@ void dentry_unhash(struct dentry *dentry
spin_unlock(&dcache_lock);
}
@@ -6310,7 +6077,7 @@
if (error)
return error;
-@@ -2084,7 +2172,7 @@ static long do_rmdir(int dfd, const char
+@@ -2084,7 +2170,7 @@ static long do_rmdir(int dfd, const char
error = PTR_ERR(dentry);
if (IS_ERR(dentry))
goto exit2;
@@ -6319,7 +6086,7 @@
dput(dentry);
exit2:
mutex_unlock(&nd.dentry->d_inode->i_mutex);
-@@ -2100,9 +2188,10 @@ asmlinkage long sys_rmdir(const char __u
+@@ -2100,9 +2186,10 @@ asmlinkage long sys_rmdir(const char __u
return do_rmdir(AT_FDCWD, pathname);
}
@@ -6332,7 +6099,7 @@
if (error)
return error;
-@@ -2164,7 +2253,7 @@ static long do_unlinkat(int dfd, const c
+@@ -2164,7 +2251,7 @@ static long do_unlinkat(int dfd, const c
inode = dentry->d_inode;
if (inode)
atomic_inc(&inode->i_count);
@@ -6341,7 +6108,7 @@
exit2:
dput(dentry);
}
-@@ -2199,9 +2288,10 @@ asmlinkage long sys_unlink(const char __
+@@ -2199,9 +2286,10 @@ asmlinkage long sys_unlink(const char __
return do_unlinkat(AT_FDCWD, pathname);
}
@@ -6354,7 +6121,7 @@
if (error)
return error;
-@@ -2245,7 +2335,7 @@ asmlinkage long sys_symlinkat(const char
+@@ -2245,7 +2333,7 @@ asmlinkage long sys_symlinkat(const char
if (IS_ERR(dentry))
goto out_unlock;
@@ -6363,7 +6130,7 @@
dput(dentry);
out_unlock:
mutex_unlock(&nd.dentry->d_inode->i_mutex);
-@@ -2262,7 +2352,8 @@ asmlinkage long sys_symlink(const char _
+@@ -2262,7 +2350,8 @@ asmlinkage long sys_symlink(const char _
return sys_symlinkat(oldname, AT_FDCWD, newname);
}
@@ -6373,7 +6140,7 @@
{
struct inode *inode = old_dentry->d_inode;
int error;
-@@ -2270,7 +2361,7 @@ int vfs_link(struct dentry *old_dentry,
+@@ -2270,7 +2359,7 @@ int vfs_link(struct dentry *old_dentry,
if (!inode)
return -ENOENT;
@@ -6382,7 +6149,7 @@
if (error)
return error;
-@@ -2280,7 +2371,7 @@ int vfs_link(struct dentry *old_dentry,
+@@ -2280,7 +2369,7 @@ int vfs_link(struct dentry *old_dentry,
/*
* A link to an append-only or immutable file cannot be created.
*/
@@ -6391,7 +6158,7 @@
return -EPERM;
if (!dir->i_op || !dir->i_op->link)
return -EPERM;
-@@ -2340,7 +2431,7 @@ asmlinkage long sys_linkat(int olddfd, c
+@@ -2340,7 +2429,7 @@ asmlinkage long sys_linkat(int olddfd, c
error = PTR_ERR(new_dentry);
if (IS_ERR(new_dentry))
goto out_unlock;
@@ -6400,7 +6167,7 @@
dput(new_dentry);
out_unlock:
mutex_unlock(&nd.dentry->d_inode->i_mutex);
-@@ -2472,14 +2563,14 @@ int vfs_rename(struct inode *old_dir, st
+@@ -2472,14 +2561,14 @@ int vfs_rename(struct inode *old_dir, st
if (old_dentry->d_inode == new_dentry->d_inode)
return 0;
@@ -6417,7 +6184,7 @@
if (error)
return error;
-@@ -2557,6 +2648,9 @@ static int do_rename(int olddfd, const c
+@@ -2557,6 +2646,9 @@ static int do_rename(int olddfd, const c
error = -EINVAL;
if (old_dentry == trap)
goto exit4;
@@ -6427,7 +6194,7 @@
new_dentry = lookup_hash(&newnd);
error = PTR_ERR(new_dentry);
if (IS_ERR(new_dentry))
-@@ -2650,6 +2744,153 @@ int vfs_follow_link(struct nameidata *nd
+@@ -2650,6 +2742,217 @@ int vfs_follow_link(struct nameidata *nd
return __vfs_follow_link(nd, link);
}
@@ -6436,23 +6203,33 @@
+
+#include <linux/file.h>
+
++static inline
++long do_cow_splice(struct file *in, struct file *out, size_t len)
++{
++ loff_t ppos = 0;
++
++ return do_splice_direct(in, &ppos, out, len, 0);
++}
++
+struct dentry *cow_break_link(const char *pathname)
+{
-+ int ret, mode, pathlen;
++ int ret, mode, pathlen, redo = 0;
+ struct nameidata old_nd, dir_nd;
+ struct dentry *old_dentry, *new_dentry;
-+ struct dentry *res = ERR_PTR(-EMLINK);
++ struct dentry *dir, *res = NULL;
+ struct vfsmount *old_mnt, *new_mnt;
+ struct file *old_file;
+ struct file *new_file;
+ char *to, *path, pad='\251';
-+ loff_t size;
++ loff_t ppos, size;
+
+ vxdprintk(VXD_CBIT(misc, 1), "cow_break_link(»%s«)", pathname);
+ path = kmalloc(PATH_MAX, GFP_KERNEL);
++ ret = -ENOMEM;
+ if (!path)
+ goto out;
+
++ /* old_nd will have refs to dentry and mnt */
+ ret = path_lookup(pathname, LOOKUP_FOLLOW, &old_nd);
+ vxdprintk(VXD_CBIT(misc, 2), "path_lookup(old): %d", ret);
+ if (ret < 0)
@@ -6464,90 +6241,121 @@
+
+ to = d_path(old_dentry, old_mnt, path, PATH_MAX-2);
+ pathlen = strlen(to);
-+ vxdprintk(VXD_CBIT(misc, 2), "old path »%s«", to);
++ vxdprintk(VXD_CBIT(misc, 2), "old path »%s« [»%.*s«:%d]", to,
++ old_dentry->d_name.len, old_dentry->d_name.name,
++ old_dentry->d_name.len);
+
-+ to[pathlen+1] = 0;
++ to[pathlen + 1] = 0;
+retry:
+ to[pathlen] = pad--;
++ ret = -EMLINK;
+ if (pad <= '\240')
+ goto out_rel_old;
+
+ vxdprintk(VXD_CBIT(misc, 1), "temp copy »%s«", to);
++ /* dir_nd will have refs to dentry and mnt */
+ ret = path_lookup(to,
-+ LOOKUP_PARENT|LOOKUP_OPEN|LOOKUP_CREATE, &dir_nd);
++ LOOKUP_PARENT | LOOKUP_OPEN | LOOKUP_CREATE, &dir_nd);
+ vxdprintk(VXD_CBIT(misc, 2),
+ "path_lookup(new): %d", ret);
+ if (ret < 0)
+ goto retry;
+
-+ /* this puppy downs the inode sem */
++ /* this puppy downs the inode mutex */
+ new_dentry = lookup_create(&dir_nd, 0);
+ vxdprintk(VXD_CBIT(misc, 2),
-+ "lookup_create(new): %p", new_dentry);
++ "lookup_create(new): %p [»%.*s«:%d]", new_dentry,
++ new_dentry->d_name.len, new_dentry->d_name.name,
++ new_dentry->d_name.len);
+ if (!new_dentry || IS_ERR(new_dentry)) {
+ path_release(&dir_nd);
+ goto retry;
+ }
++ dir = dir_nd.dentry;
+
+ ret = vfs_create(dir_nd.dentry->d_inode, new_dentry, mode, &dir_nd);
+ vxdprintk(VXD_CBIT(misc, 2),
+ "vfs_create(new): %d", ret);
+ if (ret == -EEXIST) {
-+ mutex_unlock(&dir_nd.dentry->d_inode->i_mutex);
++ mutex_unlock(&dir->d_inode->i_mutex);
+ dput(new_dentry);
+ path_release(&dir_nd);
+ goto retry;
+ }
-+ else if (ret < 0) {
-+ res = ERR_PTR(ret);
-+ goto out_rel_both;
-+ }
++ else if (ret < 0)
++ goto out_unlock_new;
+
-+ new_mnt = dir_nd.mnt;
++ /* drop out early, ret passes ENOENT */
++ ret = -ENOENT;
++ if ((redo = d_unhashed(old_dentry)))
++ goto out_unlock_new;
+
++ new_mnt = dir_nd.mnt;
+ dget(old_dentry);
+ mntget(old_mnt);
-+ /* this one cleans up the dentry in case of failure */
++ /* this one cleans up the dentry/mnt in case of failure */
+ old_file = dentry_open(old_dentry, old_mnt, O_RDONLY);
+ vxdprintk(VXD_CBIT(misc, 2),
+ "dentry_open(old): %p", old_file);
+ if (!old_file || IS_ERR(old_file)) {
+ res = IS_ERR(old_file) ? (void *) old_file : res;
-+ goto out_rel_both;
++ goto out_unlock_new;
+ }
+
+ dget(new_dentry);
+ mntget(new_mnt);
-+ /* this one cleans up the dentry in case of failure */
++ /* this one cleans up the dentry/mnt in case of failure */
+ new_file = dentry_open(new_dentry, new_mnt, O_WRONLY);
+ vxdprintk(VXD_CBIT(misc, 2),
+ "dentry_open(new): %p", new_file);
-+ if (!new_file || IS_ERR(new_file)) {
-+ res = IS_ERR(new_file) ? (void *) new_file : res;
++
++ ret = IS_ERR(new_file) ? PTR_ERR(new_file) : -ENOENT;
++ if (!new_file || IS_ERR(new_file))
+ goto out_fput_old;
-+ }
+
+ size = i_size_read(old_file->f_dentry->d_inode);
-+ ret = vfs_sendfile(new_file, old_file, NULL, size, 0);
-+ vxdprintk(VXD_CBIT(misc, 2), "vfs_sendfile: %d", ret);
++ ppos = 0;
++ ret = do_cow_splice(old_file, new_file, size);
++ vxdprintk(VXD_CBIT(misc, 2), "do_splice_direct: %d", ret);
+ if (ret < 0) {
-+ res = ERR_PTR(ret);
+ goto out_fput_both;
-+ }
-+ else if (ret < size) {
-+ res = ERR_PTR(-ENOSPC);
++ } else if (ret < size) {
++ ret = -ENOSPC;
+ goto out_fput_both;
++ } else {
++ struct inode *old_inode = old_dentry->d_inode;
++ struct inode *new_inode = new_dentry->d_inode;
++ struct iattr attr = {
++ .ia_uid = old_inode->i_uid,
++ .ia_gid = old_inode->i_gid,
++ .ia_valid = ATTR_UID | ATTR_GID
++ };
++
++ ret = inode_setattr(new_inode, &attr);
++ if (ret)
++ goto out_fput_both;
+ }
+
++ mutex_lock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
++
++ /* drop out late */
++ ret = -ENOENT;
++ if ((redo = d_unhashed(old_dentry)))
++ goto out_unlock;
++
++ vxdprintk(VXD_CBIT(misc, 2),
++ "vfs_rename: [»%*s«:%d] -> [»%*s«:%d]",
++ new_dentry->d_name.len, new_dentry->d_name.name,
++ new_dentry->d_name.len,
++ old_dentry->d_name.len, old_dentry->d_name.name,
++ old_dentry->d_name.len);
+ ret = vfs_rename(dir_nd.dentry->d_inode, new_dentry,
+ old_nd.dentry->d_parent->d_inode, old_dentry);
+ vxdprintk(VXD_CBIT(misc, 2), "vfs_rename: %d", ret);
-+ if (!ret) {
-+ res = new_dentry;
-+ dget(new_dentry);
-+ }
-+ else
-+ res = ERR_PTR(ret);
++ res = new_dentry;
++
++out_unlock:
++ mutex_unlock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
+
+out_fput_both:
+ vxdprintk(VXD_CBIT(misc, 3),
@@ -6561,18 +6369,41 @@
+ atomic_read(&old_file->f_count));
+ fput(old_file);
+
-+out_rel_both:
-+ mutex_unlock(&dir_nd.dentry->d_inode->i_mutex);
-+ if (IS_ERR(res))
-+ vfs_unlink(dir_nd.dentry->d_inode, new_dentry, &dir_nd);
++out_unlock_new:
++ mutex_unlock(&dir->d_inode->i_mutex);
++ if (!ret)
++ goto out_redo;
++
++ /* error path cleanup */
++ vfs_unlink(dir->d_inode, new_dentry, &dir_nd);
+ dput(new_dentry);
+
++out_redo:
++ if (!redo)
++ goto out_rel_both;
++ /* lookup dentry once again */
++ path_release(&old_nd);
++ ret = path_lookup(pathname, LOOKUP_FOLLOW, &old_nd);
++ if (ret)
++ goto out_rel_both;
++
++ new_dentry = old_nd.dentry;
++ vxdprintk(VXD_CBIT(misc, 2),
++ "path_lookup(redo): %p [»%.*s«:%d]", new_dentry,
++ new_dentry->d_name.len, new_dentry->d_name.name,
++ new_dentry->d_name.len);
++ dget(new_dentry);
++ res = new_dentry;
++
++out_rel_both:
+ path_release(&dir_nd);
+out_rel_old:
+ path_release(&old_nd);
+out_free_path:
+ kfree(path);
+out:
++ if (ret)
++ res = ERR_PTR(ret);
+ return res;
+}
+
@@ -6581,9 +6412,8 @@
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-diff -NurpP --minimal linux-2.6.22.9/fs/namespace.c linux-2.6.22.9-vs2.2.0.4/fs/namespace.c
---- linux-2.6.22.9/fs/namespace.c 2007-07-09 13:19:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/namespace.c 2007-06-15 03:24:51 +0200
+--- linux-2.6.22.10/fs/namespace.c 2007-07-09 13:19:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/namespace.c 2007-06-15 03:24:51 +0200
@@ -25,6 +25,11 @@
#include <linux/security.h>
#include <linux/mount.h>
@@ -6917,9 +6747,8 @@
+ atomic_dec(&vs_global_mnt_ns);
kfree(ns);
}
-diff -NurpP --minimal linux-2.6.22.9/fs/nfs/client.c linux-2.6.22.9-vs2.2.0.4/fs/nfs/client.c
---- linux-2.6.22.9/fs/nfs/client.c 2007-07-09 13:19:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/nfs/client.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/nfs/client.c 2007-07-09 13:19:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/nfs/client.c 2007-06-15 02:37:03 +0200
@@ -521,6 +521,9 @@ static int nfs_init_server_rpcclient(str
if (server->flags & NFS4_MOUNT_INTR)
server->client->cl_intr = 1;
@@ -6941,9 +6770,8 @@
server->maxfilesize = fsinfo->maxfilesize;
/* We're airborne Set socket buffersize */
-diff -NurpP --minimal linux-2.6.22.9/fs/nfs/dir.c linux-2.6.22.9-vs2.2.0.4/fs/nfs/dir.c
---- linux-2.6.22.9/fs/nfs/dir.c 2007-07-09 13:19:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/nfs/dir.c 2007-06-15 03:02:49 +0200
+--- linux-2.6.22.10/fs/nfs/dir.c 2007-07-09 13:19:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/nfs/dir.c 2007-06-15 03:02:49 +0200
@@ -34,6 +34,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
@@ -6970,9 +6798,8 @@
return 0;
return 1;
}
-diff -NurpP --minimal linux-2.6.22.9/fs/nfs/inode.c linux-2.6.22.9-vs2.2.0.4/fs/nfs/inode.c
---- linux-2.6.22.9/fs/nfs/inode.c 2007-07-09 13:19:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/nfs/inode.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/nfs/inode.c 2007-07-09 13:19:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/nfs/inode.c 2007-06-15 02:37:03 +0200
@@ -37,6 +37,7 @@
#include <linux/vfs.h>
#include <linux/inet.h>
@@ -7067,9 +6894,8 @@
if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
/*
-diff -NurpP --minimal linux-2.6.22.9/fs/nfs/nfs3xdr.c linux-2.6.22.9-vs2.2.0.4/fs/nfs/nfs3xdr.c
---- linux-2.6.22.9/fs/nfs/nfs3xdr.c 2007-07-09 13:19:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/nfs/nfs3xdr.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/nfs/nfs3xdr.c 2007-07-09 13:19:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/nfs/nfs3xdr.c 2007-06-15 02:37:03 +0200
@@ -22,6 +22,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -7159,9 +6985,8 @@
if (args->type == NF3CHR || args->type == NF3BLK) {
*p++ = htonl(MAJOR(args->rdev));
*p++ = htonl(MINOR(args->rdev));
-diff -NurpP --minimal linux-2.6.22.9/fs/nfs/nfsroot.c linux-2.6.22.9-vs2.2.0.4/fs/nfs/nfsroot.c
---- linux-2.6.22.9/fs/nfs/nfsroot.c 2007-07-09 13:19:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/nfs/nfsroot.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/nfs/nfsroot.c 2007-07-09 13:19:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/nfs/nfsroot.c 2007-06-15 02:37:03 +0200
@@ -118,12 +118,12 @@ static int mount_port __initdata = 0; /
enum {
/* Options that take integer arguments */
@@ -7209,9 +7034,8 @@
default:
printk(KERN_WARNING "Root-NFS: unknown "
"option: %s\n", p);
-diff -NurpP --minimal linux-2.6.22.9/fs/nfs/super.c linux-2.6.22.9-vs2.2.0.4/fs/nfs/super.c
---- linux-2.6.22.9/fs/nfs/super.c 2007-09-30 15:54:34 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/nfs/super.c 2007-10-01 15:25:35 +0200
+--- linux-2.6.22.10/fs/nfs/super.c 2007-10-30 01:57:14 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/nfs/super.c 2007-10-01 15:25:35 +0200
@@ -45,6 +45,7 @@
#include <linux/inet.h>
#include <linux/nfs_xdr.h>
@@ -7228,9 +7052,8 @@
{ 0, NULL, NULL }
};
const struct proc_nfs_info *nfs_infop;
-diff -NurpP --minimal linux-2.6.22.9/fs/nfsd/auth.c linux-2.6.22.9-vs2.2.0.4/fs/nfsd/auth.c
---- linux-2.6.22.9/fs/nfsd/auth.c 2006-06-18 04:54:42 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/nfsd/auth.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/nfsd/auth.c 2006-06-18 04:54:42 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/nfsd/auth.c 2007-06-15 02:37:03 +0200
@@ -9,6 +9,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/sunrpc/svcauth.h>
@@ -7265,9 +7088,8 @@
cap_t(current->cap_effective) &= ~CAP_NFSD_MASK;
} else {
cap_t(current->cap_effective) |= (CAP_NFSD_MASK &
-diff -NurpP --minimal linux-2.6.22.9/fs/nfsd/nfs3xdr.c linux-2.6.22.9-vs2.2.0.4/fs/nfsd/nfs3xdr.c
---- linux-2.6.22.9/fs/nfsd/nfs3xdr.c 2007-07-09 13:19:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/nfsd/nfs3xdr.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/nfsd/nfs3xdr.c 2007-07-09 13:19:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/nfsd/nfs3xdr.c 2007-06-15 02:37:03 +0200
@@ -21,6 +21,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/nfsd/nfsd.h>
@@ -7316,9 +7138,8 @@
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-2.6.22.9/fs/nfsd/nfs4recover.c linux-2.6.22.9-vs2.2.0.4/fs/nfsd/nfs4recover.c
---- linux-2.6.22.9/fs/nfsd/nfs4recover.c 2007-07-09 13:19:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/nfsd/nfs4recover.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/nfsd/nfs4recover.c 2007-07-09 13:19:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/nfsd/nfs4recover.c 2007-06-15 02:37:03 +0200
@@ -156,7 +156,7 @@ nfsd4_create_clid_dir(struct nfs4_client
dprintk("NFSD: nfsd4_create_clid_dir: DIRECTORY EXISTS\n");
goto out_put;
@@ -7346,9 +7167,8 @@
mutex_unlock(&dir->d_inode->i_mutex);
return status;
}
-diff -NurpP --minimal linux-2.6.22.9/fs/nfsd/nfs4xdr.c linux-2.6.22.9-vs2.2.0.4/fs/nfsd/nfs4xdr.c
---- linux-2.6.22.9/fs/nfsd/nfs4xdr.c 2007-07-09 13:19:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/nfsd/nfs4xdr.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/nfsd/nfs4xdr.c 2007-07-09 13:19:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/nfsd/nfs4xdr.c 2007-06-15 02:37:03 +0200
@@ -56,6 +56,7 @@
#include <linux/nfsd_idmap.h>
#include <linux/nfs4.h>
@@ -7378,9 +7198,8 @@
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-2.6.22.9/fs/nfsd/nfsxdr.c linux-2.6.22.9-vs2.2.0.4/fs/nfsd/nfsxdr.c
---- linux-2.6.22.9/fs/nfsd/nfsxdr.c 2007-07-09 13:19:27 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/nfsd/nfsxdr.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/nfsd/nfsxdr.c 2007-07-09 13:19:27 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/nfsd/nfsxdr.c 2007-06-15 02:37:03 +0200
@@ -15,6 +15,7 @@
#include <linux/nfsd/nfsd.h>
#include <linux/nfsd/xdr.h>
@@ -7429,9 +7248,8 @@
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-2.6.22.9/fs/nfsd/vfs.c linux-2.6.22.9-vs2.2.0.4/fs/nfsd/vfs.c
---- linux-2.6.22.9/fs/nfsd/vfs.c 2007-09-05 03:37:50 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/nfsd/vfs.c 2007-08-12 12:21:51 +0200
+--- linux-2.6.22.10/fs/nfsd/vfs.c 2007-10-30 01:57:14 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/nfsd/vfs.c 2007-08-12 12:21:51 +0200
@@ -1186,13 +1186,13 @@ nfsd_create(struct svc_rqst *rqstp, stru
host_err = vfs_create(dirp, dchild, iap->ia_mode, NULL);
break;
@@ -7495,9 +7313,8 @@
return nfserr_rofs;
if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE(inode))
return nfserr_perm;
-diff -NurpP --minimal linux-2.6.22.9/fs/ocfs2/dlm/dlmfs.c linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/dlm/dlmfs.c
---- linux-2.6.22.9/fs/ocfs2/dlm/dlmfs.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/dlm/dlmfs.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ocfs2/dlm/dlmfs.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ocfs2/dlm/dlmfs.c 2007-06-15 02:37:03 +0200
@@ -43,6 +43,7 @@
#include <linux/init.h>
#include <linux/string.h>
@@ -7522,9 +7339,8 @@
inode->i_blocks = 0;
inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-2.6.22.9/fs/ocfs2/dlmglue.c linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/dlmglue.c
---- linux-2.6.22.9/fs/ocfs2/dlmglue.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/dlmglue.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ocfs2/dlmglue.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ocfs2/dlmglue.c 2007-06-15 02:37:03 +0200
@@ -1475,6 +1475,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);
@@ -7541,9 +7357,8 @@
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-2.6.22.9/fs/ocfs2/dlmglue.h linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/dlmglue.h
---- linux-2.6.22.9/fs/ocfs2/dlmglue.h 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/dlmglue.h 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ocfs2/dlmglue.h 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ocfs2/dlmglue.h 2007-06-15 02:37:03 +0200
@@ -34,7 +34,7 @@
struct ocfs2_meta_lvb {
__u8 lvb_version;
@@ -7553,9 +7368,8 @@
__be32 lvb_iclusters;
__be32 lvb_iuid;
__be32 lvb_igid;
-diff -NurpP --minimal linux-2.6.22.9/fs/ocfs2/file.c linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/file.c
---- linux-2.6.22.9/fs/ocfs2/file.c 2007-09-05 03:37:50 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/file.c 2007-09-05 03:05:52 +0200
+--- linux-2.6.22.10/fs/ocfs2/file.c 2007-10-30 01:57:14 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/ocfs2/file.c 2007-09-05 03:05:52 +0200
@@ -943,13 +943,15 @@ int ocfs2_setattr(struct dentry *dentry,
mlog(0, "uid change: %d\n", attr->ia_uid);
if (attr->ia_valid & ATTR_GID)
@@ -7581,9 +7395,8 @@
.permission = ocfs2_permission,
};
-diff -NurpP --minimal linux-2.6.22.9/fs/ocfs2/inode.c linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/inode.c
---- linux-2.6.22.9/fs/ocfs2/inode.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/inode.c 2007-06-15 03:10:27 +0200
+--- linux-2.6.22.10/fs/ocfs2/inode.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ocfs2/inode.c 2007-06-15 03:10:27 +0200
@@ -28,6 +28,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
@@ -7704,9 +7517,8 @@
inode->i_mode = le16_to_cpu(fe->i_mode);
if (S_ISLNK(inode->i_mode) && le32_to_cpu(fe->i_clusters) == 0)
inode->i_blocks = 0;
-diff -NurpP --minimal linux-2.6.22.9/fs/ocfs2/inode.h linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/inode.h
---- linux-2.6.22.9/fs/ocfs2/inode.h 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/inode.h 2007-06-15 03:10:53 +0200
+--- linux-2.6.22.10/fs/ocfs2/inode.h 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ocfs2/inode.h 2007-06-15 03:10:53 +0200
@@ -142,6 +142,7 @@ int ocfs2_aio_write(struct file *file, s
void ocfs2_set_inode_flags(struct inode *inode);
@@ -7715,9 +7527,8 @@
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-2.6.22.9/fs/ocfs2/ioctl.c linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/ioctl.c
---- linux-2.6.22.9/fs/ocfs2/ioctl.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/ioctl.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ocfs2/ioctl.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ocfs2/ioctl.c 2007-06-15 02:37:03 +0200
@@ -39,7 +39,7 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
@@ -7727,9 +7538,8 @@
unsigned mask)
{
struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode);
-diff -NurpP --minimal linux-2.6.22.9/fs/ocfs2/ioctl.h linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/ioctl.h
---- linux-2.6.22.9/fs/ocfs2/ioctl.h 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/ioctl.h 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ocfs2/ioctl.h 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ocfs2/ioctl.h 2007-06-15 02:37:03 +0200
@@ -10,6 +10,9 @@
#ifndef OCFS2_IOCTL_H
#define OCFS2_IOCTL_H
@@ -7740,9 +7550,8 @@
int ocfs2_ioctl(struct inode * inode, struct file * filp,
unsigned int cmd, unsigned long arg);
long ocfs2_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg);
-diff -NurpP --minimal linux-2.6.22.9/fs/ocfs2/namei.c linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/namei.c
---- linux-2.6.22.9/fs/ocfs2/namei.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/namei.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ocfs2/namei.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ocfs2/namei.c 2007-06-15 02:37:03 +0200
@@ -40,6 +40,7 @@
#include <linux/types.h>
#include <linux/slab.h>
@@ -7791,9 +7600,8 @@
+ .sync_flags = ocfs2_sync_flags,
.permission = ocfs2_permission,
};
-diff -NurpP --minimal linux-2.6.22.9/fs/ocfs2/ocfs2.h linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/ocfs2.h
---- linux-2.6.22.9/fs/ocfs2/ocfs2.h 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/ocfs2.h 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ocfs2/ocfs2.h 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ocfs2/ocfs2.h 2007-06-15 02:37:03 +0200
@@ -170,6 +170,7 @@ enum ocfs2_mount_options
OCFS2_MOUNT_NOINTR = 1 << 2, /* Don't catch signals */
OCFS2_MOUNT_ERRORS_PANIC = 1 << 3, /* Panic on errors */
@@ -7802,9 +7610,8 @@
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-2.6.22.9/fs/ocfs2/ocfs2_fs.h linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/ocfs2_fs.h
---- linux-2.6.22.9/fs/ocfs2/ocfs2_fs.h 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/ocfs2_fs.h 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ocfs2/ocfs2_fs.h 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ocfs2/ocfs2_fs.h 2007-06-15 02:37:03 +0200
@@ -152,8 +152,12 @@
#define OCFS2_NOATIME_FL (0x00000080) /* do not update atime */
#define OCFS2_DIRSYNC_FL (0x00010000) /* dirsync behaviour (directories only) */
@@ -7818,9 +7625,8 @@
/*
* Extent record flags (e_node.leaf.flags)
-diff -NurpP --minimal linux-2.6.22.9/fs/ocfs2/super.c linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/super.c
---- linux-2.6.22.9/fs/ocfs2/super.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/ocfs2/super.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/ocfs2/super.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/ocfs2/super.c 2007-06-15 02:37:03 +0200
@@ -140,6 +140,7 @@ enum {
Opt_data_ordered,
Opt_data_writeback,
@@ -7886,9 +7692,8 @@
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-2.6.22.9/fs/open.c linux-2.6.22.9-vs2.2.0.4/fs/open.c
---- linux-2.6.22.9/fs/open.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/open.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/open.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/open.c 2007-06-15 02:37:03 +0200
@@ -26,22 +26,31 @@
#include <linux/syscalls.h>
#include <linux/rcupdate.h>
@@ -8062,9 +7867,8 @@
}
void fastcall put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-2.6.22.9/fs/proc/array.c linux-2.6.22.9-vs2.2.0.4/fs/proc/array.c
---- linux-2.6.22.9/fs/proc/array.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/proc/array.c 2007-06-15 03:04:38 +0200
+--- linux-2.6.22.10/fs/proc/array.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/proc/array.c 2007-06-15 03:04:38 +0200
@@ -75,6 +75,8 @@
#include <linux/cpuset.h>
#include <linux/rcupdate.h>
@@ -8249,9 +8053,8 @@
tcomm,
state,
ppid,
-diff -NurpP --minimal linux-2.6.22.9/fs/proc/base.c linux-2.6.22.9-vs2.2.0.4/fs/proc/base.c
---- linux-2.6.22.9/fs/proc/base.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/proc/base.c 2007-06-15 03:06:14 +0200
+--- linux-2.6.22.10/fs/proc/base.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/proc/base.c 2007-06-15 03:06:14 +0200
@@ -73,6 +73,9 @@
#include <linux/poll.h>
#include <linux/nsproxy.h>
@@ -8379,9 +8182,8 @@
if (proc_task_fill_cache(filp, dirent, filldir, task, tid) < 0) {
/* returning this tgid failed, save it as the first
* pid for the next readir call */
-diff -NurpP --minimal linux-2.6.22.9/fs/proc/generic.c linux-2.6.22.9-vs2.2.0.4/fs/proc/generic.c
---- linux-2.6.22.9/fs/proc/generic.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/proc/generic.c 2007-06-15 03:08:54 +0200
+--- linux-2.6.22.10/fs/proc/generic.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/proc/generic.c 2007-06-15 03:08:54 +0200
@@ -20,6 +20,7 @@
#include <linux/namei.h>
#include <linux/bitops.h>
@@ -8443,9 +8245,8 @@
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-2.6.22.9/fs/proc/inode.c linux-2.6.22.9-vs2.2.0.4/fs/proc/inode.c
---- linux-2.6.22.9/fs/proc/inode.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/proc/inode.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/proc/inode.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/proc/inode.c 2007-06-15 02:37:03 +0200
@@ -160,6 +160,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
@@ -8455,9 +8256,8 @@
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-2.6.22.9/fs/proc/internal.h linux-2.6.22.9-vs2.2.0.4/fs/proc/internal.h
---- linux-2.6.22.9/fs/proc/internal.h 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/proc/internal.h 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/proc/internal.h 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/proc/internal.h 2007-06-15 02:37:03 +0200
@@ -10,6 +10,7 @@
*/
@@ -8484,9 +8284,8 @@
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-2.6.22.9/fs/proc/proc_misc.c linux-2.6.22.9-vs2.2.0.4/fs/proc/proc_misc.c
---- linux-2.6.22.9/fs/proc/proc_misc.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/proc/proc_misc.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/proc/proc_misc.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/proc/proc_misc.c 2007-06-15 02:37:03 +0200
@@ -53,6 +53,8 @@
#include <asm/div64.h>
#include "internal.h"
@@ -8553,9 +8352,8 @@
cached = 0;
get_vmalloc_info(&vmi);
-diff -NurpP --minimal linux-2.6.22.9/fs/proc/root.c linux-2.6.22.9-vs2.2.0.4/fs/proc/root.c
---- linux-2.6.22.9/fs/proc/root.c 2007-05-02 19:25:21 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/proc/root.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/proc/root.c 2007-05-02 19:25:21 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/proc/root.c 2007-06-15 02:37:03 +0200
@@ -22,6 +22,9 @@
#include "internal.h"
@@ -8574,9 +8372,8 @@
proc_sys_init();
}
-diff -NurpP --minimal linux-2.6.22.9/fs/quota.c linux-2.6.22.9-vs2.2.0.4/fs/quota.c
---- linux-2.6.22.9/fs/quota.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/quota.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/quota.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/quota.c 2007-06-15 02:37:03 +0200
@@ -16,6 +16,7 @@
#include <linux/buffer_head.h>
#include <linux/capability.h>
@@ -8682,162 +8479,8 @@
sb = get_super(bdev);
bdput(bdev);
if (!sb)
-diff -NurpP --minimal linux-2.6.22.9/fs/read_write.c linux-2.6.22.9-vs2.2.0.4/fs/read_write.c
---- linux-2.6.22.9/fs/read_write.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/read_write.c 2007-06-15 02:37:03 +0200
-@@ -701,12 +701,77 @@ sys_writev(unsigned long fd, const struc
- return ret;
- }
-
-+ssize_t vfs_sendfile(struct file *out_file, struct file *in_file, loff_t *ppos,
-+ size_t count, loff_t max)
-+{
-+ struct inode * in_inode, * out_inode;
-+ loff_t pos;
-+ ssize_t ret;
-+
-+ /* verify in_file */
-+ in_inode = in_file->f_path.dentry->d_inode;
-+ if (!in_inode)
-+ return -EINVAL;
-+ if (!in_file->f_op || !in_file->f_op->sendfile)
-+ return -EINVAL;
-+
-+ if (!ppos)
-+ ppos = &in_file->f_pos;
-+ else
-+ if (!(in_file->f_mode & FMODE_PREAD))
-+ return -ESPIPE;
-+
-+ ret = rw_verify_area(READ, in_file, ppos, count);
-+ if (ret < 0)
-+ return ret;
-+ count = ret;
-+
-+ /* verify out_file */
-+ out_inode = out_file->f_path.dentry->d_inode;
-+ if (!out_inode)
-+ return -EINVAL;
-+ if (!out_file->f_op || !out_file->f_op->sendpage)
-+ return -EINVAL;
-+
-+ ret = rw_verify_area(WRITE, out_file, &out_file->f_pos, count);
-+ if (ret < 0)
-+ return ret;
-+ count = ret;
-+
-+ ret = security_file_permission (out_file, MAY_WRITE);
-+ if (ret)
-+ return ret;
-+
-+ if (!max)
-+ max = min(in_inode->i_sb->s_maxbytes, out_inode->i_sb->s_maxbytes);
-+
-+ pos = *ppos;
-+ if (unlikely(pos < 0))
-+ return -EINVAL;
-+ if (unlikely(pos + count > max)) {
-+ if (pos >= max)
-+ return -EOVERFLOW;
-+ count = max - pos;
-+ }
-+
-+ ret = in_file->f_op->sendfile(in_file, ppos, count, file_send_actor, out_file);
-+
-+ if (ret > 0) {
-+ add_rchar(current, ret);
-+ add_wchar(current, ret);
-+ }
-+
-+ if (*ppos > max)
-+ return -EOVERFLOW;
-+ return ret;
-+}
-+
-+EXPORT_SYMBOL(vfs_sendfile);
-+
- static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,
- size_t count, loff_t max)
- {
- struct file * in_file, * out_file;
-- struct inode * in_inode, * out_inode;
-- loff_t pos;
- ssize_t retval;
- int fput_needed_in, fput_needed_out;
-
-@@ -719,22 +784,6 @@ static ssize_t do_sendfile(int out_fd, i
- goto out;
- if (!(in_file->f_mode & FMODE_READ))
- goto fput_in;
-- retval = -EINVAL;
-- in_inode = in_file->f_path.dentry->d_inode;
-- if (!in_inode)
-- goto fput_in;
-- if (!in_file->f_op || !in_file->f_op->sendfile)
-- goto fput_in;
-- retval = -ESPIPE;
-- if (!ppos)
-- ppos = &in_file->f_pos;
-- else
-- if (!(in_file->f_mode & FMODE_PREAD))
-- goto fput_in;
-- retval = rw_verify_area(READ, in_file, ppos, count);
-- if (retval < 0)
-- goto fput_in;
-- count = retval;
-
- retval = security_file_permission (in_file, MAY_READ);
- if (retval)
-@@ -749,45 +798,11 @@ static ssize_t do_sendfile(int out_fd, i
- goto fput_in;
- if (!(out_file->f_mode & FMODE_WRITE))
- goto fput_out;
-- retval = -EINVAL;
-- if (!out_file->f_op || !out_file->f_op->sendpage)
-- goto fput_out;
-- out_inode = out_file->f_path.dentry->d_inode;
-- retval = rw_verify_area(WRITE, out_file, &out_file->f_pos, count);
-- if (retval < 0)
-- goto fput_out;
-- count = retval;
--
-- retval = security_file_permission (out_file, MAY_WRITE);
-- if (retval)
-- goto fput_out;
--
-- if (!max)
-- max = min(in_inode->i_sb->s_maxbytes, out_inode->i_sb->s_maxbytes);
--
-- pos = *ppos;
-- retval = -EINVAL;
-- if (unlikely(pos < 0))
-- goto fput_out;
-- if (unlikely(pos + count > max)) {
-- retval = -EOVERFLOW;
-- if (pos >= max)
-- goto fput_out;
-- count = max - pos;
-- }
--
-- retval = in_file->f_op->sendfile(in_file, ppos, count, file_send_actor, out_file);
-
-- if (retval > 0) {
-- add_rchar(current, retval);
-- add_wchar(current, retval);
-- }
-+ retval = vfs_sendfile(out_file, in_file, ppos, count, max);
-
- inc_syscr(current);
- inc_syscw(current);
-- if (*ppos > max)
-- retval = -EOVERFLOW;
--
- fput_out:
- fput_light(out_file, fput_needed_out);
- fput_in:
-diff -NurpP --minimal linux-2.6.22.9/fs/reiserfs/bitmap.c linux-2.6.22.9-vs2.2.0.4/fs/reiserfs/bitmap.c
---- linux-2.6.22.9/fs/reiserfs/bitmap.c 2007-02-06 03:01:29 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/reiserfs/bitmap.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/reiserfs/bitmap.c 2007-02-06 03:01:29 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/reiserfs/bitmap.c 2007-06-15 02:37:03 +0200
@@ -13,6 +13,7 @@
#include <linux/reiserfs_fs_sb.h>
#include <linux/reiserfs_fs_i.h>
@@ -8930,26 +8573,16 @@
}
return CARRY_ON;
-diff -NurpP --minimal linux-2.6.22.9/fs/reiserfs/file.c linux-2.6.22.9-vs2.2.0.4/fs/reiserfs/file.c
---- linux-2.6.22.9/fs/reiserfs/file.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/reiserfs/file.c 2007-06-15 02:37:03 +0200
-@@ -1532,6 +1532,7 @@ const struct file_operations reiserfs_fi
- .release = reiserfs_file_release,
- .fsync = reiserfs_sync_file,
- .sendfile = generic_file_sendfile,
-+ .sendpage = generic_file_sendpage,
- .aio_read = generic_file_aio_read,
- .aio_write = generic_file_aio_write,
- .splice_read = generic_file_splice_read,
-@@ -1546,4 +1547,5 @@ const struct inode_operations reiserfs_f
+--- linux-2.6.22.10/fs/reiserfs/file.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/reiserfs/file.c 2007-10-29 23:24:21 +0100
+@@ -1546,4 +1546,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-2.6.22.9/fs/reiserfs/inode.c linux-2.6.22.9-vs2.2.0.4/fs/reiserfs/inode.c
---- linux-2.6.22.9/fs/reiserfs/inode.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/reiserfs/inode.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/reiserfs/inode.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/reiserfs/inode.c 2007-06-15 02:37:03 +0200
@@ -16,6 +16,8 @@
#include <linux/mpage.h>
#include <linux/writeback.h>
@@ -9133,9 +8766,8 @@
mark_inode_dirty(inode);
error =
journal_end(&th, inode->i_sb, jbegin_count);
-diff -NurpP --minimal linux-2.6.22.9/fs/reiserfs/ioctl.c linux-2.6.22.9-vs2.2.0.4/fs/reiserfs/ioctl.c
---- linux-2.6.22.9/fs/reiserfs/ioctl.c 2007-02-06 03:01:29 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/reiserfs/ioctl.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/reiserfs/ioctl.c 2007-02-06 03:01:29 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/reiserfs/ioctl.c 2007-06-15 02:37:03 +0200
@@ -4,6 +4,7 @@
#include <linux/capability.h>
@@ -9206,9 +8838,8 @@
return -EROFS;
if (get_user(inode->i_generation, (int __user *)arg))
return -EFAULT;
-diff -NurpP --minimal linux-2.6.22.9/fs/reiserfs/namei.c linux-2.6.22.9-vs2.2.0.4/fs/reiserfs/namei.c
---- linux-2.6.22.9/fs/reiserfs/namei.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/reiserfs/namei.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/reiserfs/namei.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/reiserfs/namei.c 2007-06-15 02:37:03 +0200
@@ -17,6 +17,7 @@
#include <linux/reiserfs_acl.h>
#include <linux/reiserfs_xattr.h>
@@ -9256,9 +8887,8 @@
+ .sync_flags = reiserfs_sync_flags,
};
-diff -NurpP --minimal linux-2.6.22.9/fs/reiserfs/stree.c linux-2.6.22.9-vs2.2.0.4/fs/reiserfs/stree.c
---- linux-2.6.22.9/fs/reiserfs/stree.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/reiserfs/stree.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/reiserfs/stree.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/reiserfs/stree.c 2007-06-15 02:37:03 +0200
@@ -55,6 +55,7 @@
#include <linux/reiserfs_fs.h>
#include <linux/buffer_head.h>
@@ -9334,9 +8964,8 @@
+ }
return retval;
}
-diff -NurpP --minimal linux-2.6.22.9/fs/reiserfs/super.c linux-2.6.22.9-vs2.2.0.4/fs/reiserfs/super.c
---- linux-2.6.22.9/fs/reiserfs/super.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/reiserfs/super.c 2007-06-15 02:37:03 +0200
+--- linux-2.6.22.10/fs/reiserfs/super.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/reiserfs/super.c 2007-06-15 02:37:03 +0200
@@ -882,6 +882,14 @@ static int reiserfs_parse_options(struct
{"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
{"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
@@ -9376,9 +9005,8 @@
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-2.6.22.9/fs/reiserfs/xattr.c linux-2.6.22.9-vs2.2.0.4/fs/reiserfs/xattr.c
---- linux-2.6.22.9/fs/reiserfs/xattr.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/reiserfs/xattr.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/reiserfs/xattr.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/reiserfs/xattr.c 2007-06-15 02:37:04 +0200
@@ -35,6 +35,7 @@
#include <linux/namei.h>
#include <linux/errno.h>
@@ -9396,9 +9024,8 @@
reiserfs_write_unlock_xattrs(inode->i_sb);
dput(root);
} else {
-diff -NurpP --minimal linux-2.6.22.9/fs/stat.c linux-2.6.22.9-vs2.2.0.4/fs/stat.c
---- linux-2.6.22.9/fs/stat.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/stat.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/stat.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/stat.c 2007-06-15 02:37:04 +0200
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
@@ -9407,9 +9034,8 @@
stat->rdev = inode->i_rdev;
stat->atime = inode->i_atime;
stat->mtime = inode->i_mtime;
-diff -NurpP --minimal linux-2.6.22.9/fs/super.c linux-2.6.22.9-vs2.2.0.4/fs/super.c
---- linux-2.6.22.9/fs/super.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/super.c 2007-06-15 03:26:55 +0200
+--- linux-2.6.22.10/fs/super.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/super.c 2007-06-15 03:26:55 +0200
@@ -37,6 +37,9 @@
#include <linux/idr.h>
#include <linux/kobject.h>
@@ -9455,9 +9081,8 @@
if (error)
goto out_sb;
-diff -NurpP --minimal linux-2.6.22.9/fs/sysfs/mount.c linux-2.6.22.9-vs2.2.0.4/fs/sysfs/mount.c
---- linux-2.6.22.9/fs/sysfs/mount.c 2007-07-09 13:19:28 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/sysfs/mount.c 2007-06-17 05:54:17 +0200
+--- linux-2.6.22.10/fs/sysfs/mount.c 2007-07-09 13:19:28 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/sysfs/mount.c 2007-06-17 05:54:17 +0200
@@ -12,8 +12,6 @@
#include "sysfs.h"
@@ -9476,9 +9101,8 @@
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
sysfs_sb = sb;
-diff -NurpP --minimal linux-2.6.22.9/fs/utimes.c linux-2.6.22.9-vs2.2.0.4/fs/utimes.c
---- linux-2.6.22.9/fs/utimes.c 2007-07-09 13:19:29 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/utimes.c 2007-07-09 13:11:54 +0200
+--- linux-2.6.22.10/fs/utimes.c 2007-07-09 13:19:29 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/utimes.c 2007-07-09 13:11:54 +0200
@@ -6,6 +6,8 @@
#include <linux/sched.h>
#include <linux/stat.h>
@@ -9507,9 +9131,8 @@
/* Don't worry, the checks are done in inode_change_ok() */
newattrs.ia_valid = ATTR_CTIME | ATTR_MTIME | ATTR_ATIME;
-diff -NurpP --minimal linux-2.6.22.9/fs/xattr.c linux-2.6.22.9-vs2.2.0.4/fs/xattr.c
---- linux-2.6.22.9/fs/xattr.c 2007-07-09 13:19:29 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/xattr.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/xattr.c 2007-07-09 13:19:29 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/xattr.c 2007-06-15 02:37:04 +0200
@@ -17,6 +17,7 @@
#include <linux/module.h>
#include <linux/fsnotify.h>
@@ -9610,28 +9233,8 @@
fput(f);
return error;
}
-diff -NurpP --minimal linux-2.6.22.9/fs/xfs/linux-2.6/xfs_file.c linux-2.6.22.9-vs2.2.0.4/fs/xfs/linux-2.6/xfs_file.c
---- linux-2.6.22.9/fs/xfs/linux-2.6/xfs_file.c 2007-05-02 19:25:22 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/xfs/linux-2.6/xfs_file.c 2007-06-15 02:37:04 +0200
-@@ -453,6 +453,7 @@ const struct file_operations xfs_file_op
- .aio_read = xfs_file_aio_read,
- .aio_write = xfs_file_aio_write,
- .sendfile = xfs_file_sendfile,
-+ .sendpage = generic_file_sendpage,
- .splice_read = xfs_file_splice_read,
- .splice_write = xfs_file_splice_write,
- .unlocked_ioctl = xfs_file_ioctl,
-@@ -476,6 +477,7 @@ const struct file_operations xfs_invis_f
- .aio_read = xfs_file_aio_read_invis,
- .aio_write = xfs_file_aio_write_invis,
- .sendfile = xfs_file_sendfile_invis,
-+ .sendpage = generic_file_sendpage,
- .splice_read = xfs_file_splice_read_invis,
- .splice_write = xfs_file_splice_write_invis,
- .unlocked_ioctl = xfs_file_ioctl_invis,
-diff -NurpP --minimal linux-2.6.22.9/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.22.9-vs2.2.0.4/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.22.9/fs/xfs/linux-2.6/xfs_ioctl.c 2007-05-02 19:25:22 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/xfs/linux-2.6/xfs_ioctl.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/xfs/linux-2.6/xfs_ioctl.c 2007-05-02 19:25:22 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/xfs/linux-2.6/xfs_ioctl.c 2007-06-15 02:37:04 +0200
@@ -1128,6 +1128,10 @@ xfs_di2lxflags(
if (di_flags & XFS_DIFLAG_IMMUTABLE)
@@ -9643,9 +9246,8 @@
if (di_flags & XFS_DIFLAG_APPEND)
flags |= FS_APPEND_FL;
if (di_flags & XFS_DIFLAG_SYNC)
-diff -NurpP --minimal linux-2.6.22.9/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.22.9-vs2.2.0.4/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.22.9/fs/xfs/linux-2.6/xfs_iops.c 2007-05-02 19:25:22 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/xfs/linux-2.6/xfs_iops.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/xfs/linux-2.6/xfs_iops.c 2007-05-02 19:25:22 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/xfs/linux-2.6/xfs_iops.c 2007-06-15 02:37:04 +0200
@@ -51,6 +51,7 @@
#include <linux/xattr.h>
#include <linux/namei.h>
@@ -9749,9 +9351,8 @@
.removexattr = xfs_vn_removexattr,
+ .sync_flags = xfs_vn_sync_flags,
};
-diff -NurpP --minimal linux-2.6.22.9/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.22.9-vs2.2.0.4/fs/xfs/linux-2.6/xfs_linux.h
---- linux-2.6.22.9/fs/xfs/linux-2.6/xfs_linux.h 2007-05-02 19:25:22 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/xfs/linux-2.6/xfs_linux.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/xfs/linux-2.6/xfs_linux.h 2007-05-02 19:25:22 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/xfs/linux-2.6/xfs_linux.h 2007-06-15 02:37:04 +0200
@@ -129,6 +129,7 @@
#define current_pid() (current->pid)
#define current_fsuid(cred) (current->fsuid)
@@ -9760,9 +9361,8 @@
#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-2.6.22.9/fs/xfs/linux-2.6/xfs_super.c linux-2.6.22.9-vs2.2.0.4/fs/xfs/linux-2.6/xfs_super.c
---- linux-2.6.22.9/fs/xfs/linux-2.6/xfs_super.c 2007-07-09 13:19:29 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/xfs/linux-2.6/xfs_super.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/xfs/linux-2.6/xfs_super.c 2007-07-09 13:19:29 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/xfs/linux-2.6/xfs_super.c 2007-06-15 02:37:04 +0200
@@ -157,6 +157,7 @@ xfs_revalidate_inode(
inode->i_nlink = ip->i_d.di_nlink;
inode->i_uid = ip->i_d.di_uid;
@@ -9799,9 +9399,8 @@
if (!error)
error = bhv_vfs_mntupdate(vfsp, flags, args);
kmem_free(args, sizeof(*args));
-diff -NurpP --minimal linux-2.6.22.9/fs/xfs/linux-2.6/xfs_vnode.c linux-2.6.22.9-vs2.2.0.4/fs/xfs/linux-2.6/xfs_vnode.c
---- linux-2.6.22.9/fs/xfs/linux-2.6/xfs_vnode.c 2007-05-02 19:25:22 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/xfs/linux-2.6/xfs_vnode.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/xfs/linux-2.6/xfs_vnode.c 2007-05-02 19:25:22 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/xfs/linux-2.6/xfs_vnode.c 2007-06-15 02:37:04 +0200
@@ -119,6 +119,7 @@ vn_revalidate_core(
inode->i_nlink = vap->va_nlink;
inode->i_uid = vap->va_uid;
@@ -9825,9 +9424,8 @@
if (vap->va_xflags & XFS_XFLAG_APPEND)
inode->i_flags |= S_APPEND;
else
-diff -NurpP --minimal linux-2.6.22.9/fs/xfs/linux-2.6/xfs_vnode.h linux-2.6.22.9-vs2.2.0.4/fs/xfs/linux-2.6/xfs_vnode.h
---- linux-2.6.22.9/fs/xfs/linux-2.6/xfs_vnode.h 2007-07-09 13:19:29 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/xfs/linux-2.6/xfs_vnode.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/xfs/linux-2.6/xfs_vnode.h 2007-07-09 13:19:29 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/xfs/linux-2.6/xfs_vnode.h 2007-06-15 02:37:04 +0200
@@ -350,6 +350,7 @@ typedef struct bhv_vattr {
xfs_nlink_t va_nlink; /* number of references to file */
uid_t va_uid; /* owner user id */
@@ -9853,9 +9451,8 @@
#define XFS_AT_STAT (XFS_AT_TYPE|XFS_AT_MODE|XFS_AT_UID|XFS_AT_GID|\
XFS_AT_FSID|XFS_AT_NODEID|XFS_AT_NLINK|XFS_AT_SIZE|\
-diff -NurpP --minimal linux-2.6.22.9/fs/xfs/quota/xfs_qm_syscalls.c linux-2.6.22.9-vs2.2.0.4/fs/xfs/quota/xfs_qm_syscalls.c
---- linux-2.6.22.9/fs/xfs/quota/xfs_qm_syscalls.c 2007-07-09 13:19:29 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/xfs/quota/xfs_qm_syscalls.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/xfs/quota/xfs_qm_syscalls.c 2007-07-09 13:19:29 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/xfs/quota/xfs_qm_syscalls.c 2007-06-15 02:37:04 +0200
@@ -17,6 +17,7 @@
*/
@@ -9900,9 +9497,8 @@
return XFS_ERROR(EPERM);
if ((newlim->d_fieldmask &
-diff -NurpP --minimal linux-2.6.22.9/fs/xfs/xfs_clnt.h linux-2.6.22.9-vs2.2.0.4/fs/xfs/xfs_clnt.h
---- linux-2.6.22.9/fs/xfs/xfs_clnt.h 2006-06-18 04:54:50 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/xfs/xfs_clnt.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/xfs/xfs_clnt.h 2006-06-18 04:54:50 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/xfs/xfs_clnt.h 2007-06-15 02:37:04 +0200
@@ -99,5 +99,7 @@ struct xfs_mount_args {
*/
#define XFSMNT2_COMPAT_IOSIZE 0x00000001 /* don't report large preferred
@@ -9911,9 +9507,8 @@
+
#endif /* __XFS_CLNT_H__ */
-diff -NurpP --minimal linux-2.6.22.9/fs/xfs/xfs_dinode.h linux-2.6.22.9-vs2.2.0.4/fs/xfs/xfs_dinode.h
---- linux-2.6.22.9/fs/xfs/xfs_dinode.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/xfs/xfs_dinode.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/xfs/xfs_dinode.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/xfs/xfs_dinode.h 2007-06-15 02:37:04 +0200
@@ -53,7 +53,8 @@ typedef struct xfs_dinode_core
__uint32_t di_gid; /* owner's group id */
__uint32_t di_nlink; /* number of links to file */
@@ -9951,9 +9546,8 @@
+ XFS_DIFLAG_IUNLINK)
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-2.6.22.9/fs/xfs/xfs_fs.h linux-2.6.22.9-vs2.2.0.4/fs/xfs/xfs_fs.h
---- linux-2.6.22.9/fs/xfs/xfs_fs.h 2006-11-30 21:19:29 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/fs/xfs/xfs_fs.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/xfs/xfs_fs.h 2006-11-30 21:19:29 +0100
++++ linux-2.6.22.10-vs2.2.0.5/fs/xfs/xfs_fs.h 2007-06-15 02:37:04 +0200
@@ -66,6 +66,8 @@ struct fsxattr {
#define XFS_XFLAG_EXTSIZE 0x00000800 /* extent size allocator hint */
#define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
@@ -9973,9 +9567,8 @@
__u32 bs_dmevmask; /* DMIG event mask */
__u16 bs_dmstate; /* DMIG state info */
__u16 bs_aextents; /* attribute number of extents */
-diff -NurpP --minimal linux-2.6.22.9/fs/xfs/xfs_inode.c linux-2.6.22.9-vs2.2.0.4/fs/xfs/xfs_inode.c
---- linux-2.6.22.9/fs/xfs/xfs_inode.c 2007-07-09 13:19:34 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/xfs/xfs_inode.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/xfs/xfs_inode.c 2007-07-09 13:19:34 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/xfs/xfs_inode.c 2007-06-15 02:37:04 +0200
@@ -49,6 +49,7 @@
#include "xfs_quota.h"
#include "xfs_acl.h"
@@ -10041,9 +9634,8 @@
ip->i_d.di_projid = prid;
memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
-diff -NurpP --minimal linux-2.6.22.9/fs/xfs/xfs_itable.c linux-2.6.22.9-vs2.2.0.4/fs/xfs/xfs_itable.c
---- linux-2.6.22.9/fs/xfs/xfs_itable.c 2007-07-09 13:19:34 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/xfs/xfs_itable.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/xfs/xfs_itable.c 2007-07-09 13:19:34 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/xfs/xfs_itable.c 2007-06-15 02:37:04 +0200
@@ -89,6 +89,7 @@ xfs_bulkstat_one_iget(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
@@ -10060,9 +9652,8 @@
buf->bs_size = INT_GET(dic->di_size, ARCH_CONVERT);
buf->bs_atime.tv_sec = INT_GET(dic->di_atime.t_sec, ARCH_CONVERT);
buf->bs_atime.tv_nsec = INT_GET(dic->di_atime.t_nsec, ARCH_CONVERT);
-diff -NurpP --minimal linux-2.6.22.9/fs/xfs/xfs_mount.h linux-2.6.22.9-vs2.2.0.4/fs/xfs/xfs_mount.h
---- linux-2.6.22.9/fs/xfs/xfs_mount.h 2007-05-02 19:25:23 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/xfs/xfs_mount.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/xfs/xfs_mount.h 2007-05-02 19:25:23 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/xfs/xfs_mount.h 2007-06-15 02:37:04 +0200
@@ -464,6 +464,7 @@ typedef struct xfs_mount {
#define XFS_MOUNT_NO_PERCPU_SB (1ULL << 23) /* don't use per-cpu superblock
counters */
@@ -10071,9 +9662,8 @@
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-2.6.22.9/fs/xfs/xfs_vfsops.c linux-2.6.22.9-vs2.2.0.4/fs/xfs/xfs_vfsops.c
---- linux-2.6.22.9/fs/xfs/xfs_vfsops.c 2007-07-09 13:19:34 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/xfs/xfs_vfsops.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/xfs/xfs_vfsops.c 2007-07-09 13:19:34 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/xfs/xfs_vfsops.c 2007-06-15 02:37:04 +0200
@@ -300,6 +300,8 @@ xfs_start_flags(
if (ap->flags2 & XFSMNT2_COMPAT_IOSIZE)
@@ -10122,9 +9712,8 @@
} else if (!strcmp(this_char, "osyncisdsync")) {
/* no-op, this is now the default */
cmn_err(CE_WARN,
-diff -NurpP --minimal linux-2.6.22.9/fs/xfs/xfs_vnodeops.c linux-2.6.22.9-vs2.2.0.4/fs/xfs/xfs_vnodeops.c
---- linux-2.6.22.9/fs/xfs/xfs_vnodeops.c 2007-07-09 13:19:34 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/fs/xfs/xfs_vnodeops.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/fs/xfs/xfs_vnodeops.c 2007-07-09 13:19:34 +0200
++++ linux-2.6.22.10-vs2.2.0.5/fs/xfs/xfs_vnodeops.c 2007-06-15 02:37:04 +0200
@@ -159,6 +159,7 @@ xfs_getattr(
vap->va_mode = ip->i_d.di_mode;
vap->va_uid = ip->i_d.di_uid;
@@ -10220,9 +9809,8 @@
if (vap->va_xflags & XFS_XFLAG_APPEND)
di_flags |= XFS_DIFLAG_APPEND;
if (vap->va_xflags & XFS_XFLAG_SYNC)
-diff -NurpP --minimal linux-2.6.22.9/include/asm-arm/tlb.h linux-2.6.22.9-vs2.2.0.4/include/asm-arm/tlb.h
---- linux-2.6.22.9/include/asm-arm/tlb.h 2006-06-18 04:54:58 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/asm-arm/tlb.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/asm-arm/tlb.h 2006-06-18 04:54:58 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/asm-arm/tlb.h 2007-06-15 02:37:04 +0200
@@ -28,6 +28,7 @@
#else /* !CONFIG_MMU */
@@ -10231,9 +9819,8 @@
/*
* TLB handling. This allows us to remove pages from the page
-diff -NurpP --minimal linux-2.6.22.9/include/asm-arm26/tlb.h linux-2.6.22.9-vs2.2.0.4/include/asm-arm26/tlb.h
---- linux-2.6.22.9/include/asm-arm26/tlb.h 2006-01-03 17:30:02 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/asm-arm26/tlb.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/asm-arm26/tlb.h 2006-01-03 17:30:02 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/asm-arm26/tlb.h 2007-06-15 02:37:04 +0200
@@ -3,6 +3,7 @@
#include <asm/pgalloc.h>
@@ -10242,9 +9829,8 @@
/*
* TLB handling. This allows us to remove pages from the page
-diff -NurpP --minimal linux-2.6.22.9/include/asm-arm26/unistd.h linux-2.6.22.9-vs2.2.0.4/include/asm-arm26/unistd.h
---- linux-2.6.22.9/include/asm-arm26/unistd.h 2007-02-06 03:01:35 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/asm-arm26/unistd.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/asm-arm26/unistd.h 2007-02-06 03:01:35 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/asm-arm26/unistd.h 2007-06-15 02:37:04 +0200
@@ -302,6 +302,8 @@
#define __NR_mq_getsetattr (__NR_SYSCALL_BASE+279)
#define __NR_waitid (__NR_SYSCALL_BASE+280)
@@ -10254,9 +9840,8 @@
/*
* The following SWIs are ARM private. FIXME - make appropriate for arm26
*/
-diff -NurpP --minimal linux-2.6.22.9/include/asm-generic/tlb.h linux-2.6.22.9-vs2.2.0.4/include/asm-generic/tlb.h
---- linux-2.6.22.9/include/asm-generic/tlb.h 2006-11-30 21:19:31 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/asm-generic/tlb.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/asm-generic/tlb.h 2006-11-30 21:19:31 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/asm-generic/tlb.h 2007-06-15 02:37:04 +0200
@@ -14,6 +14,7 @@
#define _ASM_GENERIC__TLB_H
@@ -10265,9 +9850,8 @@
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.22.9/include/asm-ia64/tlb.h linux-2.6.22.9-vs2.2.0.4/include/asm-ia64/tlb.h
---- linux-2.6.22.9/include/asm-ia64/tlb.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/asm-ia64/tlb.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/asm-ia64/tlb.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/asm-ia64/tlb.h 2007-06-15 02:37:04 +0200
@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -10276,9 +9860,8 @@
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.22.9/include/asm-powerpc/systbl.h linux-2.6.22.9-vs2.2.0.4/include/asm-powerpc/systbl.h
---- linux-2.6.22.9/include/asm-powerpc/systbl.h 2007-07-09 13:19:44 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/asm-powerpc/systbl.h 2007-07-07 03:52:53 +0200
+--- linux-2.6.22.10/include/asm-powerpc/systbl.h 2007-07-09 13:19:44 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/asm-powerpc/systbl.h 2007-07-07 03:52:53 +0200
@@ -260,7 +260,7 @@ COMPAT_SYS_SPU(fstatfs64)
SYSX(sys_ni_syscall, ppc_fadvise64_64, ppc_fadvise64_64)
PPC_SYS_SPU(rtas)
@@ -10288,9 +9871,8 @@
COMPAT_SYS(migrate_pages)
COMPAT_SYS(mbind)
COMPAT_SYS(get_mempolicy)
-diff -NurpP --minimal linux-2.6.22.9/include/asm-powerpc/unistd.h linux-2.6.22.9-vs2.2.0.4/include/asm-powerpc/unistd.h
---- linux-2.6.22.9/include/asm-powerpc/unistd.h 2007-07-09 13:19:45 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/asm-powerpc/unistd.h 2007-07-07 03:52:53 +0200
+--- linux-2.6.22.10/include/asm-powerpc/unistd.h 2007-07-09 13:19:45 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/asm-powerpc/unistd.h 2007-07-07 03:52:53 +0200
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -10300,9 +9882,8 @@
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-2.6.22.9/include/asm-s390/unistd.h linux-2.6.22.9-vs2.2.0.4/include/asm-s390/unistd.h
---- linux-2.6.22.9/include/asm-s390/unistd.h 2007-07-09 13:19:45 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/asm-s390/unistd.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/asm-s390/unistd.h 2007-07-09 13:19:45 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/asm-s390/unistd.h 2007-06-15 02:37:04 +0200
@@ -202,7 +202,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
@@ -10312,9 +9893,8 @@
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-2.6.22.9/include/asm-sparc/unistd.h linux-2.6.22.9-vs2.2.0.4/include/asm-sparc/unistd.h
---- linux-2.6.22.9/include/asm-sparc/unistd.h 2007-07-09 13:19:54 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/asm-sparc/unistd.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/asm-sparc/unistd.h 2007-07-09 13:19:54 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/asm-sparc/unistd.h 2007-06-15 02:37:04 +0200
@@ -283,7 +283,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -10324,9 +9904,8 @@
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-2.6.22.9/include/asm-sparc64/tlb.h linux-2.6.22.9-vs2.2.0.4/include/asm-sparc64/tlb.h
---- linux-2.6.22.9/include/asm-sparc64/tlb.h 2007-07-09 13:19:54 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/asm-sparc64/tlb.h 2007-07-07 03:54:19 +0200
+--- linux-2.6.22.10/include/asm-sparc64/tlb.h 2007-07-09 13:19:54 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/asm-sparc64/tlb.h 2007-07-07 03:54:19 +0200
@@ -3,6 +3,7 @@
#include <linux/swap.h>
@@ -10335,9 +9914,8 @@
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
-diff -NurpP --minimal linux-2.6.22.9/include/asm-sparc64/unistd.h linux-2.6.22.9-vs2.2.0.4/include/asm-sparc64/unistd.h
---- linux-2.6.22.9/include/asm-sparc64/unistd.h 2007-07-09 13:19:54 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/asm-sparc64/unistd.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/asm-sparc64/unistd.h 2007-07-09 13:19:54 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/asm-sparc64/unistd.h 2007-06-15 02:37:04 +0200
@@ -285,7 +285,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -10347,9 +9925,8 @@
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-2.6.22.9/include/asm-x86_64/unistd.h linux-2.6.22.9-vs2.2.0.4/include/asm-x86_64/unistd.h
---- linux-2.6.22.9/include/asm-x86_64/unistd.h 2007-07-09 13:19:55 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/asm-x86_64/unistd.h 2007-07-07 03:52:53 +0200
+--- linux-2.6.22.10/include/asm-x86_64/unistd.h 2007-07-09 13:19:55 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/asm-x86_64/unistd.h 2007-07-07 03:52:53 +0200
@@ -532,7 +532,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
#define __NR_utimes 235
__SYSCALL(__NR_utimes, sys_utimes)
@@ -10359,9 +9936,8 @@
#define __NR_mbind 237
__SYSCALL(__NR_mbind, sys_mbind)
#define __NR_set_mempolicy 238
-diff -NurpP --minimal linux-2.6.22.9/include/linux/Kbuild linux-2.6.22.9-vs2.2.0.4/include/linux/Kbuild
---- linux-2.6.22.9/include/linux/Kbuild 2007-09-30 15:54:34 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/Kbuild 2007-10-01 15:25:35 +0200
+--- linux-2.6.22.10/include/linux/Kbuild 2007-10-30 01:57:14 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/Kbuild 2007-10-01 15:25:35 +0200
@@ -351,3 +351,6 @@ unifdef-y += xattr.h
unifdef-y += xfrm.h
@@ -10369,9 +9945,8 @@
+
+header-y += vserver/
+
-diff -NurpP --minimal linux-2.6.22.9/include/linux/capability.h linux-2.6.22.9-vs2.2.0.4/include/linux/capability.h
---- linux-2.6.22.9/include/linux/capability.h 2007-07-09 13:19:55 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/capability.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/capability.h 2007-07-09 13:19:55 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/capability.h 2007-06-15 02:37:04 +0200
@@ -237,6 +237,7 @@ typedef __u32 kernel_cap_t;
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
@@ -10392,9 +9967,8 @@
#ifdef __KERNEL__
/*
* Bounding set
-diff -NurpP --minimal linux-2.6.22.9/include/linux/devpts_fs.h linux-2.6.22.9-vs2.2.0.4/include/linux/devpts_fs.h
---- linux-2.6.22.9/include/linux/devpts_fs.h 2004-08-14 12:55:59 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/devpts_fs.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/devpts_fs.h 2004-08-14 12:55:59 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/devpts_fs.h 2007-06-15 02:37:04 +0200
@@ -30,5 +30,7 @@ static inline void devpts_pty_kill(int n
#endif
@@ -10403,9 +9977,8 @@
+
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/ext2_fs.h linux-2.6.22.9-vs2.2.0.4/include/linux/ext2_fs.h
---- linux-2.6.22.9/include/linux/ext2_fs.h 2006-11-30 21:19:37 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/ext2_fs.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/ext2_fs.h 2006-11-30 21:19:37 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/ext2_fs.h 2007-06-15 02:37:04 +0200
@@ -188,6 +188,8 @@ 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) */
@@ -10444,9 +10017,8 @@
#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-2.6.22.9/include/linux/ext3_fs.h linux-2.6.22.9-vs2.2.0.4/include/linux/ext3_fs.h
---- linux-2.6.22.9/include/linux/ext3_fs.h 2007-07-09 13:19:56 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/ext3_fs.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/ext3_fs.h 2007-07-09 13:19:56 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/ext3_fs.h 2007-06-15 02:37:04 +0200
@@ -177,10 +177,20 @@ struct ext3_group_desc
#define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
#define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
@@ -10501,9 +10073,8 @@
extern void ext3_read_inode (struct inode *);
extern int ext3_write_inode (struct inode *, int);
-diff -NurpP --minimal linux-2.6.22.9/include/linux/ext4_fs.h linux-2.6.22.9-vs2.2.0.4/include/linux/ext4_fs.h
---- linux-2.6.22.9/include/linux/ext4_fs.h 2007-07-09 13:19:56 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/ext4_fs.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/ext4_fs.h 2007-07-09 13:19:56 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/ext4_fs.h 2007-06-15 02:37:04 +0200
@@ -189,11 +189,21 @@ struct ext4_group_desc
#define EXT4_NOTAIL_FL 0x00008000 /* file tail should not be merged */
#define EXT4_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
@@ -10561,9 +10132,8 @@
extern void ext4_read_inode (struct inode *);
extern int ext4_write_inode (struct inode *, int);
-diff -NurpP --minimal linux-2.6.22.9/include/linux/fs.h linux-2.6.22.9-vs2.2.0.4/include/linux/fs.h
---- linux-2.6.22.9/include/linux/fs.h 2007-07-09 13:19:56 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/fs.h 2007-07-07 03:52:54 +0200
+--- linux-2.6.22.10/include/linux/fs.h 2007-07-09 13:19:56 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/fs.h 2007-10-29 23:24:21 +0100
@@ -123,6 +123,8 @@ extern int dir_notify_enable;
#define MS_SLAVE (1<<19) /* change to slave */
#define MS_SHARED (1<<20) /* change to shared */
@@ -10725,15 +10295,7 @@
/*
* NOTE: write_inode, delete_inode, clear_inode, put_inode can be called
-@@ -1763,6 +1795,7 @@ extern ssize_t generic_file_buffered_wri
- extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos);
- extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos);
- extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *);
-+extern ssize_t generic_file_sendpage(struct file *, struct page *, int, size_t, loff_t *, int);
- extern void do_generic_mapping_read(struct address_space *mapping,
- struct file_ra_state *, struct file *,
- loff_t *, read_descriptor_t *, read_actor_t);
-@@ -1898,6 +1931,7 @@ extern int dcache_dir_open(struct inode
+@@ -1898,6 +1930,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);
@@ -10741,9 +10303,8 @@
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
extern int simple_link(struct dentry *, struct inode *, struct dentry *);
-diff -NurpP --minimal linux-2.6.22.9/include/linux/init_task.h linux-2.6.22.9-vs2.2.0.4/include/linux/init_task.h
---- linux-2.6.22.9/include/linux/init_task.h 2007-07-09 13:19:56 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/init_task.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/init_task.h 2007-07-09 13:19:56 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/init_task.h 2007-06-15 02:37:04 +0200
@@ -169,6 +169,10 @@ extern struct group_info init_groups;
}, \
INIT_TRACE_IRQFLAGS \
@@ -10755,9 +10316,8 @@
}
-diff -NurpP --minimal linux-2.6.22.9/include/linux/ipc.h linux-2.6.22.9-vs2.2.0.4/include/linux/ipc.h
---- linux-2.6.22.9/include/linux/ipc.h 2007-07-09 13:19:56 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/ipc.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/ipc.h 2007-07-09 13:19:56 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/ipc.h 2007-06-15 02:37:04 +0200
@@ -63,6 +63,7 @@ struct kern_ipc_perm
key_t key;
uid_t uid;
@@ -10766,9 +10326,8 @@
uid_t cuid;
gid_t cgid;
mode_t mode;
-diff -NurpP --minimal linux-2.6.22.9/include/linux/loop.h linux-2.6.22.9-vs2.2.0.4/include/linux/loop.h
---- linux-2.6.22.9/include/linux/loop.h 2007-07-09 13:19:56 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/loop.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/loop.h 2007-07-09 13:19:56 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/loop.h 2007-06-15 02:37:04 +0200
@@ -45,6 +45,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
@@ -10777,9 +10336,8 @@
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-2.6.22.9/include/linux/major.h linux-2.6.22.9-vs2.2.0.4/include/linux/major.h
---- linux-2.6.22.9/include/linux/major.h 2007-07-09 13:19:56 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/major.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/major.h 2007-07-09 13:19:56 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/major.h 2007-06-15 02:37:04 +0200
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
@@ -10788,9 +10346,8 @@
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-2.6.22.9/include/linux/mount.h linux-2.6.22.9-vs2.2.0.4/include/linux/mount.h
---- linux-2.6.22.9/include/linux/mount.h 2007-07-09 13:19:56 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/mount.h 2007-06-15 03:54:15 +0200
+--- linux-2.6.22.10/include/linux/mount.h 2007-07-09 13:19:56 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/mount.h 2007-06-15 03:54:15 +0200
@@ -28,12 +28,16 @@ struct mnt_namespace;
#define MNT_NOATIME 0x08
#define MNT_NODIRATIME 0x10
@@ -10816,9 +10373,8 @@
};
static inline struct vfsmount *mntget(struct vfsmount *mnt)
-diff -NurpP --minimal linux-2.6.22.9/include/linux/net.h linux-2.6.22.9-vs2.2.0.4/include/linux/net.h
---- linux-2.6.22.9/include/linux/net.h 2007-07-09 13:19:56 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/net.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/net.h 2007-07-09 13:19:56 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/net.h 2007-06-15 02:37:04 +0200
@@ -63,6 +63,7 @@ typedef enum {
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
@@ -10827,9 +10383,8 @@
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-2.6.22.9/include/linux/nfs_mount.h linux-2.6.22.9-vs2.2.0.4/include/linux/nfs_mount.h
---- linux-2.6.22.9/include/linux/nfs_mount.h 2007-07-09 13:20:00 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/nfs_mount.h 2007-06-15 03:54:39 +0200
+--- linux-2.6.22.10/include/linux/nfs_mount.h 2007-07-09 13:20:00 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/nfs_mount.h 2007-06-15 03:54:39 +0200
@@ -62,6 +62,7 @@ struct nfs_mount_data {
#define NFS_MOUNT_STRICTLOCK 0x1000 /* reserved for NFSv4 */
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
@@ -10838,9 +10393,8 @@
#define NFS_MOUNT_FLAGMASK 0xFFFF
#endif
-diff -NurpP --minimal linux-2.6.22.9/include/linux/nsproxy.h linux-2.6.22.9-vs2.2.0.4/include/linux/nsproxy.h
---- linux-2.6.22.9/include/linux/nsproxy.h 2007-07-09 13:20:00 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/nsproxy.h 2007-07-17 03:02:15 +0200
+--- linux-2.6.22.10/include/linux/nsproxy.h 2007-07-09 13:20:00 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/nsproxy.h 2007-07-17 03:02:15 +0200
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -10899,9 +10453,8 @@
}
+
#endif
-diff -NurpP --minimal linux-2.6.22.9/include/linux/pid.h linux-2.6.22.9-vs2.2.0.4/include/linux/pid.h
---- linux-2.6.22.9/include/linux/pid.h 2007-07-09 13:20:00 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/pid.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/pid.h 2007-07-09 13:20:00 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/pid.h 2007-06-15 02:37:04 +0200
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
@@ -10912,9 +10465,8 @@
};
/*
-diff -NurpP --minimal linux-2.6.22.9/include/linux/proc_fs.h linux-2.6.22.9-vs2.2.0.4/include/linux/proc_fs.h
---- linux-2.6.22.9/include/linux/proc_fs.h 2007-07-09 13:20:00 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/proc_fs.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/proc_fs.h 2007-07-09 13:20:00 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/proc_fs.h 2007-06-15 02:37:04 +0200
@@ -54,6 +54,7 @@ struct proc_dir_entry {
nlink_t nlink;
uid_t uid;
@@ -10944,9 +10496,8 @@
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-2.6.22.9/include/linux/reiserfs_fs.h linux-2.6.22.9-vs2.2.0.4/include/linux/reiserfs_fs.h
---- linux-2.6.22.9/include/linux/reiserfs_fs.h 2007-05-02 19:25:34 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/reiserfs_fs.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/reiserfs_fs.h 2007-05-02 19:25:34 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/reiserfs_fs.h 2007-06-15 02:37:04 +0200
@@ -821,6 +821,10 @@ struct stat_data_v1 {
#define REISERFS_COMPR_FL FS_COMPR_FL
#define REISERFS_NOTAIL_FL FS_NOTAIL_FL
@@ -10981,9 +10532,8 @@
/* namei.c */
void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
-diff -NurpP --minimal linux-2.6.22.9/include/linux/reiserfs_fs_sb.h linux-2.6.22.9-vs2.2.0.4/include/linux/reiserfs_fs_sb.h
---- linux-2.6.22.9/include/linux/reiserfs_fs_sb.h 2007-07-09 13:20:00 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/reiserfs_fs_sb.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/reiserfs_fs_sb.h 2007-07-09 13:20:00 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/reiserfs_fs_sb.h 2007-06-15 02:37:04 +0200
@@ -458,6 +458,7 @@ enum reiserfs_mount_options {
REISERFS_POSIXACL,
REISERFS_BARRIER_NONE,
@@ -10992,9 +10542,8 @@
/* Actions on error */
REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-2.6.22.9/include/linux/sched.h linux-2.6.22.9-vs2.2.0.4/include/linux/sched.h
---- linux-2.6.22.9/include/linux/sched.h 2007-07-09 13:20:01 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/sched.h 2007-06-17 05:54:19 +0200
+--- linux-2.6.22.10/include/linux/sched.h 2007-07-09 13:20:01 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/sched.h 2007-06-17 05:54:19 +0200
@@ -26,6 +26,7 @@
#define CLONE_STOPPED 0x02000000 /* Start in stopped state */
#define CLONE_NEWUTS 0x04000000 /* New utsname group? */
@@ -11125,9 +10674,8 @@
static inline struct user_struct *get_uid(struct user_struct *u)
{
atomic_inc(&u->__count);
-diff -NurpP --minimal linux-2.6.22.9/include/linux/shmem_fs.h linux-2.6.22.9-vs2.2.0.4/include/linux/shmem_fs.h
---- linux-2.6.22.9/include/linux/shmem_fs.h 2006-11-30 21:19:39 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/shmem_fs.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/shmem_fs.h 2006-11-30 21:19:39 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/shmem_fs.h 2007-06-15 02:37:04 +0200
@@ -8,6 +8,9 @@
#define SHMEM_NR_DIRECT 16
@@ -11138,9 +10686,8 @@
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-2.6.22.9/include/linux/stat.h linux-2.6.22.9-vs2.2.0.4/include/linux/stat.h
---- linux-2.6.22.9/include/linux/stat.h 2007-07-09 13:20:01 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/stat.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/stat.h 2007-07-09 13:20:01 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/stat.h 2007-06-15 02:37:04 +0200
@@ -66,6 +66,7 @@ struct kstat {
unsigned int nlink;
uid_t uid;
@@ -11149,9 +10696,8 @@
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-2.6.22.9/include/linux/sunrpc/auth.h linux-2.6.22.9-vs2.2.0.4/include/linux/sunrpc/auth.h
---- linux-2.6.22.9/include/linux/sunrpc/auth.h 2006-11-30 21:19:40 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/sunrpc/auth.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/sunrpc/auth.h 2006-11-30 21:19:40 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/sunrpc/auth.h 2007-06-15 02:37:04 +0200
@@ -24,6 +24,7 @@
struct auth_cred {
uid_t uid;
@@ -11160,9 +10706,8 @@
struct group_info *group_info;
};
-diff -NurpP --minimal linux-2.6.22.9/include/linux/sunrpc/clnt.h linux-2.6.22.9-vs2.2.0.4/include/linux/sunrpc/clnt.h
---- linux-2.6.22.9/include/linux/sunrpc/clnt.h 2007-07-09 13:20:01 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/sunrpc/clnt.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/sunrpc/clnt.h 2007-07-09 13:20:01 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/sunrpc/clnt.h 2007-06-15 02:37:04 +0200
@@ -43,7 +43,8 @@ struct rpc_clnt {
cl_discrtry : 1,/* disconnect before retry */
cl_autobind : 1,/* use getport() */
@@ -11173,9 +10718,8 @@
struct rpc_rtt * cl_rtt; /* RTO estimator data */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/syscalls.h linux-2.6.22.9-vs2.2.0.4/include/linux/syscalls.h
---- linux-2.6.22.9/include/linux/syscalls.h 2007-07-09 13:20:01 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/syscalls.h 2007-07-07 03:52:54 +0200
+--- linux-2.6.22.10/include/linux/syscalls.h 2007-07-09 13:20:01 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/syscalls.h 2007-07-07 03:52:54 +0200
@@ -294,6 +294,8 @@ asmlinkage long sys_symlink(const char _
asmlinkage long sys_unlink(const char __user *pathname);
asmlinkage long sys_rename(const char __user *oldname,
@@ -11185,9 +10729,8 @@
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-2.6.22.9/include/linux/sysctl.h linux-2.6.22.9-vs2.2.0.4/include/linux/sysctl.h
---- linux-2.6.22.9/include/linux/sysctl.h 2007-07-09 13:20:01 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/sysctl.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/sysctl.h 2007-07-09 13:20:01 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/sysctl.h 2007-06-15 02:37:04 +0200
@@ -106,6 +106,7 @@ enum
KERN_CAP_BSET=14, /* int: capability bounding set */
KERN_PANIC=15, /* int: panic timeout */
@@ -11196,9 +10739,8 @@
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/sysfs.h linux-2.6.22.9-vs2.2.0.4/include/linux/sysfs.h
---- linux-2.6.22.9/include/linux/sysfs.h 2007-07-09 13:20:01 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/sysfs.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/sysfs.h 2007-07-09 13:20:01 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/sysfs.h 2007-06-15 02:37:04 +0200
@@ -15,6 +15,8 @@
#include <linux/list.h>
#include <asm/atomic.h>
@@ -11208,9 +10750,8 @@
struct kobject;
struct module;
struct nameidata;
-diff -NurpP --minimal linux-2.6.22.9/include/linux/time.h linux-2.6.22.9-vs2.2.0.4/include/linux/time.h
---- linux-2.6.22.9/include/linux/time.h 2007-07-09 13:20:01 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/time.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/time.h 2007-07-09 13:20:01 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/time.h 2007-06-15 02:37:04 +0200
@@ -176,6 +176,9 @@ static inline void timespec_add_ns(struc
}
a->tv_nsec = ns;
@@ -11221,9 +10762,8 @@
#endif /* __KERNEL__ */
#define NFDBITS __NFDBITS
-diff -NurpP --minimal linux-2.6.22.9/include/linux/types.h linux-2.6.22.9-vs2.2.0.4/include/linux/types.h
---- linux-2.6.22.9/include/linux/types.h 2007-02-06 03:01:52 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/types.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/types.h 2007-02-06 03:01:52 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/types.h 2007-06-15 02:37:04 +0200
@@ -39,6 +39,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
@@ -11234,9 +10774,8 @@
#ifdef CONFIG_UID16
/* This is defined by include/asm-{arch}/posix_types.h */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vroot.h linux-2.6.22.9-vs2.2.0.4/include/linux/vroot.h
---- linux-2.6.22.9/include/linux/vroot.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vroot.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vroot.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vroot.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,51 @@
+
+/*
@@ -11289,9 +10828,8 @@
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vs_base.h linux-2.6.22.9-vs2.2.0.4/include/linux/vs_base.h
---- linux-2.6.22.9/include/linux/vs_base.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vs_base.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vs_base.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vs_base.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,9 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
@@ -11302,9 +10840,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vs_context.h linux-2.6.22.9-vs2.2.0.4/include/linux/vs_context.h
---- linux-2.6.22.9/include/linux/vs_context.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vs_context.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vs_context.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vs_context.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,224 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
@@ -11530,9 +11067,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vs_cowbl.h linux-2.6.22.9-vs2.2.0.4/include/linux/vs_cowbl.h
---- linux-2.6.22.9/include/linux/vs_cowbl.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vs_cowbl.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vs_cowbl.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vs_cowbl.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,44 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
@@ -11578,9 +11114,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vs_cvirt.h linux-2.6.22.9-vs2.2.0.4/include/linux/vs_cvirt.h
---- linux-2.6.22.9/include/linux/vs_cvirt.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vs_cvirt.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vs_cvirt.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vs_cvirt.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,49 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
@@ -11631,9 +11166,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vs_dlimit.h linux-2.6.22.9-vs2.2.0.4/include/linux/vs_dlimit.h
---- linux-2.6.22.9/include/linux/vs_dlimit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vs_dlimit.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vs_dlimit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vs_dlimit.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,209 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
@@ -11844,9 +11378,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vs_limit.h linux-2.6.22.9-vs2.2.0.4/include/linux/vs_limit.h
---- linux-2.6.22.9/include/linux/vs_limit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vs_limit.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vs_limit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vs_limit.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
@@ -11988,9 +11521,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vs_memory.h linux-2.6.22.9-vs2.2.0.4/include/linux/vs_memory.h
---- linux-2.6.22.9/include/linux/vs_memory.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vs_memory.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vs_memory.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vs_memory.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,159 @@
+#ifndef _VS_MEMORY_H
+#define _VS_MEMORY_H
@@ -12151,9 +11683,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vs_network.h linux-2.6.22.9-vs2.2.0.4/include/linux/vs_network.h
---- linux-2.6.22.9/include/linux/vs_network.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vs_network.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vs_network.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vs_network.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,185 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
@@ -12340,9 +11871,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vs_pid.h linux-2.6.22.9-vs2.2.0.4/include/linux/vs_pid.h
---- linux-2.6.22.9/include/linux/vs_pid.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vs_pid.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vs_pid.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vs_pid.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,133 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
@@ -12477,9 +12007,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vs_sched.h linux-2.6.22.9-vs2.2.0.4/include/linux/vs_sched.h
---- linux-2.6.22.9/include/linux/vs_sched.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vs_sched.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vs_sched.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vs_sched.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,110 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
@@ -12591,9 +12120,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vs_socket.h linux-2.6.22.9-vs2.2.0.4/include/linux/vs_socket.h
---- linux-2.6.22.9/include/linux/vs_socket.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vs_socket.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vs_socket.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vs_socket.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
@@ -12662,9 +12190,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vs_tag.h linux-2.6.22.9-vs2.2.0.4/include/linux/vs_tag.h
---- linux-2.6.22.9/include/linux/vs_tag.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vs_tag.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vs_tag.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vs_tag.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,43 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
@@ -12709,9 +12236,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vs_time.h linux-2.6.22.9-vs2.2.0.4/include/linux/vs_time.h
---- linux-2.6.22.9/include/linux/vs_time.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vs_time.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vs_time.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vs_time.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
@@ -12732,9 +12258,8 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/Kbuild linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/Kbuild
---- linux-2.6.22.9/include/linux/vserver/Kbuild 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/Kbuild 2007-06-16 19:48:30 +0200
+--- linux-2.6.22.10/include/linux/vserver/Kbuild 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/Kbuild 2007-06-16 19:48:30 +0200
@@ -0,0 +1,9 @@
+
+unifdef-y += context_cmd.h network_cmd.h space_cmd.h \
@@ -12745,9 +12270,8 @@
+
+unifdef-y += legacy.h
+
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/base.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/base.h
---- linux-2.6.22.9/include/linux/vserver/base.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/base.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/base.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/base.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,236 @@
+#ifndef _VX_BASE_H
+#define _VX_BASE_H
@@ -12985,9 +12509,8 @@
+#define nx_info_state(v, m) (__nx_state(v) & (m))
+
+#endif
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/cacct.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/cacct.h
---- linux-2.6.22.9/include/linux/vserver/cacct.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/cacct.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/cacct.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/cacct.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,15 @@
+#ifndef _VX_CACCT_H
+#define _VX_CACCT_H
@@ -13004,9 +12527,8 @@
+};
+
+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/cacct_cmd.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/cacct_cmd.h
---- linux-2.6.22.9/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/cacct_cmd.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/cacct_cmd.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,23 @@
+#ifndef _VX_CACCT_CMD_H
+#define _VX_CACCT_CMD_H
@@ -13031,9 +12553,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/cacct_def.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/cacct_def.h
---- linux-2.6.22.9/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/cacct_def.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/cacct_def.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,43 @@
+#ifndef _VX_CACCT_DEF_H
+#define _VX_CACCT_DEF_H
@@ -13078,9 +12599,8 @@
+#endif
+
+#endif /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/cacct_int.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/cacct_int.h
---- linux-2.6.22.9/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/cacct_int.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/cacct_int.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,21 @@
+#ifndef _VX_CACCT_INT_H
+#define _VX_CACCT_INT_H
@@ -13103,9 +12623,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/context.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/context.h
---- linux-2.6.22.9/include/linux/vserver/context.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/context.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/context.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/context.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,172 @@
+#ifndef _VX_CONTEXT_H
+#define _VX_CONTEXT_H
@@ -13279,9 +12798,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/context_cmd.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/context_cmd.h
---- linux-2.6.22.9/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/context_cmd.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/context_cmd.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,123 @@
+#ifndef _VX_CONTEXT_CMD_H
+#define _VX_CONTEXT_CMD_H
@@ -13406,9 +12924,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/cvirt.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/cvirt.h
---- linux-2.6.22.9/include/linux/vserver/cvirt.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/cvirt.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/cvirt.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/cvirt.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,20 @@
+#ifndef _VX_CVIRT_H
+#define _VX_CVIRT_H
@@ -13430,9 +12947,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/cvirt_cmd.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/cvirt_cmd.h
---- linux-2.6.22.9/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/cvirt_cmd.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/cvirt_cmd.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,53 @@
+#ifndef _VX_CVIRT_CMD_H
+#define _VX_CVIRT_CMD_H
@@ -13487,9 +13003,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/cvirt_def.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/cvirt_def.h
---- linux-2.6.22.9/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/cvirt_def.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/cvirt_def.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,81 @@
+#ifndef _VX_CVIRT_DEF_H
+#define _VX_CVIRT_DEF_H
@@ -13572,10 +13087,9 @@
+#endif
+
+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/debug.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/debug.h
---- linux-2.6.22.9/include/linux/vserver/debug.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/debug.h 2007-06-16 05:47:03 +0200
-@@ -0,0 +1,113 @@
+--- linux-2.6.22.10/include/linux/vserver/debug.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/debug.h 2007-10-29 23:39:46 +0100
+@@ -0,0 +1,124 @@
+#ifndef _VX_DEBUG_H
+#define _VX_DEBUG_H
+
@@ -13664,11 +13178,14 @@
+#ifdef CONFIG_VSERVER_WARN
+
+#define VX_WARNLEVEL KERN_WARNING "vxW: "
++#define VX_WARN_TASK "[»%s«,%u:#%u|%u] "
++#define VX_WARN_XID "[xid #%u] "
++#define VX_WARN_NID "[nid #%u] "
+
+#define vxwprintk(c, f, x...) \
+ do { \
+ if (c) \
-+ printk(VX_WARNLEVEL f "\n" , ##x); \
++ printk(VX_WARNLEVEL f "\n", ##x); \
+ } while (0)
+
+#else /* CONFIG_VSERVER_WARN */
@@ -13677,6 +13194,14 @@
+
+#endif /* CONFIG_VSERVER_WARN */
+
++#define vxwprintk_task(c, f, x...) \
++ vxwprintk(c, VX_WARN_TASK f, \
++ current->comm, current->pid, \
++ current->xid, current->nid, ##x)
++#define vxwprintk_xid(c, f, x...) \
++ vxwprintk(c, VX_WARN_XID f, current->xid, x)
++#define vxwprintk_nid(c, f, x...) \
++ vxwprintk(c, VX_WARN_NID f, current->nid, x)
+
+#ifdef CONFIG_VSERVER_DEBUG
+#define vxd_assert_lock(l) assert_spin_locked(l)
@@ -13689,9 +13214,8 @@
+
+
+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/debug_cmd.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/debug_cmd.h
---- linux-2.6.22.9/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/debug_cmd.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/debug_cmd.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,58 @@
+#ifndef _VX_DEBUG_CMD_H
+#define _VX_DEBUG_CMD_H
@@ -13751,9 +13275,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/dlimit.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/dlimit.h
---- linux-2.6.22.9/include/linux/vserver/dlimit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/dlimit.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/dlimit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/dlimit.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,53 @@
+#ifndef _VX_DLIMIT_H
+#define _VX_DLIMIT_H
@@ -13808,9 +13331,8 @@
+#else /* _VX_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/dlimit_cmd.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/dlimit_cmd.h
---- linux-2.6.22.9/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/dlimit_cmd.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/dlimit_cmd.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,74 @@
+#ifndef _VX_DLIMIT_CMD_H
+#define _VX_DLIMIT_CMD_H
@@ -13886,9 +13408,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/global.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/global.h
---- linux-2.6.22.9/include/linux/vserver/global.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/global.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/global.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/global.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,18 @@
+#ifndef _VX_GLOBAL_H
+#define _VX_GLOBAL_H
@@ -13908,9 +13429,8 @@
+
+
+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/history.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/history.h
---- linux-2.6.22.9/include/linux/vserver/history.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/history.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/history.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/history.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,197 @@
+#ifndef _VX_HISTORY_H
+#define _VX_HISTORY_H
@@ -14109,9 +13629,8 @@
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/inode.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/inode.h
---- linux-2.6.22.9/include/linux/vserver/inode.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/inode.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/inode.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/inode.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,38 @@
+#ifndef _VX_INODE_H
+#define _VX_INODE_H
@@ -14151,9 +13670,8 @@
+#else /* _VX_INODE_H */
+#warning duplicate inclusion
+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/inode_cmd.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/inode_cmd.h
---- linux-2.6.22.9/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/inode_cmd.h 2007-07-16 06:38:22 +0200
+--- linux-2.6.22.10/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/inode_cmd.h 2007-07-16 06:38:22 +0200
@@ -0,0 +1,59 @@
+#ifndef _VX_INODE_CMD_H
+#define _VX_INODE_CMD_H
@@ -14214,9 +13732,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/legacy.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/legacy.h
---- linux-2.6.22.9/include/linux/vserver/legacy.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/legacy.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/legacy.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/legacy.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,49 @@
+#ifndef _VX_LEGACY_H
+#define _VX_LEGACY_H
@@ -14267,9 +13784,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LEGACY_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/limit.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/limit.h
---- linux-2.6.22.9/include/linux/vserver/limit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/limit.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/limit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/limit.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,68 @@
+#ifndef _VX_LIMIT_H
+#define _VX_LIMIT_H
@@ -14339,9 +13855,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/limit_cmd.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/limit_cmd.h
---- linux-2.6.22.9/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/limit_cmd.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/limit_cmd.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,69 @@
+#ifndef _VX_LIMIT_CMD_H
+#define _VX_LIMIT_CMD_H
@@ -14412,9 +13927,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/limit_def.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/limit_def.h
---- linux-2.6.22.9/include/linux/vserver/limit_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/limit_def.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/limit_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/limit_def.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,47 @@
+#ifndef _VX_LIMIT_DEF_H
+#define _VX_LIMIT_DEF_H
@@ -14463,9 +13977,8 @@
+#endif
+
+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/limit_int.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/limit_int.h
---- linux-2.6.22.9/include/linux/vserver/limit_int.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/limit_int.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/limit_int.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/limit_int.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,198 @@
+#ifndef _VX_LIMIT_INT_H
+#define _VX_LIMIT_INT_H
@@ -14665,9 +14178,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/monitor.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/monitor.h
---- linux-2.6.22.9/include/linux/vserver/monitor.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/monitor.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/monitor.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/monitor.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,95 @@
+#ifndef _VX_MONITOR_H
+#define _VX_MONITOR_H
@@ -14764,9 +14276,8 @@
+
+
+#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/network.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/network.h
---- linux-2.6.22.9/include/linux/vserver/network.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/network.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/network.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/network.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,142 @@
+#ifndef _VX_NETWORK_H
+#define _VX_NETWORK_H
@@ -14910,9 +14421,8 @@
+#else /* _VX_NETWORK_H */
+#warning duplicate inclusion
+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/network_cmd.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/network_cmd.h
---- linux-2.6.22.9/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/network_cmd.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/network_cmd.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,89 @@
+#ifndef _VX_NETWORK_CMD_H
+#define _VX_NETWORK_CMD_H
@@ -15003,9 +14513,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/percpu.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/percpu.h
---- linux-2.6.22.9/include/linux/vserver/percpu.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/percpu.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/percpu.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/percpu.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,14 @@
+#ifndef _VX_PERCPU_H
+#define _VX_PERCPU_H
@@ -15021,9 +14530,8 @@
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VX_PERCPU_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/sched.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/sched.h
---- linux-2.6.22.9/include/linux/vserver/sched.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/sched.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/sched.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/sched.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,26 @@
+#ifndef _VX_SCHED_H
+#define _VX_SCHED_H
@@ -15051,9 +14559,8 @@
+#else /* _VX_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VX_SCHED_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/sched_cmd.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/sched_cmd.h
---- linux-2.6.22.9/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/sched_cmd.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/sched_cmd.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,108 @@
+#ifndef _VX_SCHED_CMD_H
+#define _VX_SCHED_CMD_H
@@ -15163,9 +14670,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/sched_def.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/sched_def.h
---- linux-2.6.22.9/include/linux/vserver/sched_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/sched_def.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/sched_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/sched_def.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,68 @@
+#ifndef _VX_SCHED_DEF_H
+#define _VX_SCHED_DEF_H
@@ -15235,9 +14741,8 @@
+#endif
+
+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/signal.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/signal.h
---- linux-2.6.22.9/include/linux/vserver/signal.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/signal.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/signal.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/signal.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,14 @@
+#ifndef _VX_SIGNAL_H
+#define _VX_SIGNAL_H
@@ -15253,9 +14758,8 @@
+#else /* _VX_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/signal_cmd.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/signal_cmd.h
---- linux-2.6.22.9/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/signal_cmd.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/signal_cmd.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,43 @@
+#ifndef _VX_SIGNAL_CMD_H
+#define _VX_SIGNAL_CMD_H
@@ -15300,9 +14804,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/space.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/space.h
---- linux-2.6.22.9/include/linux/vserver/space.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/space.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/space.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/space.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,13 @@
+#ifndef _VX_SPACE_H
+#define _VX_SPACE_H
@@ -15317,9 +14820,8 @@
+#else /* _VX_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VX_SPACE_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/space_cmd.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/space_cmd.h
---- linux-2.6.22.9/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/space_cmd.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/space_cmd.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,26 @@
+#ifndef _VX_SPACE_CMD_H
+#define _VX_SPACE_CMD_H
@@ -15347,9 +14849,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SPACE_CMD_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/switch.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/switch.h
---- linux-2.6.22.9/include/linux/vserver/switch.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/switch.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/switch.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/switch.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,95 @@
+#ifndef _VX_SWITCH_H
+#define _VX_SWITCH_H
@@ -15446,9 +14947,8 @@
+#endif /* __KERNEL__ */
+
+#endif /* _VX_SWITCH_H */
-diff -NurpP --minimal linux-2.6.22.9/include/linux/vserver/tag.h linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/tag.h
---- linux-2.6.22.9/include/linux/vserver/tag.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/include/linux/vserver/tag.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/linux/vserver/tag.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/include/linux/vserver/tag.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,140 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
@@ -15590,9 +15090,8 @@
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-2.6.22.9/include/net/af_unix.h linux-2.6.22.9-vs2.2.0.4/include/net/af_unix.h
---- linux-2.6.22.9/include/net/af_unix.h 2007-07-09 13:20:01 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/net/af_unix.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/net/af_unix.h 2007-07-09 13:20:01 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/net/af_unix.h 2007-06-15 02:37:04 +0200
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
@@ -15643,9 +15142,8 @@
}
#define forall_unix_sockets(i, s) \
-diff -NurpP --minimal linux-2.6.22.9/include/net/inet_hashtables.h linux-2.6.22.9-vs2.2.0.4/include/net/inet_hashtables.h
---- linux-2.6.22.9/include/net/inet_hashtables.h 2007-05-02 19:25:35 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/net/inet_hashtables.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/net/inet_hashtables.h 2007-05-02 19:25:35 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/net/inet_hashtables.h 2007-06-15 02:37:04 +0200
@@ -271,6 +271,26 @@ static inline int inet_iif(const struct
return ((struct rtable *)skb->dst)->rt_iif;
}
@@ -15673,9 +15171,8 @@
extern struct sock *__inet_lookup_listener(struct inet_hashinfo *hashinfo,
const __be32 daddr,
const unsigned short hnum,
-diff -NurpP --minimal linux-2.6.22.9/include/net/inet_sock.h linux-2.6.22.9-vs2.2.0.4/include/net/inet_sock.h
---- linux-2.6.22.9/include/net/inet_sock.h 2007-07-09 13:20:01 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/net/inet_sock.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/net/inet_sock.h 2007-07-09 13:20:01 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/net/inet_sock.h 2007-06-15 02:37:04 +0200
@@ -113,6 +113,7 @@ struct inet_sock {
/* Socket demultiplex comparisons on incoming packets. */
__be32 daddr;
@@ -15684,9 +15181,8 @@
__be16 dport;
__u16 num;
__be32 saddr;
-diff -NurpP --minimal linux-2.6.22.9/include/net/inet_timewait_sock.h linux-2.6.22.9-vs2.2.0.4/include/net/inet_timewait_sock.h
---- linux-2.6.22.9/include/net/inet_timewait_sock.h 2007-05-02 19:25:35 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/net/inet_timewait_sock.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/net/inet_timewait_sock.h 2007-05-02 19:25:35 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/net/inet_timewait_sock.h 2007-06-15 02:37:04 +0200
@@ -115,6 +115,10 @@ struct inet_timewait_sock {
#define tw_refcnt __tw_common.skc_refcnt
#define tw_hash __tw_common.skc_hash
@@ -15698,9 +15194,8 @@
volatile unsigned char tw_substate;
/* 3 bits hole, try to pack */
unsigned char tw_rcv_wscale;
-diff -NurpP --minimal linux-2.6.22.9/include/net/route.h linux-2.6.22.9-vs2.2.0.4/include/net/route.h
---- linux-2.6.22.9/include/net/route.h 2007-05-02 19:25:35 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/net/route.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/net/route.h 2007-05-02 19:25:35 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/net/route.h 2007-06-15 02:37:04 +0200
@@ -27,12 +27,16 @@
#include <net/dst.h>
#include <net/inetpeer.h>
@@ -15807,9 +15302,8 @@
err = __ip_route_output_key(rp, &fl);
if (err)
return err;
-diff -NurpP --minimal linux-2.6.22.9/include/net/sock.h linux-2.6.22.9-vs2.2.0.4/include/net/sock.h
---- linux-2.6.22.9/include/net/sock.h 2007-07-09 13:20:02 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/include/net/sock.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/include/net/sock.h 2007-07-09 13:20:02 +0200
++++ linux-2.6.22.10-vs2.2.0.5/include/net/sock.h 2007-06-15 02:37:04 +0200
@@ -119,6 +119,10 @@ struct sock_common {
atomic_t skc_refcnt;
unsigned int skc_hash;
@@ -15832,9 +15326,8 @@
unsigned char sk_shutdown : 2,
sk_no_check : 2,
sk_userlocks : 4;
-diff -NurpP --minimal linux-2.6.22.9/init/main.c linux-2.6.22.9-vs2.2.0.4/init/main.c
---- linux-2.6.22.9/init/main.c 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/init/main.c 2007-06-15 04:03:00 +0200
+--- linux-2.6.22.10/init/main.c 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/init/main.c 2007-06-15 04:03:00 +0200
@@ -55,6 +55,7 @@
#include <linux/pid_namespace.h>
#include <linux/device.h>
@@ -15860,9 +15353,8 @@
ptr = alloc_bootmem_pages(size * nr_possible_cpus);
for_each_possible_cpu(i) {
-diff -NurpP --minimal linux-2.6.22.9/ipc/mqueue.c linux-2.6.22.9-vs2.2.0.4/ipc/mqueue.c
---- linux-2.6.22.9/ipc/mqueue.c 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/ipc/mqueue.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/ipc/mqueue.c 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/ipc/mqueue.c 2007-06-15 02:37:04 +0200
@@ -29,6 +29,8 @@
#include <linux/audit.h>
#include <linux/signal.h>
@@ -15918,9 +15410,8 @@
out_err:
dput(dentry);
-diff -NurpP --minimal linux-2.6.22.9/ipc/msg.c linux-2.6.22.9-vs2.2.0.4/ipc/msg.c
---- linux-2.6.22.9/ipc/msg.c 2007-02-06 03:01:55 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/ipc/msg.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/ipc/msg.c 2007-02-06 03:01:55 +0100
++++ linux-2.6.22.10-vs2.2.0.5/ipc/msg.c 2007-06-15 02:37:04 +0200
@@ -36,6 +36,7 @@
#include <linux/seq_file.h>
#include <linux/mutex.h>
@@ -15937,9 +15428,8 @@
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-2.6.22.9/ipc/sem.c linux-2.6.22.9-vs2.2.0.4/ipc/sem.c
---- linux-2.6.22.9/ipc/sem.c 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/ipc/sem.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/ipc/sem.c 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/ipc/sem.c 2007-06-15 02:37:04 +0200
@@ -82,6 +82,8 @@
#include <linux/seq_file.h>
#include <linux/mutex.h>
@@ -15977,9 +15467,8 @@
size = sizeof (*sma) + sma->sem_nsems * sizeof (struct sem);
security_sem_free(sma);
ipc_rcu_putref(sma);
-diff -NurpP --minimal linux-2.6.22.9/ipc/shm.c linux-2.6.22.9-vs2.2.0.4/ipc/shm.c
---- linux-2.6.22.9/ipc/shm.c 2007-09-05 03:37:50 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/ipc/shm.c 2007-08-12 12:21:52 +0200
+--- linux-2.6.22.10/ipc/shm.c 2007-10-30 01:57:14 +0100
++++ linux-2.6.22.10-vs2.2.0.5/ipc/shm.c 2007-08-12 12:21:52 +0200
@@ -38,6 +38,8 @@
#include <linux/mutex.h>
#include <linux/nsproxy.h>
@@ -16035,9 +15524,8 @@
shm_unlock(shp);
return shp->id;
-diff -NurpP --minimal linux-2.6.22.9/ipc/util.c linux-2.6.22.9-vs2.2.0.4/ipc/util.c
---- linux-2.6.22.9/ipc/util.c 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/ipc/util.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/ipc/util.c 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/ipc/util.c 2007-06-15 02:37:04 +0200
@@ -32,6 +32,8 @@
#include <linux/proc_fs.h>
#include <linux/audit.h>
@@ -16063,9 +15551,8 @@
kfree(ns);
}
#else
-diff -NurpP --minimal linux-2.6.22.9/kernel/Makefile linux-2.6.22.9-vs2.2.0.4/kernel/Makefile
---- linux-2.6.22.9/kernel/Makefile 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/Makefile 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/Makefile 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/kernel/Makefile 2007-06-15 02:37:04 +0200
@@ -10,6 +10,8 @@ obj-y = sched.o fork.o exec_domain.o
kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \
hrtimer.o rwsem.o latency.o nsproxy.o srcu.o die_notifier.o
@@ -16075,9 +15562,8 @@
obj-$(CONFIG_STACKTRACE) += stacktrace.o
obj-y += time/
obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
-diff -NurpP --minimal linux-2.6.22.9/kernel/capability.c linux-2.6.22.9-vs2.2.0.4/kernel/capability.c
---- linux-2.6.22.9/kernel/capability.c 2007-05-02 19:25:37 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/capability.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/capability.c 2007-05-02 19:25:37 +0200
++++ linux-2.6.22.10-vs2.2.0.5/kernel/capability.c 2007-06-15 02:37:04 +0200
@@ -12,6 +12,7 @@
#include <linux/module.h>
#include <linux/security.h>
@@ -16108,9 +15594,8 @@
return __capable(current, cap);
}
EXPORT_SYMBOL(capable);
-diff -NurpP --minimal linux-2.6.22.9/kernel/compat.c linux-2.6.22.9-vs2.2.0.4/kernel/compat.c
---- linux-2.6.22.9/kernel/compat.c 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/compat.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/compat.c 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/kernel/compat.c 2007-06-15 02:37:04 +0200
@@ -846,7 +846,7 @@ asmlinkage long compat_sys_time(compat_t
compat_time_t i;
struct timeval tv;
@@ -16129,9 +15614,8 @@
return 0;
}
-diff -NurpP --minimal linux-2.6.22.9/kernel/exit.c linux-2.6.22.9-vs2.2.0.4/kernel/exit.c
---- linux-2.6.22.9/kernel/exit.c 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/exit.c 2007-07-17 03:02:15 +0200
+--- linux-2.6.22.10/kernel/exit.c 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/kernel/exit.c 2007-07-17 03:02:15 +0200
@@ -44,6 +44,11 @@
#include <linux/resource.h>
#include <linux/blkdev.h>
@@ -16208,9 +15692,8 @@
preempt_disable();
/* causes final put_task_struct in finish_task_switch(). */
tsk->state = TASK_DEAD;
-diff -NurpP --minimal linux-2.6.22.9/kernel/fork.c linux-2.6.22.9-vs2.2.0.4/kernel/fork.c
---- linux-2.6.22.9/kernel/fork.c 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/fork.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/fork.c 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/kernel/fork.c 2007-10-29 23:35:00 +0100
@@ -49,6 +49,11 @@
#include <linux/delayacct.h>
#include <linux/taskstats_kern.h>
@@ -16250,6 +15733,15 @@
vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
-pages);
continue;
+@@ -327,7 +336,7 @@ static inline void mm_free_pgd(struct mm
+
+ #include <linux/init_task.h>
+
+-static struct mm_struct * mm_init(struct mm_struct * mm)
++static struct mm_struct * mm_init(struct mm_struct * mm, struct vx_info *vxi)
+ {
+ atomic_set(&mm->mm_users, 1);
+ atomic_set(&mm->mm_count, 1);
@@ -335,8 +344,8 @@ static struct mm_struct * mm_init(struct
INIT_LIST_HEAD(&mm->mmlist);
mm->core_waiters = 0;
@@ -16265,10 +15757,19 @@
if (likely(!mm_alloc_pgd(mm))) {
mm->def_flags = 0;
-+ set_vx_info(&mm->mm_vx_info, current->vx_info);
++ set_vx_info(&mm->mm_vx_info, vxi);
return mm;
}
free_mm(mm);
+@@ -361,7 +371,7 @@ struct mm_struct * mm_alloc(void)
+ mm = allocate_mm();
+ if (mm) {
+ memset(mm, 0, sizeof(*mm));
+- mm = mm_init(mm);
++ mm = mm_init(mm, current->vx_info);
+ }
+ return mm;
+ }
@@ -376,6 +386,7 @@ void fastcall __mmdrop(struct mm_struct
BUG_ON(mm == &init_mm);
mm_free_pgd(mm);
@@ -16277,7 +15778,7 @@
free_mm(mm);
}
-@@ -490,6 +501,7 @@ static struct mm_struct *dup_mm(struct t
+@@ -490,12 +501,13 @@ static struct mm_struct *dup_mm(struct t
goto fail_nomem;
memcpy(mm, oldmm, sizeof(*mm));
@@ -16285,6 +15786,13 @@
/* Initializing for Swap token stuff */
mm->token_priority = 0;
+ mm->last_interval = 0;
+
+- if (!mm_init(mm))
++ if (!mm_init(mm, oldmm->mm_vx_info))
+ goto fail_nomem;
+
+ if (init_new_context(tsk, mm))
@@ -521,6 +533,7 @@ fail_nocontext:
* If init_new_context() failed, we cannot use mmput() to free the mm
* because it calls destroy_context()
@@ -16380,15 +15888,14 @@
bad_fork_free:
free_task(p);
fork_out:
-@@ -1367,6 +1418,15 @@ long do_fork(unsigned long clone_flags,
+@@ -1367,6 +1418,14 @@ long do_fork(unsigned long clone_flags,
if (!pid)
return -EAGAIN;
+
+ /* kernel threads are host only */
+ if ((clone_flags & CLONE_KTHREAD) && !vx_check(0, VS_ADMIN)) {
-+ vxwprintk(1, "xid=%d tried to spawn a kernel thread.",
-+ vx_current_xid());
++ vxwprintk_task(1, "tried to spawn a kernel thread.");
+ free_pid(pid);
+ return -EPERM;
+ }
@@ -16396,9 +15903,8 @@
nr = pid->nr;
if (unlikely(current->ptrace)) {
trace = fork_traceflag (clone_flags);
-diff -NurpP --minimal linux-2.6.22.9/kernel/kthread.c linux-2.6.22.9-vs2.2.0.4/kernel/kthread.c
---- linux-2.6.22.9/kernel/kthread.c 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/kthread.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/kthread.c 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/kernel/kthread.c 2007-06-15 02:37:04 +0200
@@ -96,7 +96,7 @@ static void create_kthread(struct kthrea
} else {
wait_for_completion(&create->started);
@@ -16408,9 +15914,8 @@
read_unlock(&tasklist_lock);
}
complete(&create->done);
-diff -NurpP --minimal linux-2.6.22.9/kernel/nsproxy.c linux-2.6.22.9-vs2.2.0.4/kernel/nsproxy.c
---- linux-2.6.22.9/kernel/nsproxy.c 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/nsproxy.c 2007-07-07 04:12:31 +0200
+--- linux-2.6.22.10/kernel/nsproxy.c 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/kernel/nsproxy.c 2007-07-07 04:12:31 +0200
@@ -20,14 +20,11 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
@@ -16554,9 +16059,8 @@
if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC)))
return 0;
-diff -NurpP --minimal linux-2.6.22.9/kernel/pid.c linux-2.6.22.9-vs2.2.0.4/kernel/pid.c
---- linux-2.6.22.9/kernel/pid.c 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/pid.c 2007-06-15 04:04:09 +0200
+--- linux-2.6.22.10/kernel/pid.c 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/kernel/pid.c 2007-06-15 04:04:09 +0200
@@ -28,6 +28,7 @@
#include <linux/hash.h>
#include <linux/pid_namespace.h>
@@ -16594,9 +16098,8 @@
}
EXPORT_SYMBOL(find_task_by_pid_type);
-diff -NurpP --minimal linux-2.6.22.9/kernel/posix-timers.c linux-2.6.22.9-vs2.2.0.4/kernel/posix-timers.c
---- linux-2.6.22.9/kernel/posix-timers.c 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/posix-timers.c 2007-07-07 03:52:54 +0200
+--- linux-2.6.22.10/kernel/posix-timers.c 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/kernel/posix-timers.c 2007-10-11 14:14:00 +0200
@@ -47,6 +47,7 @@
#include <linux/wait.h>
#include <linux/workqueue.h>
@@ -16605,18 +16108,20 @@
/*
* Management arrays for POSIX timers. Timers are kept in slab memory
-@@ -297,6 +298,10 @@ void do_schedule_next_timer(struct sigin
+@@ -297,6 +298,12 @@ void do_schedule_next_timer(struct sigin
int posix_timer_event(struct k_itimer *timr,int si_private)
{
+ struct vx_info_save vxis;
++ struct vx_info *vxi;
+ int ret;
+
-+ enter_vx_info(task_get_vx_info(timr->it_process), &vxis);
++ vxi = task_get_vx_info(timr->it_process);
++ enter_vx_info(vxi, &vxis);
memset(&timr->sigq->info, 0, sizeof(siginfo_t));
timr->sigq->info.si_sys_private = si_private;
/* Send signal to the process that owns this timer.*/
-@@ -309,11 +314,11 @@ int posix_timer_event(struct k_itimer *t
+@@ -309,11 +316,11 @@ int posix_timer_event(struct k_itimer *t
if (timr->it_sigev_notify & SIGEV_THREAD_ID) {
struct task_struct *leader;
@@ -16631,7 +16136,7 @@
timr->it_sigev_notify = SIGEV_SIGNAL;
leader = timr->it_process->group_leader;
-@@ -321,8 +326,12 @@ int posix_timer_event(struct k_itimer *t
+@@ -321,8 +328,12 @@ int posix_timer_event(struct k_itimer *t
timr->it_process = leader;
}
@@ -16640,12 +16145,12 @@
timr->it_process);
+out:
+ leave_vx_info(&vxis);
-+ put_vx_info(vxis.vxi);
++ put_vx_info(vxi);
+ return ret;
}
EXPORT_SYMBOL_GPL(posix_timer_event);
-@@ -402,7 +411,7 @@ static struct task_struct * good_sigeven
+@@ -402,7 +413,7 @@ static struct task_struct * good_sigeven
struct task_struct *rtn = current->group_leader;
if ((event->sigev_notify & SIGEV_THREAD_ID ) &&
@@ -16654,9 +16159,8 @@
rtn->tgid != current->tgid ||
(event->sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_SIGNAL))
return NULL;
-diff -NurpP --minimal linux-2.6.22.9/kernel/printk.c linux-2.6.22.9-vs2.2.0.4/kernel/printk.c
---- linux-2.6.22.9/kernel/printk.c 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/printk.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/printk.c 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/kernel/printk.c 2007-06-15 02:37:04 +0200
@@ -31,6 +31,7 @@
#include <linux/bootmem.h>
#include <linux/syscalls.h>
@@ -16720,9 +16224,8 @@
count = len;
if (count > log_buf_len)
count = log_buf_len;
-diff -NurpP --minimal linux-2.6.22.9/kernel/ptrace.c linux-2.6.22.9-vs2.2.0.4/kernel/ptrace.c
---- linux-2.6.22.9/kernel/ptrace.c 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/ptrace.c 2007-06-15 04:28:02 +0200
+--- linux-2.6.22.10/kernel/ptrace.c 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/kernel/ptrace.c 2007-06-15 04:28:02 +0200
@@ -19,6 +19,7 @@
#include <linux/security.h>
#include <linux/signal.h>
@@ -16754,9 +16257,8 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out_put_task_struct;
-diff -NurpP --minimal linux-2.6.22.9/kernel/sched.c linux-2.6.22.9-vs2.2.0.4/kernel/sched.c
---- linux-2.6.22.9/kernel/sched.c 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/sched.c 2007-07-07 03:52:54 +0200
+--- linux-2.6.22.10/kernel/sched.c 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/kernel/sched.c 2007-07-07 03:52:54 +0200
@@ -56,6 +56,8 @@
#include <asm/tlb.h>
@@ -17095,9 +16597,8 @@
__activate_task(p, task_rq(p));
resched_task(rq->curr);
}
-diff -NurpP --minimal linux-2.6.22.9/kernel/sched_hard.h linux-2.6.22.9-vs2.2.0.4/kernel/sched_hard.h
---- linux-2.6.22.9/kernel/sched_hard.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/sched_hard.h 2007-06-15 19:20:10 +0200
+--- linux-2.6.22.10/kernel/sched_hard.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/sched_hard.h 2007-06-15 19:20:10 +0200
@@ -0,0 +1,324 @@
+
+#ifdef CONFIG_VSERVER_IDLELIMIT
@@ -17423,9 +16924,8 @@
+
+#endif /* CONFIG_VSERVER_HARDCPU */
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/sched_mon.h linux-2.6.22.9-vs2.2.0.4/kernel/sched_mon.h
---- linux-2.6.22.9/kernel/sched_mon.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/sched_mon.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/sched_mon.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/sched_mon.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,200 @@
+
+#include <linux/vserver/monitor.h>
@@ -17627,9 +17127,8 @@
+
+#endif /* CONFIG_VSERVER_MONITOR */
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/signal.c linux-2.6.22.9-vs2.2.0.4/kernel/signal.c
---- linux-2.6.22.9/kernel/signal.c 2007-09-30 15:54:34 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/signal.c 2007-10-01 15:25:35 +0200
+--- linux-2.6.22.10/kernel/signal.c 2007-10-30 01:57:15 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/signal.c 2007-10-01 15:25:35 +0200
@@ -26,6 +26,8 @@
#include <linux/freezer.h>
#include <linux/pid_namespace.h>
@@ -17716,9 +17215,8 @@
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-2.6.22.9/kernel/softirq.c linux-2.6.22.9-vs2.2.0.4/kernel/softirq.c
---- linux-2.6.22.9/kernel/softirq.c 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/softirq.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/softirq.c 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/kernel/softirq.c 2007-06-15 02:37:04 +0200
@@ -18,6 +18,7 @@
#include <linux/rcupdate.h>
#include <linux/smp.h>
@@ -17727,10 +17225,9 @@
#include <asm/irq.h>
/*
-diff -NurpP --minimal linux-2.6.22.9/kernel/sys.c linux-2.6.22.9-vs2.2.0.4/kernel/sys.c
---- linux-2.6.22.9/kernel/sys.c 2007-09-30 15:54:34 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/sys.c 2007-10-01 15:25:35 +0200
-@@ -35,6 +35,7 @@
+--- linux-2.6.22.10/kernel/sys.c 2007-10-30 01:57:15 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/sys.c 2007-10-30 01:24:36 +0100
+@@ -36,6 +36,7 @@
#include <linux/compat.h>
#include <linux/syscalls.h>
#include <linux/kprobes.h>
@@ -17738,7 +17235,7 @@
#include <asm/uaccess.h>
#include <asm/io.h>
-@@ -638,7 +639,10 @@ static int set_one_prio(struct task_stru
+@@ -639,7 +640,10 @@ static int set_one_prio(struct task_stru
goto out;
}
if (niceval < task_nice(p) && !can_nice(p, niceval)) {
@@ -17750,7 +17247,7 @@
goto out;
}
no_nice = security_task_setnice(p, niceval);
-@@ -686,6 +690,8 @@ asmlinkage long sys_setpriority(int whic
+@@ -687,6 +691,8 @@ asmlinkage long sys_setpriority(int whic
else
pgrp = task_pgrp(current);
do_each_pid_task(pgrp, PIDTYPE_PGID, p) {
@@ -17759,7 +17256,7 @@
error = set_one_prio(p, niceval, error);
} while_each_pid_task(pgrp, PIDTYPE_PGID, p);
break;
-@@ -694,7 +700,8 @@ asmlinkage long sys_setpriority(int whic
+@@ -695,7 +701,8 @@ asmlinkage long sys_setpriority(int whic
if (!who)
who = current->uid;
else
@@ -17769,7 +17266,7 @@
goto out_unlock; /* No processes for this user */
do_each_thread(g, p)
-@@ -746,6 +753,8 @@ asmlinkage long sys_getpriority(int whic
+@@ -747,6 +754,8 @@ asmlinkage long sys_getpriority(int whic
else
pgrp = task_pgrp(current);
do_each_pid_task(pgrp, PIDTYPE_PGID, p) {
@@ -17778,7 +17275,7 @@
niceval = 20 - task_nice(p);
if (niceval > retval)
retval = niceval;
-@@ -756,7 +765,8 @@ asmlinkage long sys_getpriority(int whic
+@@ -757,7 +766,8 @@ asmlinkage long sys_getpriority(int whic
if (!who)
who = current->uid;
else
@@ -17788,7 +17285,7 @@
goto out_unlock; /* No processes for this user */
do_each_thread(g, p)
-@@ -869,6 +879,9 @@ void kernel_power_off(void)
+@@ -871,6 +881,9 @@ void kernel_power_off(void)
machine_power_off();
}
EXPORT_SYMBOL_GPL(kernel_power_off);
@@ -17798,7 +17295,7 @@
/*
* Reboot system call: for obvious reasons only root may call it,
* and even root needs to set up some magic numbers in the registers
-@@ -899,6 +912,9 @@ asmlinkage long sys_reboot(int magic1, i
+@@ -901,6 +914,9 @@ asmlinkage long sys_reboot(int magic1, i
if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)
cmd = LINUX_REBOOT_CMD_HALT;
@@ -17808,7 +17305,7 @@
lock_kernel();
switch (cmd) {
case LINUX_REBOOT_CMD_RESTART:
-@@ -1078,7 +1094,7 @@ static int set_user(uid_t new_ruid, int
+@@ -1080,7 +1096,7 @@ static int set_user(uid_t new_ruid, int
{
struct user_struct *new_user;
@@ -17817,7 +17314,7 @@
if (!new_user)
return -EAGAIN;
-@@ -1432,15 +1448,18 @@ asmlinkage long sys_setpgid(pid_t pid, p
+@@ -1434,15 +1450,18 @@ asmlinkage long sys_setpgid(pid_t pid, p
{
struct task_struct *p;
struct task_struct *group_leader = current->group_leader;
@@ -17837,7 +17334,7 @@
/* From this point forward we keep holding onto the tasklist lock
* so that our parent does not change from under us. -DaveM
*/
-@@ -1474,20 +1493,20 @@ asmlinkage long sys_setpgid(pid_t pid, p
+@@ -1476,20 +1495,20 @@ asmlinkage long sys_setpgid(pid_t pid, p
if (pgid != pid) {
struct task_struct *g =
@@ -17863,7 +17360,7 @@
}
err = 0;
-@@ -1500,7 +1519,7 @@ out:
+@@ -1502,7 +1521,7 @@ out:
asmlinkage long sys_getpgid(pid_t pid)
{
if (!pid)
@@ -17872,7 +17369,7 @@
else {
int retval;
struct task_struct *p;
-@@ -1512,7 +1531,7 @@ asmlinkage long sys_getpgid(pid_t pid)
+@@ -1514,7 +1533,7 @@ asmlinkage long sys_getpgid(pid_t pid)
if (p) {
retval = security_task_getpgid(p);
if (!retval)
@@ -17881,7 +17378,7 @@
}
read_unlock(&tasklist_lock);
return retval;
-@@ -1863,7 +1882,7 @@ asmlinkage long sys_sethostname(char __u
+@@ -1865,7 +1884,7 @@ asmlinkage long sys_sethostname(char __u
int errno;
char tmp[__NEW_UTS_LEN];
@@ -17890,7 +17387,7 @@
return -EPERM;
if (len < 0 || len > __NEW_UTS_LEN)
return -EINVAL;
-@@ -1908,7 +1927,7 @@ asmlinkage long sys_setdomainname(char _
+@@ -1910,7 +1929,7 @@ asmlinkage long sys_setdomainname(char _
int errno;
char tmp[__NEW_UTS_LEN];
@@ -17899,7 +17396,7 @@
return -EPERM;
if (len < 0 || len > __NEW_UTS_LEN)
return -EINVAL;
-@@ -1975,7 +1994,7 @@ asmlinkage long sys_setrlimit(unsigned i
+@@ -1977,7 +1996,7 @@ asmlinkage long sys_setrlimit(unsigned i
return -EINVAL;
old_rlim = current->signal->rlim + resource;
if ((new_rlim.rlim_max > old_rlim->rlim_max) &&
@@ -17908,9 +17405,8 @@
return -EPERM;
if (resource == RLIMIT_NOFILE && new_rlim.rlim_max > NR_OPEN)
return -EPERM;
-diff -NurpP --minimal linux-2.6.22.9/kernel/sysctl.c linux-2.6.22.9-vs2.2.0.4/kernel/sysctl.c
---- linux-2.6.22.9/kernel/sysctl.c 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/sysctl.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/sysctl.c 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/kernel/sysctl.c 2007-06-15 02:37:04 +0200
@@ -89,6 +89,7 @@ static int ngroups_max = NGROUPS_MAX;
#ifdef CONFIG_KMOD
extern char modprobe_path[];
@@ -17935,9 +17431,8 @@
#ifdef CONFIG_CHR_DEV_SG
{
.ctl_name = KERN_SG_BIG_BUFF,
-diff -NurpP --minimal linux-2.6.22.9/kernel/time.c linux-2.6.22.9-vs2.2.0.4/kernel/time.c
---- linux-2.6.22.9/kernel/time.c 2007-07-09 13:20:03 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/time.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/time.c 2007-07-09 13:20:03 +0200
++++ linux-2.6.22.10-vs2.2.0.5/kernel/time.c 2007-06-15 02:37:04 +0200
@@ -60,7 +60,7 @@ asmlinkage long sys_time(time_t __user *
time_t i;
struct timeval tv;
@@ -17983,9 +17478,8 @@
tv->tv_sec = x.tv_sec;
tv->tv_nsec = x.tv_usec * NSEC_PER_USEC;
}
-diff -NurpP --minimal linux-2.6.22.9/kernel/timer.c linux-2.6.22.9-vs2.2.0.4/kernel/timer.c
---- linux-2.6.22.9/kernel/timer.c 2007-07-09 13:20:04 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/timer.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/timer.c 2007-07-09 13:20:04 +0200
++++ linux-2.6.22.10-vs2.2.0.5/kernel/timer.c 2007-06-15 02:37:04 +0200
@@ -36,6 +36,10 @@
#include <linux/delay.h>
#include <linux/tick.h>
@@ -18053,9 +17547,8 @@
info->uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0);
info->loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
-diff -NurpP --minimal linux-2.6.22.9/kernel/user.c linux-2.6.22.9-vs2.2.0.4/kernel/user.c
---- linux-2.6.22.9/kernel/user.c 2007-02-06 03:01:56 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/user.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/user.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/user.c 2007-06-15 02:37:04 +0200
@@ -23,8 +23,8 @@
#define UIDHASH_BITS (CONFIG_BASE_SMALL ? 3 : 8)
#define UIDHASH_SZ (1 << UIDHASH_BITS)
@@ -18144,9 +17637,8 @@
spin_unlock_irq(&uidhash_lock);
return 0;
-diff -NurpP --minimal linux-2.6.22.9/kernel/utsname.c linux-2.6.22.9-vs2.2.0.4/kernel/utsname.c
---- linux-2.6.22.9/kernel/utsname.c 2007-07-09 13:20:04 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/utsname.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/utsname.c 2007-07-09 13:20:04 +0200
++++ linux-2.6.22.10-vs2.2.0.5/kernel/utsname.c 2007-06-15 02:37:04 +0200
@@ -13,6 +13,7 @@
#include <linux/uts.h>
#include <linux/utsname.h>
@@ -18170,9 +17662,8 @@
+ atomic_dec(&vs_global_uts_ns);
kfree(ns);
}
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/Kconfig linux-2.6.22.9-vs2.2.0.4/kernel/vserver/Kconfig
---- linux-2.6.22.9/kernel/vserver/Kconfig 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/Kconfig 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/Kconfig 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/Kconfig 2007-06-15 02:37:04 +0200
@@ -0,0 +1,284 @@
+#
+# Linux VServer configuration
@@ -18458,9 +17949,8 @@
+ depends on EXPERIMENTAL && !VSERVER_LEGACYNET
+ default y
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/Makefile linux-2.6.22.9-vs2.2.0.4/kernel/vserver/Makefile
---- linux-2.6.22.9/kernel/vserver/Makefile 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/Makefile 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/Makefile 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/Makefile 2007-06-15 02:37:04 +0200
@@ -0,0 +1,17 @@
+#
+# Makefile for the Linux vserver routines.
@@ -18479,9 +17969,8 @@
+vserver-$(CONFIG_VSERVER_HISTORY) += history.o
+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/cacct.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/cacct.c
---- linux-2.6.22.9/kernel/vserver/cacct.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/cacct.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/cacct.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/cacct.c 2007-06-15 02:37:04 +0200
@@ -0,0 +1,44 @@
+/*
+ * linux/kernel/vserver/cacct.c
@@ -18527,9 +18016,8 @@
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/cacct_init.h linux-2.6.22.9-vs2.2.0.4/kernel/vserver/cacct_init.h
---- linux-2.6.22.9/kernel/vserver/cacct_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/cacct_init.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/cacct_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/cacct_init.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,25 @@
+
+
@@ -18556,9 +18044,8 @@
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/cacct_proc.h linux-2.6.22.9-vs2.2.0.4/kernel/vserver/cacct_proc.h
---- linux-2.6.22.9/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/cacct_proc.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/cacct_proc.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,53 @@
+#ifndef _VX_CACCT_PROC_H
+#define _VX_CACCT_PROC_H
@@ -18613,9 +18100,8 @@
+}
+
+#endif /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/context.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/context.c
---- linux-2.6.22.9/kernel/vserver/context.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/context.c 2007-10-01 15:47:53 +0200
+--- linux-2.6.22.10/kernel/vserver/context.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/context.c 2007-10-01 15:47:53 +0200
@@ -0,0 +1,1106 @@
+/*
+ * linux/kernel/vserver/context.c
@@ -19723,9 +19209,8 @@
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/cvirt.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/cvirt.c
---- linux-2.6.22.9/kernel/vserver/cvirt.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/cvirt.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/cvirt.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/cvirt.c 2007-06-15 02:37:04 +0200
@@ -0,0 +1,304 @@
+/*
+ * linux/kernel/vserver/cvirt.c
@@ -20031,9 +19516,8 @@
+
+#endif
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/cvirt_init.h linux-2.6.22.9-vs2.2.0.4/kernel/vserver/cvirt_init.h
---- linux-2.6.22.9/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/cvirt_init.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/cvirt_init.h 2007-10-29 23:34:24 +0100
@@ -0,0 +1,69 @@
+
+
@@ -20083,16 +19567,16 @@
+{
+ int value;
+
-+ vxwprintk((value = atomic_read(&cvirt->nr_threads)),
++ vxwprintk_xid((value = atomic_read(&cvirt->nr_threads)),
+ "!!! cvirt: %p[nr_threads] = %d on exit.",
+ cvirt, value);
-+ vxwprintk((value = atomic_read(&cvirt->nr_running)),
++ vxwprintk_xid((value = atomic_read(&cvirt->nr_running)),
+ "!!! cvirt: %p[nr_running] = %d on exit.",
+ cvirt, value);
-+ vxwprintk((value = atomic_read(&cvirt->nr_uninterruptible)),
++ vxwprintk_xid((value = atomic_read(&cvirt->nr_uninterruptible)),
+ "!!! cvirt: %p[nr_uninterruptible] = %d on exit.",
+ cvirt, value);
-+ vxwprintk((value = atomic_read(&cvirt->nr_onhold)),
++ vxwprintk_xid((value = atomic_read(&cvirt->nr_onhold)),
+ "!!! cvirt: %p[nr_onhold] = %d on exit.",
+ cvirt, value);
+ return;
@@ -20104,9 +19588,8 @@
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/cvirt_proc.h linux-2.6.22.9-vs2.2.0.4/kernel/vserver/cvirt_proc.h
---- linux-2.6.22.9/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/cvirt_proc.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/cvirt_proc.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,133 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
@@ -20241,9 +19724,8 @@
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/debug.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/debug.c
---- linux-2.6.22.9/kernel/vserver/debug.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/debug.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/debug.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/debug.c 2007-06-15 02:37:04 +0200
@@ -0,0 +1,35 @@
+/*
+ * kernel/vserver/debug.c
@@ -20280,9 +19762,8 @@
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/dlimit.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/dlimit.c
---- linux-2.6.22.9/kernel/vserver/dlimit.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/dlimit.c 2007-07-17 03:02:15 +0200
+--- linux-2.6.22.10/kernel/vserver/dlimit.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/dlimit.c 2007-07-17 03:02:15 +0200
@@ -0,0 +1,526 @@
+/*
+ * linux/kernel/vserver/dlimit.c
@@ -20810,9 +20291,8 @@
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/helper.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/helper.c
---- linux-2.6.22.9/kernel/vserver/helper.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/helper.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/helper.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/helper.c 2007-06-15 02:37:04 +0200
@@ -0,0 +1,208 @@
+/*
+ * linux/kernel/vserver/helper.c
@@ -21022,9 +20502,8 @@
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/history.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/history.c
---- linux-2.6.22.9/kernel/vserver/history.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/history.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/history.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/history.c 2007-06-15 02:37:04 +0200
@@ -0,0 +1,264 @@
+/*
+ * kernel/vserver/history.c
@@ -21290,9 +20769,8 @@
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/init.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/init.c
---- linux-2.6.22.9/kernel/vserver/init.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/init.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/init.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/init.c 2007-06-15 02:37:04 +0200
@@ -0,0 +1,47 @@
+/*
+ * linux/kernel/init.c
@@ -21341,9 +20819,8 @@
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/inode.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/inode.c
---- linux-2.6.22.9/kernel/vserver/inode.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/inode.c 2007-07-16 06:39:15 +0200
+--- linux-2.6.22.10/kernel/vserver/inode.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/inode.c 2007-07-16 06:39:15 +0200
@@ -0,0 +1,417 @@
+/*
+ * linux/kernel/vserver/inode.c
@@ -21762,9 +21239,8 @@
+
+#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/legacy.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/legacy.c
---- linux-2.6.22.9/kernel/vserver/legacy.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/legacy.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/legacy.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/legacy.c 2007-06-15 02:37:04 +0200
@@ -0,0 +1,114 @@
+/*
+ * linux/kernel/vserver/legacy.c
@@ -21880,9 +21356,8 @@
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/legacynet.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/legacynet.c
---- linux-2.6.22.9/kernel/vserver/legacynet.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/legacynet.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/legacynet.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/legacynet.c 2007-06-15 02:37:04 +0200
@@ -0,0 +1,85 @@
+
+/*
@@ -21969,9 +21444,8 @@
+}
+
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/limit.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/limit.c
---- linux-2.6.22.9/kernel/vserver/limit.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/limit.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/limit.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/limit.c 2007-06-15 02:37:04 +0200
@@ -0,0 +1,319 @@
+/*
+ * linux/kernel/vserver/limit.c
@@ -22292,9 +21766,8 @@
+ return points;
+}
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/limit_init.h linux-2.6.22.9-vs2.2.0.4/kernel/vserver/limit_init.h
---- linux-2.6.22.9/kernel/vserver/limit_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/limit_init.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/limit_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/limit_init.h 2007-10-29 23:34:24 +0100
@@ -0,0 +1,33 @@
+
+
@@ -22322,16 +21795,15 @@
+ if ((1 << lim) & VLIM_NOCHECK)
+ continue;
+ value = __rlim_get(limit, lim);
-+ vxwprintk(value,
++ vxwprintk_xid(value,
+ "!!! limit: %p[%s,%d] = %ld on exit.",
+ limit, vlimit_name[lim], lim, (long)value);
+ }
+#endif
+}
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/limit_proc.h linux-2.6.22.9-vs2.2.0.4/kernel/vserver/limit_proc.h
---- linux-2.6.22.9/kernel/vserver/limit_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/limit_proc.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/limit_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/limit_proc.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,57 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
@@ -22390,9 +21862,8 @@
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/monitor.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/monitor.c
---- linux-2.6.22.9/kernel/vserver/monitor.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/monitor.c 2007-06-15 05:59:57 +0200
+--- linux-2.6.22.10/kernel/vserver/monitor.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/monitor.c 2007-06-15 05:59:57 +0200
@@ -0,0 +1,143 @@
+/*
+ * kernel/vserver/monitor.c
@@ -22537,9 +22008,8 @@
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/network.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/network.c
---- linux-2.6.22.9/kernel/vserver/network.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/network.c 2007-07-19 07:08:54 +0200
+--- linux-2.6.22.10/kernel/vserver/network.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/network.c 2007-07-19 07:08:54 +0200
@@ -0,0 +1,771 @@
+/*
+ * linux/kernel/vserver/network.c
@@ -23312,9 +22782,8 @@
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/proc.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/proc.c
---- linux-2.6.22.9/kernel/vserver/proc.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/proc.c 2007-06-15 19:20:10 +0200
+--- linux-2.6.22.10/kernel/vserver/proc.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/proc.c 2007-06-15 19:20:10 +0200
@@ -0,0 +1,1033 @@
+/*
+ * linux/kernel/vserver/proc.c
@@ -24349,9 +23818,8 @@
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/sched.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/sched.c
---- linux-2.6.22.9/kernel/vserver/sched.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/sched.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/sched.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/sched.c 2007-06-15 02:37:04 +0200
@@ -0,0 +1,447 @@
+/*
+ * linux/kernel/vserver/sched.c
@@ -24800,9 +24268,8 @@
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/sched_init.h linux-2.6.22.9-vs2.2.0.4/kernel/vserver/sched_init.h
---- linux-2.6.22.9/kernel/vserver/sched_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/sched_init.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/sched_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/sched_init.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,50 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
@@ -24854,9 +24321,8 @@
+{
+ return;
+}
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/sched_proc.h linux-2.6.22.9-vs2.2.0.4/kernel/vserver/sched_proc.h
---- linux-2.6.22.9/kernel/vserver/sched_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/sched_proc.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/sched_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/sched_proc.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,57 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
@@ -24915,9 +24381,8 @@
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/signal.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/signal.c
---- linux-2.6.22.9/kernel/vserver/signal.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/signal.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/signal.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/signal.c 2007-06-15 02:37:04 +0200
@@ -0,0 +1,134 @@
+/*
+ * linux/kernel/vserver/signal.c
@@ -25053,9 +24518,8 @@
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/space.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/space.c
---- linux-2.6.22.9/kernel/vserver/space.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/space.c 2007-06-16 19:12:02 +0200
+--- linux-2.6.22.10/kernel/vserver/space.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/space.c 2007-06-16 19:12:02 +0200
@@ -0,0 +1,281 @@
+/*
+ * linux/kernel/vserver/space.c
@@ -25338,9 +24802,8 @@
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/switch.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/switch.c
---- linux-2.6.22.9/kernel/vserver/switch.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/switch.c 2007-07-16 06:40:28 +0200
+--- linux-2.6.22.10/kernel/vserver/switch.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/switch.c 2007-10-29 23:34:24 +0100
@@ -0,0 +1,538 @@
+/*
+ * linux/kernel/vserver/switch.c
@@ -25598,7 +25061,7 @@
+ return vc_set_ipv4root(id, data);
+#endif
+ default:
-+ vxwprintk(1, "unimplemented VCMD_%02d_%d[%d]",
++ vxwprintk_task(1, "unimplemented VCMD_%02d_%d[%d]",
+ VC_CATEGORY(cmd), VC_COMMAND(cmd), VC_VERSION(cmd));
+ }
+ return -ENOSYS;
@@ -25880,9 +25343,8 @@
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/sysctl.c linux-2.6.22.9-vs2.2.0.4/kernel/vserver/sysctl.c
---- linux-2.6.22.9/kernel/vserver/sysctl.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/sysctl.c 2007-06-16 05:31:20 +0200
+--- linux-2.6.22.10/kernel/vserver/sysctl.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/sysctl.c 2007-06-16 05:31:20 +0200
@@ -0,0 +1,248 @@
+/*
+ * kernel/vserver/sysctl.c
@@ -26132,9 +25594,8 @@
+EXPORT_SYMBOL_GPL(vx_debug_space);
+EXPORT_SYMBOL_GPL(vx_debug_misc);
+
-diff -NurpP --minimal linux-2.6.22.9/kernel/vserver/vci_config.h linux-2.6.22.9-vs2.2.0.4/kernel/vserver/vci_config.h
---- linux-2.6.22.9/kernel/vserver/vci_config.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/kernel/vserver/vci_config.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/kernel/vserver/vci_config.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/kernel/vserver/vci_config.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,92 @@
+
+/* interface version */
@@ -26228,277 +25689,8 @@
+ 0;
+}
+
-diff -NurpP --minimal linux-2.6.22.9/mm/filemap.c linux-2.6.22.9-vs2.2.0.4/mm/filemap.c
---- linux-2.6.22.9/mm/filemap.c 2007-07-09 13:20:04 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/mm/filemap.c 2007-07-09 13:11:54 +0200
-@@ -1245,6 +1245,31 @@ int file_send_actor(read_descriptor_t *
- return written;
- }
-
-+/* FIXME: It would be as simple as this, if we had a (void __user*) to write.
-+ * We already have a kernel buffer, so it should be even simpler, right? ;)
-+ *
-+ * Yes, sorta. After duplicating the complete path of generic_file_write(),
-+ * at least some special cases could be removed, so the copy is simpler than
-+ * the original. But it remains a copy, so overall complexity increases.
-+ */
-+static ssize_t
-+generic_kernel_file_write(struct file *, const char *, size_t, loff_t *);
-+
-+ssize_t generic_file_sendpage(struct file *file, struct page *page,
-+ int offset, size_t size, loff_t *ppos, int more)
-+{
-+ ssize_t ret;
-+ char *kaddr;
-+
-+ kaddr = kmap(page);
-+ ret = generic_kernel_file_write(file, kaddr + offset, size, ppos);
-+ kunmap(page);
-+
-+ return ret;
-+}
-+
-+EXPORT_SYMBOL(generic_file_sendpage);
-+
- ssize_t generic_file_sendfile(struct file *in_file, loff_t *ppos,
- size_t count, read_actor_t actor, void *target)
- {
-@@ -1924,6 +1949,19 @@ int remove_suid(struct dentry *dentry)
- }
- EXPORT_SYMBOL(remove_suid);
-
-+static inline size_t
-+filemap_copy_from_kernel(struct page *page, unsigned long offset,
-+ const char *buf, unsigned bytes)
-+{
-+ char *kaddr;
-+
-+ kaddr = kmap(page);
-+ memcpy(kaddr + offset, buf, bytes);
-+ kunmap(page);
-+
-+ return bytes;
-+}
-+
- size_t
- __filemap_copy_from_user_iovec_inatomic(char *vaddr,
- const struct iovec *iov, size_t base, size_t bytes)
-@@ -2235,6 +2273,175 @@ zero_length_segment:
- }
- EXPORT_SYMBOL(generic_file_buffered_write);
-
-+static inline void
-+filemap_set_next_kvec(const struct kvec **iovp, size_t *basep, size_t bytes)
-+{
-+ const struct kvec *iov = *iovp;
-+ size_t base = *basep;
-+
-+ while (bytes) {
-+ int copy = min(bytes, iov->iov_len - base);
-+
-+ bytes -= copy;
-+ base += copy;
-+ if (iov->iov_len == base) {
-+ iov++;
-+ base = 0;
-+ }
-+ }
-+ *iovp = iov;
-+ *basep = base;
-+}
-+
-+/*
-+ * TODO:
-+ * This largely tries to copy generic_file_aio_write_nolock(), although it
-+ * doesn't have to be nearly as generic. A real cleanup should either
-+ * merge this into generic_file_aio_write_nolock() as well or keep it special
-+ * and remove as much code as possible.
-+ */
-+static ssize_t
-+generic_kernel_file_aio_write_nolock(struct kiocb *iocb, const struct kvec*iov,
-+ unsigned long nr_segs, loff_t *ppos)
-+{
-+ struct file *file = iocb->ki_filp;
-+ struct address_space * mapping = file->f_mapping;
-+ const struct address_space_operations *a_ops = mapping->a_ops;
-+ size_t ocount; /* original count */
-+ size_t count; /* after file limit checks */
-+ struct inode *inode = mapping->host;
-+ long status = 0;
-+ loff_t pos;
-+ struct page *page;
-+ struct page *cached_page = NULL;
-+ const int isblk = S_ISBLK(inode->i_mode);
-+ ssize_t written;
-+ ssize_t err;
-+ size_t bytes;
-+ struct pagevec lru_pvec;
-+ const struct kvec *cur_iov = iov; /* current kvec */
-+ size_t iov_base = 0; /* offset in the current kvec */
-+ unsigned long seg;
-+ char *buf;
-+
-+ ocount = 0;
-+ for (seg = 0; seg < nr_segs; seg++) {
-+ const struct kvec *iv = &iov[seg];
-+
-+ /*
-+ * If any segment has a negative length, or the cumulative
-+ * length ever wraps negative then return -EINVAL.
-+ */
-+ ocount += iv->iov_len;
-+ if (unlikely((ssize_t)(ocount|iv->iov_len) < 0))
-+ return -EINVAL;
-+ }
-+
-+ count = ocount;
-+ pos = *ppos;
-+ pagevec_init(&lru_pvec, 0);
-+
-+ /* We can write back this queue in page reclaim */
-+ current->backing_dev_info = mapping->backing_dev_info;
-+ written = 0;
-+
-+ err = generic_write_checks(file, &pos, &count, isblk);
-+ if (err)
-+ goto out;
-+
-+
-+ if (count == 0)
-+ goto out;
-+
-+ remove_suid(file->f_dentry);
-+ file_update_time(file);
-+
-+ /* There is no sane reason to use O_DIRECT */
-+ BUG_ON(file->f_flags & O_DIRECT);
-+
-+ buf = iov->iov_base;
-+ do {
-+ unsigned long index;
-+ unsigned long offset;
-+ size_t copied;
-+
-+ offset = (pos & (PAGE_CACHE_SIZE -1)); /* Within page */
-+ index = pos >> PAGE_CACHE_SHIFT;
-+ bytes = PAGE_CACHE_SIZE - offset;
-+ if (bytes > count)
-+ bytes = count;
-+
-+ page = __grab_cache_page(mapping,index,&cached_page,&lru_pvec);
-+ if (!page) {
-+ status = -ENOMEM;
-+ break;
-+ }
-+
-+ status = a_ops->prepare_write(file, page, offset, offset+bytes);
-+ if (unlikely(status)) {
-+ loff_t isize = i_size_read(inode);
-+ /*
-+ * prepare_write() may have instantiated a few blocks
-+ * outside i_size. Trim these off again.
-+ */
-+ unlock_page(page);
-+ page_cache_release(page);
-+ if (pos + bytes > isize)
-+ vmtruncate(inode, isize);
-+ break;
-+ }
-+
-+ BUG_ON(nr_segs != 1);
-+ copied = filemap_copy_from_kernel(page, offset, buf, bytes);
-+
-+ flush_dcache_page(page);
-+ status = a_ops->commit_write(file, page, offset, offset+bytes);
-+ if (likely(copied > 0)) {
-+ if (!status)
-+ status = copied;
-+
-+ if (status >= 0) {
-+ written += status;
-+ count -= status;
-+ pos += status;
-+ buf += status;
-+ if (unlikely(nr_segs > 1))
-+ filemap_set_next_kvec(&cur_iov,
-+ &iov_base, status);
-+ }
-+ }
-+ if (unlikely(copied != bytes))
-+ if (status >= 0)
-+ status = -EFAULT;
-+ unlock_page(page);
-+ mark_page_accessed(page);
-+ page_cache_release(page);
-+ if (status < 0)
-+ break;
-+ balance_dirty_pages_ratelimited(mapping);
-+ cond_resched();
-+ } while (count);
-+ *ppos = pos;
-+
-+ if (cached_page)
-+ page_cache_release(cached_page);
-+
-+ /*
-+ * For now, when the user asks for O_SYNC, we'll actually give O_DSYNC
-+ */
-+ if (status >= 0) {
-+ if ((file->f_flags & O_SYNC) || IS_SYNC(inode))
-+ status = generic_osync_inode(inode, mapping,
-+ OSYNC_METADATA|OSYNC_DATA);
-+ }
-+
-+ err = written ? written : status;
-+out:
-+ pagevec_lru_add(&lru_pvec);
-+ current->backing_dev_info = 0;
-+ return err;
-+}
-+
- static ssize_t
- __generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,
- unsigned long nr_segs, loff_t *ppos)
-@@ -2335,6 +2542,36 @@ out:
- return written ? written : err;
- }
-
-+static ssize_t
-+generic_kernel_file_write_nolock(struct file *file, const struct kvec *iov,
-+ unsigned long nr_segs, loff_t *ppos)
-+{
-+ struct kiocb kiocb;
-+ ssize_t ret;
-+
-+ init_sync_kiocb(&kiocb, file);
-+ ret = generic_kernel_file_aio_write_nolock(&kiocb, iov, nr_segs, ppos);
-+ if (ret == -EIOCBQUEUED)
-+ ret = wait_on_sync_kiocb(&kiocb);
-+ return ret;
-+}
-+
-+static ssize_t generic_kernel_file_write(struct file *file, const char *buf,
-+ size_t count, loff_t *ppos)
-+{
-+ struct inode *inode = file->f_mapping->host;
-+ ssize_t err;
-+ struct kvec local_iov = { .iov_base = (char *) buf,
-+ .iov_len = count };
-+
-+ mutex_lock(&inode->i_mutex);
-+ err = generic_kernel_file_write_nolock(file, &local_iov, 1, ppos);
-+ mutex_unlock(&inode->i_mutex);
-+
-+ return err;
-+}
-+
-+
- ssize_t generic_file_aio_write_nolock(struct kiocb *iocb,
- const struct iovec *iov, unsigned long nr_segs, loff_t pos)
- {
-diff -NurpP --minimal linux-2.6.22.9/mm/filemap_xip.c linux-2.6.22.9-vs2.2.0.4/mm/filemap_xip.c
---- linux-2.6.22.9/mm/filemap_xip.c 2007-07-09 13:20:04 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/mm/filemap_xip.c 2007-06-15 05:30:21 +0200
+--- linux-2.6.22.10/mm/filemap_xip.c 2007-07-09 13:20:04 +0200
++++ linux-2.6.22.10-vs2.2.0.5/mm/filemap_xip.c 2007-06-15 05:30:21 +0200
@@ -14,6 +14,7 @@
#include <linux/uio.h>
#include <linux/rmap.h>
@@ -26507,9 +25699,8 @@
#include <asm/tlbflush.h>
#include "filemap.h"
-diff -NurpP --minimal linux-2.6.22.9/mm/fremap.c linux-2.6.22.9-vs2.2.0.4/mm/fremap.c
---- linux-2.6.22.9/mm/fremap.c 2007-02-06 03:01:56 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/mm/fremap.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/mm/fremap.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.22.10-vs2.2.0.5/mm/fremap.c 2007-06-15 02:37:04 +0200
@@ -15,6 +15,7 @@
#include <linux/rmap.h>
#include <linux/module.h>
@@ -26527,9 +25718,8 @@
if (pte_none(*pte) || !zap_pte(mm, vma, addr, pte))
inc_mm_counter(mm, file_rss);
-diff -NurpP --minimal linux-2.6.22.9/mm/hugetlb.c linux-2.6.22.9-vs2.2.0.4/mm/hugetlb.c
---- linux-2.6.22.9/mm/hugetlb.c 2007-09-05 03:37:50 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/mm/hugetlb.c 2007-08-12 12:21:52 +0200
+--- linux-2.6.22.10/mm/hugetlb.c 2007-10-30 01:57:15 +0100
++++ linux-2.6.22.10-vs2.2.0.5/mm/hugetlb.c 2007-08-12 12:21:52 +0200
@@ -19,6 +19,7 @@
#include <asm/pgtable.h>
@@ -26538,9 +25728,8 @@
#include "internal.h"
const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
-diff -NurpP --minimal linux-2.6.22.9/mm/memory.c linux-2.6.22.9-vs2.2.0.4/mm/memory.c
---- linux-2.6.22.9/mm/memory.c 2007-07-09 13:20:04 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/mm/memory.c 2007-06-17 05:55:53 +0200
+--- linux-2.6.22.10/mm/memory.c 2007-07-09 13:20:04 +0200
++++ linux-2.6.22.10-vs2.2.0.5/mm/memory.c 2007-06-17 05:55:53 +0200
@@ -498,6 +498,9 @@ static int copy_pte_range(struct mm_stru
int progress = 0;
int rss[2];
@@ -26617,9 +25806,8 @@
}
/*
-diff -NurpP --minimal linux-2.6.22.9/mm/mlock.c linux-2.6.22.9-vs2.2.0.4/mm/mlock.c
---- linux-2.6.22.9/mm/mlock.c 2007-09-05 03:37:50 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/mm/mlock.c 2007-08-12 12:21:52 +0200
+--- linux-2.6.22.10/mm/mlock.c 2007-10-30 01:57:15 +0100
++++ linux-2.6.22.10-vs2.2.0.5/mm/mlock.c 2007-08-12 12:21:52 +0200
@@ -12,6 +12,7 @@
#include <linux/syscalls.h>
#include <linux/sched.h>
@@ -26676,9 +25864,8 @@
if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
capable(CAP_IPC_LOCK))
ret = do_mlockall(flags);
-diff -NurpP --minimal linux-2.6.22.9/mm/mmap.c linux-2.6.22.9-vs2.2.0.4/mm/mmap.c
---- linux-2.6.22.9/mm/mmap.c 2007-07-09 13:20:04 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/mm/mmap.c 2007-07-17 03:02:15 +0200
+--- linux-2.6.22.10/mm/mmap.c 2007-07-09 13:20:04 +0200
++++ linux-2.6.22.10-vs2.2.0.5/mm/mmap.c 2007-07-17 03:02:15 +0200
@@ -1144,10 +1144,10 @@ munmap_back:
kmem_cache_free(vm_area_cachep, vma);
}
@@ -26787,9 +25974,8 @@
+ vx_vmpages_add(mm, len >> PAGE_SHIFT);
return 0;
}
-diff -NurpP --minimal linux-2.6.22.9/mm/mremap.c linux-2.6.22.9-vs2.2.0.4/mm/mremap.c
---- linux-2.6.22.9/mm/mremap.c 2007-02-06 03:01:56 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/mm/mremap.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/mm/mremap.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.22.10-vs2.2.0.5/mm/mremap.c 2007-06-15 02:37:04 +0200
@@ -18,6 +18,7 @@
#include <linux/highmem.h>
#include <linux/security.h>
@@ -26839,9 +26025,8 @@
make_pages_present(addr + old_len,
addr + new_len);
}
-diff -NurpP --minimal linux-2.6.22.9/mm/nommu.c linux-2.6.22.9-vs2.2.0.4/mm/nommu.c
---- linux-2.6.22.9/mm/nommu.c 2007-07-09 13:20:04 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/mm/nommu.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/mm/nommu.c 2007-07-09 13:20:04 +0200
++++ linux-2.6.22.10-vs2.2.0.5/mm/nommu.c 2007-06-15 02:37:04 +0200
@@ -936,7 +936,7 @@ unsigned long do_mmap_pgoff(struct file
realalloc += kobjsize(vma);
askedalloc += sizeof(*vma);
@@ -26869,9 +26054,8 @@
while ((tmp = mm->context.vmlist)) {
mm->context.vmlist = tmp->next;
-diff -NurpP --minimal linux-2.6.22.9/mm/oom_kill.c linux-2.6.22.9-vs2.2.0.4/mm/oom_kill.c
---- linux-2.6.22.9/mm/oom_kill.c 2007-07-09 13:20:04 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/mm/oom_kill.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/mm/oom_kill.c 2007-07-09 13:20:04 +0200
++++ linux-2.6.22.10-vs2.2.0.5/mm/oom_kill.c 2007-06-15 02:37:04 +0200
@@ -24,6 +24,7 @@
#include <linux/cpuset.h>
#include <linux/module.h>
@@ -26925,9 +26109,8 @@
/* Try to kill a child first */
list_for_each(tsk, &p->children) {
-diff -NurpP --minimal linux-2.6.22.9/mm/page_alloc.c linux-2.6.22.9-vs2.2.0.4/mm/page_alloc.c
---- linux-2.6.22.9/mm/page_alloc.c 2007-07-09 13:20:04 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/mm/page_alloc.c 2007-06-17 05:54:20 +0200
+--- linux-2.6.22.10/mm/page_alloc.c 2007-07-09 13:20:04 +0200
++++ linux-2.6.22.10-vs2.2.0.5/mm/page_alloc.c 2007-06-17 05:54:20 +0200
@@ -41,6 +41,8 @@
#include <linux/pfn.h>
#include <linux/backing-dev.h>
@@ -26957,9 +26140,8 @@
}
#endif
-diff -NurpP --minimal linux-2.6.22.9/mm/rmap.c linux-2.6.22.9-vs2.2.0.4/mm/rmap.c
---- linux-2.6.22.9/mm/rmap.c 2007-07-09 13:20:04 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/mm/rmap.c 2007-07-07 03:52:54 +0200
+--- linux-2.6.22.10/mm/rmap.c 2007-07-09 13:20:04 +0200
++++ linux-2.6.22.10-vs2.2.0.5/mm/rmap.c 2007-07-07 03:52:54 +0200
@@ -48,6 +48,7 @@
#include <linux/rcupdate.h>
#include <linux/module.h>
@@ -26968,9 +26150,8 @@
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.22.9/mm/shmem.c linux-2.6.22.9-vs2.2.0.4/mm/shmem.c
---- linux-2.6.22.9/mm/shmem.c 2007-07-09 13:20:04 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/mm/shmem.c 2007-06-17 05:54:20 +0200
+--- linux-2.6.22.10/mm/shmem.c 2007-07-09 13:20:04 +0200
++++ linux-2.6.22.10-vs2.2.0.5/mm/shmem.c 2007-06-17 05:54:20 +0200
@@ -55,7 +55,6 @@
#include <asm/pgtable.h>
@@ -26997,9 +26178,8 @@
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
#ifdef CONFIG_TMPFS_POSIX_ACL
-diff -NurpP --minimal linux-2.6.22.9/mm/slab.c linux-2.6.22.9-vs2.2.0.4/mm/slab.c
---- linux-2.6.22.9/mm/slab.c 2007-07-09 13:20:04 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/mm/slab.c 2007-07-09 13:11:54 +0200
+--- linux-2.6.22.10/mm/slab.c 2007-07-09 13:20:04 +0200
++++ linux-2.6.22.10-vs2.2.0.5/mm/slab.c 2007-07-09 13:11:54 +0200
@@ -510,6 +510,8 @@ struct kmem_cache {
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
@@ -27033,9 +26213,8 @@
if (cache_free_alien(cachep, objp))
return;
-diff -NurpP --minimal linux-2.6.22.9/mm/slab_vs.h linux-2.6.22.9-vs2.2.0.4/mm/slab_vs.h
---- linux-2.6.22.9/mm/slab_vs.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/mm/slab_vs.h 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/mm/slab_vs.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.22.10-vs2.2.0.5/mm/slab_vs.h 2007-06-15 02:37:04 +0200
@@ -0,0 +1,27 @@
+
+#include <linux/vserver/context.h>
@@ -27064,9 +26243,8 @@
+ atomic_sub(cachep->buffer_size, ¤t->vx_info->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-2.6.22.9/mm/swapfile.c linux-2.6.22.9-vs2.2.0.4/mm/swapfile.c
---- linux-2.6.22.9/mm/swapfile.c 2007-07-09 13:20:04 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/mm/swapfile.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/mm/swapfile.c 2007-07-09 13:20:04 +0200
++++ linux-2.6.22.10-vs2.2.0.5/mm/swapfile.c 2007-06-15 02:37:04 +0200
@@ -31,6 +31,8 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
@@ -27085,9 +26263,8 @@
}
/*
-diff -NurpP --minimal linux-2.6.22.9/net/core/dev.c linux-2.6.22.9-vs2.2.0.4/net/core/dev.c
---- linux-2.6.22.9/net/core/dev.c 2007-09-05 03:37:50 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/core/dev.c 2007-09-05 03:05:53 +0200
+--- linux-2.6.22.10/net/core/dev.c 2007-10-30 01:57:15 +0100
++++ linux-2.6.22.10-vs2.2.0.5/net/core/dev.c 2007-09-05 03:05:53 +0200
@@ -117,6 +117,8 @@
#include <linux/err.h>
#include <linux/ctype.h>
@@ -27118,9 +26295,8 @@
seq_printf(seq, "%6s:%8lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu "
"%8lu %7lu %4lu %4lu %4lu %5lu %7lu %10lu\n",
-diff -NurpP --minimal linux-2.6.22.9/net/core/rtnetlink.c linux-2.6.22.9-vs2.2.0.4/net/core/rtnetlink.c
---- linux-2.6.22.9/net/core/rtnetlink.c 2007-07-09 13:20:05 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/core/rtnetlink.c 2007-06-17 05:54:20 +0200
+--- linux-2.6.22.10/net/core/rtnetlink.c 2007-07-09 13:20:05 +0200
++++ linux-2.6.22.10-vs2.2.0.5/net/core/rtnetlink.c 2007-06-17 05:54:20 +0200
@@ -35,6 +35,7 @@
#include <linux/security.h>
#include <linux/mutex.h>
@@ -27139,9 +26315,8 @@
if (idx < s_idx)
goto cont;
if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
-diff -NurpP --minimal linux-2.6.22.9/net/core/sock.c linux-2.6.22.9-vs2.2.0.4/net/core/sock.c
---- linux-2.6.22.9/net/core/sock.c 2007-07-09 13:20:05 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/core/sock.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/net/core/sock.c 2007-07-09 13:20:05 +0200
++++ linux-2.6.22.10-vs2.2.0.5/net/core/sock.c 2007-06-15 02:37:04 +0200
@@ -125,6 +125,9 @@
#include <linux/ipsec.h>
@@ -27207,9 +26382,8 @@
atomic_set(&sk->sk_refcnt, 1);
}
-diff -NurpP --minimal linux-2.6.22.9/net/ipv4/af_inet.c linux-2.6.22.9-vs2.2.0.4/net/ipv4/af_inet.c
---- linux-2.6.22.9/net/ipv4/af_inet.c 2007-09-05 03:37:50 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/ipv4/af_inet.c 2007-09-05 03:05:54 +0200
+--- linux-2.6.22.10/net/ipv4/af_inet.c 2007-10-30 01:57:15 +0100
++++ linux-2.6.22.10-vs2.2.0.5/net/ipv4/af_inet.c 2007-09-05 03:05:54 +0200
@@ -115,6 +115,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
@@ -27303,9 +26477,8 @@
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->saddr = 0; /* Use device */
-diff -NurpP --minimal linux-2.6.22.9/net/ipv4/devinet.c linux-2.6.22.9-vs2.2.0.4/net/ipv4/devinet.c
---- linux-2.6.22.9/net/ipv4/devinet.c 2007-09-30 15:54:34 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/ipv4/devinet.c 2007-10-01 15:25:35 +0200
+--- linux-2.6.22.10/net/ipv4/devinet.c 2007-10-30 01:57:15 +0100
++++ linux-2.6.22.10-vs2.2.0.5/net/ipv4/devinet.c 2007-10-01 15:25:35 +0200
@@ -56,6 +56,7 @@
#include <linux/sysctl.h>
#endif
@@ -27375,9 +26548,8 @@
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid,
-diff -NurpP --minimal linux-2.6.22.9/net/ipv4/fib_hash.c linux-2.6.22.9-vs2.2.0.4/net/ipv4/fib_hash.c
---- linux-2.6.22.9/net/ipv4/fib_hash.c 2007-07-09 13:20:05 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/ipv4/fib_hash.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/net/ipv4/fib_hash.c 2007-07-09 13:20:05 +0200
++++ linux-2.6.22.10-vs2.2.0.5/net/ipv4/fib_hash.c 2007-06-15 02:37:04 +0200
@@ -34,6 +34,7 @@
#include <linux/skbuff.h>
#include <linux/netlink.h>
@@ -27405,9 +26577,8 @@
snprintf(bf, sizeof(bf),
"%s\t%08X\t%08X\t%04X\t%d\t%u\t%d\t%08X\t%d\t%u\t%u",
fi->fib_dev ? fi->fib_dev->name : "*", prefix,
-diff -NurpP --minimal linux-2.6.22.9/net/ipv4/inet_connection_sock.c linux-2.6.22.9-vs2.2.0.4/net/ipv4/inet_connection_sock.c
---- linux-2.6.22.9/net/ipv4/inet_connection_sock.c 2007-07-09 13:20:05 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/ipv4/inet_connection_sock.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/net/ipv4/inet_connection_sock.c 2007-07-09 13:20:05 +0200
++++ linux-2.6.22.10-vs2.2.0.5/net/ipv4/inet_connection_sock.c 2007-06-15 02:37:04 +0200
@@ -37,7 +37,6 @@ int sysctl_local_port_range[2] = { 32768
int inet_csk_bind_conflict(const struct sock *sk,
const struct inet_bind_bucket *tb)
@@ -27428,9 +26599,8 @@
break;
}
}
-diff -NurpP --minimal linux-2.6.22.9/net/ipv4/inet_diag.c linux-2.6.22.9-vs2.2.0.4/net/ipv4/inet_diag.c
---- linux-2.6.22.9/net/ipv4/inet_diag.c 2007-09-30 15:54:34 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/ipv4/inet_diag.c 2007-10-01 15:25:35 +0200
+--- linux-2.6.22.10/net/ipv4/inet_diag.c 2007-10-30 01:57:15 +0100
++++ linux-2.6.22.10-vs2.2.0.5/net/ipv4/inet_diag.c 2007-10-01 15:25:35 +0200
@@ -697,6 +697,8 @@ static int inet_diag_dump(struct sk_buff
sk_for_each(sk, node, &hashinfo->listening_hash[i]) {
struct inet_sock *inet = inet_sk(sk);
@@ -27458,9 +26628,8 @@
if (num < s_num)
goto next_dying;
if (r->id.idiag_sport != tw->tw_sport &&
-diff -NurpP --minimal linux-2.6.22.9/net/ipv4/inet_hashtables.c linux-2.6.22.9-vs2.2.0.4/net/ipv4/inet_hashtables.c
---- linux-2.6.22.9/net/ipv4/inet_hashtables.c 2007-05-02 19:25:40 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/ipv4/inet_hashtables.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/net/ipv4/inet_hashtables.c 2007-05-02 19:25:40 +0200
++++ linux-2.6.22.10-vs2.2.0.5/net/ipv4/inet_hashtables.c 2007-06-15 02:37:04 +0200
@@ -140,11 +140,10 @@ static struct sock *inet_lookup_listener
const __be32 rcv_saddr = inet->rcv_saddr;
int score = sk->sk_family == PF_INET ? 1 : 0;
@@ -27485,9 +26654,8 @@
(sk->sk_family == PF_INET || !ipv6_only_sock(sk)) &&
!sk->sk_bound_dev_if)
goto sherry_cache;
-diff -NurpP --minimal linux-2.6.22.9/net/ipv4/raw.c linux-2.6.22.9-vs2.2.0.4/net/ipv4/raw.c
---- linux-2.6.22.9/net/ipv4/raw.c 2007-07-09 13:20:06 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/ipv4/raw.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/net/ipv4/raw.c 2007-07-09 13:20:06 +0200
++++ linux-2.6.22.10-vs2.2.0.5/net/ipv4/raw.c 2007-06-15 02:37:04 +0200
@@ -101,6 +101,27 @@ static void raw_v4_unhash(struct sock *s
write_unlock_bh(&raw_v4_lock);
}
@@ -27579,9 +26747,8 @@
if (!sk && ++state->bucket < RAWV4_HTABLE_SIZE) {
sk = sk_head(&raw_v4_htable[state->bucket]);
-diff -NurpP --minimal linux-2.6.22.9/net/ipv4/tcp.c linux-2.6.22.9-vs2.2.0.4/net/ipv4/tcp.c
---- linux-2.6.22.9/net/ipv4/tcp.c 2007-09-05 03:37:50 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/ipv4/tcp.c 2007-09-05 03:05:54 +0200
+--- linux-2.6.22.10/net/ipv4/tcp.c 2007-10-30 01:57:15 +0100
++++ linux-2.6.22.10-vs2.2.0.5/net/ipv4/tcp.c 2007-09-05 03:05:54 +0200
@@ -258,6 +258,7 @@
#include <linux/cache.h>
#include <linux/err.h>
@@ -27590,9 +26757,8 @@
#include <net/icmp.h>
#include <net/tcp.h>
-diff -NurpP --minimal linux-2.6.22.9/net/ipv4/tcp_ipv4.c linux-2.6.22.9-vs2.2.0.4/net/ipv4/tcp_ipv4.c
---- linux-2.6.22.9/net/ipv4/tcp_ipv4.c 2007-09-05 03:37:50 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/ipv4/tcp_ipv4.c 2007-09-05 03:05:54 +0200
+--- linux-2.6.22.10/net/ipv4/tcp_ipv4.c 2007-10-30 01:57:15 +0100
++++ linux-2.6.22.10-vs2.2.0.5/net/ipv4/tcp_ipv4.c 2007-09-05 03:05:54 +0200
@@ -1975,6 +1975,12 @@ static void *listening_get_next(struct s
req = req->dl_next;
while (1) {
@@ -27670,9 +26836,8 @@
if (sk->sk_family == st->family)
goto found;
}
-diff -NurpP --minimal linux-2.6.22.9/net/ipv4/tcp_minisocks.c linux-2.6.22.9-vs2.2.0.4/net/ipv4/tcp_minisocks.c
---- linux-2.6.22.9/net/ipv4/tcp_minisocks.c 2007-07-09 13:20:06 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/ipv4/tcp_minisocks.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/net/ipv4/tcp_minisocks.c 2007-07-09 13:20:06 +0200
++++ linux-2.6.22.10-vs2.2.0.5/net/ipv4/tcp_minisocks.c 2007-06-15 02:37:04 +0200
@@ -28,6 +28,10 @@
#include <net/inet_common.h>
#include <net/xfrm.h>
@@ -27696,9 +26861,8 @@
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
if (tw->tw_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-2.6.22.9/net/ipv4/udp.c linux-2.6.22.9-vs2.2.0.4/net/ipv4/udp.c
---- linux-2.6.22.9/net/ipv4/udp.c 2007-07-09 13:20:06 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/ipv4/udp.c 2007-06-17 06:02:02 +0200
+--- linux-2.6.22.10/net/ipv4/udp.c 2007-07-09 13:20:06 +0200
++++ linux-2.6.22.10-vs2.2.0.5/net/ipv4/udp.c 2007-06-17 06:02:02 +0200
@@ -221,11 +221,8 @@ int udp_get_port(struct sock *sk, unsign
int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
@@ -27794,9 +26958,8 @@
if (!sk && ++state->bucket < UDP_HTABLE_SIZE) {
sk = sk_head(state->hashtable + state->bucket);
-diff -NurpP --minimal linux-2.6.22.9/net/ipv6/addrconf.c linux-2.6.22.9-vs2.2.0.4/net/ipv6/addrconf.c
---- linux-2.6.22.9/net/ipv6/addrconf.c 2007-09-30 15:54:34 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/ipv6/addrconf.c 2007-10-01 15:25:35 +0200
+--- linux-2.6.22.10/net/ipv6/addrconf.c 2007-10-30 01:57:15 +0100
++++ linux-2.6.22.10-vs2.2.0.5/net/ipv6/addrconf.c 2007-10-01 15:25:35 +0200
@@ -2772,7 +2772,10 @@ static void if6_seq_stop(struct seq_file
static int if6_seq_show(struct seq_file *seq, void *v)
{
@@ -27831,9 +26994,8 @@
read_lock(&dev_base_lock);
idx = 0;
for_each_netdev(dev) {
-diff -NurpP --minimal linux-2.6.22.9/net/netlink/af_netlink.c linux-2.6.22.9-vs2.2.0.4/net/netlink/af_netlink.c
---- linux-2.6.22.9/net/netlink/af_netlink.c 2007-07-09 13:20:07 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/netlink/af_netlink.c 2007-06-15 05:43:32 +0200
+--- linux-2.6.22.10/net/netlink/af_netlink.c 2007-07-09 13:20:07 +0200
++++ linux-2.6.22.10-vs2.2.0.5/net/netlink/af_netlink.c 2007-06-15 05:43:32 +0200
@@ -56,6 +56,9 @@
#include <linux/audit.h>
#include <linux/selinux.h>
@@ -27844,9 +27006,8 @@
#include <net/sock.h>
#include <net/scm.h>
-diff -NurpP --minimal linux-2.6.22.9/net/socket.c linux-2.6.22.9-vs2.2.0.4/net/socket.c
---- linux-2.6.22.9/net/socket.c 2007-09-05 03:37:51 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/socket.c 2007-09-05 03:05:54 +0200
+--- linux-2.6.22.10/net/socket.c 2007-10-30 01:57:15 +0100
++++ linux-2.6.22.10-vs2.2.0.5/net/socket.c 2007-09-05 03:05:54 +0200
@@ -92,6 +92,8 @@
#include <net/sock.h>
@@ -27950,9 +27111,8 @@
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-2.6.22.9/net/sunrpc/auth.c linux-2.6.22.9-vs2.2.0.4/net/sunrpc/auth.c
---- linux-2.6.22.9/net/sunrpc/auth.c 2007-05-02 19:25:48 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/sunrpc/auth.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/net/sunrpc/auth.c 2007-05-02 19:25:48 +0200
++++ linux-2.6.22.10-vs2.2.0.5/net/sunrpc/auth.c 2007-06-15 02:37:04 +0200
@@ -13,6 +13,7 @@
#include <linux/errno.h>
#include <linux/sunrpc/clnt.h>
@@ -27977,9 +27137,8 @@
.group_info = current->group_info,
};
struct rpc_cred *ret;
-diff -NurpP --minimal linux-2.6.22.9/net/sunrpc/auth_unix.c linux-2.6.22.9-vs2.2.0.4/net/sunrpc/auth_unix.c
---- linux-2.6.22.9/net/sunrpc/auth_unix.c 2007-05-02 19:25:48 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/sunrpc/auth_unix.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/net/sunrpc/auth_unix.c 2007-05-02 19:25:48 +0200
++++ linux-2.6.22.10-vs2.2.0.5/net/sunrpc/auth_unix.c 2007-06-15 02:37:04 +0200
@@ -11,12 +11,14 @@
#include <linux/module.h>
#include <linux/sunrpc/clnt.h>
@@ -28045,9 +27204,8 @@
hold = p++;
for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
*p++ = htonl((u32) cred->uc_gids[i]);
-diff -NurpP --minimal linux-2.6.22.9/net/sunrpc/clnt.c linux-2.6.22.9-vs2.2.0.4/net/sunrpc/clnt.c
---- linux-2.6.22.9/net/sunrpc/clnt.c 2007-07-09 13:20:13 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/sunrpc/clnt.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/net/sunrpc/clnt.c 2007-07-09 13:20:13 +0200
++++ linux-2.6.22.10-vs2.2.0.5/net/sunrpc/clnt.c 2007-06-15 02:37:04 +0200
@@ -30,6 +30,7 @@
#include <linux/smp_lock.h>
#include <linux/utsname.h>
@@ -28067,9 +27225,8 @@
return clnt;
}
EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-2.6.22.9/net/unix/af_unix.c linux-2.6.22.9-vs2.2.0.4/net/unix/af_unix.c
---- linux-2.6.22.9/net/unix/af_unix.c 2007-07-09 13:20:13 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/unix/af_unix.c 2007-06-17 05:54:20 +0200
+--- linux-2.6.22.10/net/unix/af_unix.c 2007-07-09 13:20:13 +0200
++++ linux-2.6.22.10-vs2.2.0.5/net/unix/af_unix.c 2007-06-17 05:54:20 +0200
@@ -115,6 +115,8 @@
#include <linux/mount.h>
#include <net/checksum.h>
@@ -28097,9 +27254,8 @@
if (err)
goto out_mknod_dput;
mutex_unlock(&nd.dentry->d_inode->i_mutex);
-diff -NurpP --minimal linux-2.6.22.9/net/x25/af_x25.c linux-2.6.22.9-vs2.2.0.4/net/x25/af_x25.c
---- linux-2.6.22.9/net/x25/af_x25.c 2007-07-09 13:20:13 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/net/x25/af_x25.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/net/x25/af_x25.c 2007-07-09 13:20:13 +0200
++++ linux-2.6.22.10-vs2.2.0.5/net/x25/af_x25.c 2007-06-15 02:37:04 +0200
@@ -500,7 +500,10 @@ static int x25_create(struct socket *soc
x25 = x25_sk(sk);
@@ -28112,9 +27268,8 @@
x25_init_timers(sk);
-diff -NurpP --minimal linux-2.6.22.9/security/Kconfig linux-2.6.22.9-vs2.2.0.4/security/Kconfig
---- linux-2.6.22.9/security/Kconfig 2006-11-30 21:19:47 +0100
-+++ linux-2.6.22.9-vs2.2.0.4/security/Kconfig 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/security/Kconfig 2006-11-30 21:19:47 +0100
++++ linux-2.6.22.10-vs2.2.0.5/security/Kconfig 2007-06-15 02:37:04 +0200
@@ -6,6 +6,7 @@ menu "Security options"
config KEYS
@@ -28123,9 +27278,8 @@
help
This option provides support for retaining authentication tokens and
access keys in the kernel.
-diff -NurpP --minimal linux-2.6.22.9/security/commoncap.c linux-2.6.22.9-vs2.2.0.4/security/commoncap.c
---- linux-2.6.22.9/security/commoncap.c 2007-07-09 13:20:14 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/security/commoncap.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/security/commoncap.c 2007-07-09 13:20:14 +0200
++++ linux-2.6.22.10-vs2.2.0.5/security/commoncap.c 2007-06-15 02:37:04 +0200
@@ -22,10 +22,11 @@
#include <linux/ptrace.h>
#include <linux/xattr.h>
@@ -28168,9 +27322,8 @@
return -EPERM;
return 0;
}
-diff -NurpP --minimal linux-2.6.22.9/security/dummy.c linux-2.6.22.9-vs2.2.0.4/security/dummy.c
---- linux-2.6.22.9/security/dummy.c 2007-05-02 19:25:51 +0200
-+++ linux-2.6.22.9-vs2.2.0.4/security/dummy.c 2007-06-15 02:37:04 +0200
+--- linux-2.6.22.10/security/dummy.c 2007-05-02 19:25:51 +0200
++++ linux-2.6.22.10-vs2.2.0.5/security/dummy.c 2007-06-15 02:37:04 +0200
@@ -28,6 +28,7 @@
#include <linux/hugetlb.h>
#include <linux/ptrace.h>
@@ -28188,3 +27341,13 @@
return 0;
}
+--- linux-2.6.22.10/security/selinux/hooks.c 2007-10-30 01:57:15 +0100
++++ linux-2.6.22.10-vs2.2.0.5/security/selinux/hooks.c 2007-10-30 01:24:36 +0100
+@@ -60,7 +60,6 @@
+ #include <linux/dccp.h>
+ #include <linux/quota.h>
+ #include <linux/un.h> /* for Unix socket types */
+-#include <net/af_unix.h> /* for Unix socket types */
+ #include <linux/parser.h>
+ #include <linux/nfs_mount.h>
+ #include <net/ipv6.h>
Added: dists/sid/linux-2.6/debian/patches/series/6-extra
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/series/6-extra Sun Nov 4 00:19:32 2007
@@ -0,0 +1,2 @@
++ features/all/vserver/vs2.2.0.5.patch *_vserver *_xen-vserver
++ features/all/vserver/bindmount-dev.patch *_vserver *_xen-vserver
More information about the Kernel-svn-changes
mailing list