[kernel] r7491 - in dists/trunk/linux-2.6/debian/patches:
features/all/vserver series
Bastian Blank
waldi at costa.debian.org
Sat Sep 23 20:01:10 UTC 2006
Author: waldi
Date: Sat Sep 23 20:01:05 2006
New Revision: 7491
Added:
dists/trunk/linux-2.6/debian/patches/features/all/vserver/
dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.1-t6.patch
- copied, changed from r7302, /dists/sid/linux-2.6/debian/patches/vserver-vs2.0.2.patch
Modified:
dists/trunk/linux-2.6/debian/patches/series/1-extra
Log:
* debian/patches/features/all/vserver/vs2.0.2.1-t6.patch: Add.
* debian/patches/series/1-extra: Add vserver patches.
Copied: dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.1-t6.patch (from r7302, /dists/sid/linux-2.6/debian/patches/vserver-vs2.0.2.patch)
==============================================================================
--- /dists/sid/linux-2.6/debian/patches/vserver-vs2.0.2.patch (original)
+++ dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.1-t6.patch Sat Sep 23 20:01:05 2006
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.17.11/arch/alpha/Kconfig linux-2.6.17.11-vs2.0.2/arch/alpha/Kconfig
---- linux-2.6.17.11/arch/alpha/Kconfig 2006-06-18 04:51:38 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/alpha/Kconfig 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/alpha/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/alpha/Kconfig
+--- linux-2.6.18/arch/alpha/Kconfig 2006-06-18 04:51:38 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/alpha/Kconfig 2006-09-20 17:01:44 +0200
@@ -632,6 +632,8 @@ source "arch/alpha/oprofile/Kconfig"
source "arch/alpha/Kconfig.debug"
@@ -10,10 +10,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/alpha/kernel/entry.S linux-2.6.17.11-vs2.0.2/arch/alpha/kernel/entry.S
---- linux-2.6.17.11/arch/alpha/kernel/entry.S 2006-04-09 13:49:39 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/alpha/kernel/entry.S 2006-08-17 00:28:21 +0200
-@@ -874,24 +874,15 @@ sys_getxgid:
+diff -NurpP --minimal linux-2.6.18/arch/alpha/kernel/entry.S linux-2.6.18-vs2.0.2.1-t6/arch/alpha/kernel/entry.S
+--- linux-2.6.18/arch/alpha/kernel/entry.S 2006-09-20 16:57:57 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/alpha/kernel/entry.S 2006-09-20 17:01:44 +0200
+@@ -873,24 +873,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
sys_getxpid:
@@ -45,9 +45,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.17.11/arch/alpha/kernel/osf_sys.c linux-2.6.17.11-vs2.0.2/arch/alpha/kernel/osf_sys.c
---- linux-2.6.17.11/arch/alpha/kernel/osf_sys.c 2006-06-18 04:51:38 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/alpha/kernel/osf_sys.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/alpha/kernel/osf_sys.c linux-2.6.18-vs2.0.2.1-t6/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.18/arch/alpha/kernel/osf_sys.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/alpha/kernel/osf_sys.c 2006-09-20 20:11:48 +0200
@@ -38,6 +38,7 @@
#include <linux/uio.h>
#include <linux/vfs.h>
@@ -123,13 +123,13 @@
long len, err = -EINVAL;
offset = command-1;
-- if (offset >= sizeof(sysinfo_table)/sizeof(char *)) {
+- if (offset >= ARRAY_SIZE(sysinfo_table)) {
+ if (offset >= 9) {
/* Digital UNIX has a few unpublished interfaces here */
printk("sysinfo(%d)", command);
goto out;
}
-
+
down_read(&uts_sem);
- res = sysinfo_table[offset];
+ switch (offset)
@@ -147,9 +147,9 @@
len = strlen(res)+1;
if (len > count)
len = count;
-diff -NurpP --minimal linux-2.6.17.11/arch/alpha/kernel/ptrace.c linux-2.6.17.11-vs2.0.2/arch/alpha/kernel/ptrace.c
---- linux-2.6.17.11/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/alpha/kernel/ptrace.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/alpha/kernel/ptrace.c linux-2.6.18-vs2.0.2.1-t6/arch/alpha/kernel/ptrace.c
+--- linux-2.6.18/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/alpha/kernel/ptrace.c 2006-09-20 17:01:44 +0200
@@ -283,6 +283,11 @@ do_sys_ptrace(long request, long pid, lo
goto out_notsk;
}
@@ -162,9 +162,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out;
-diff -NurpP --minimal linux-2.6.17.11/arch/alpha/kernel/systbls.S linux-2.6.17.11-vs2.0.2/arch/alpha/kernel/systbls.S
---- linux-2.6.17.11/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/alpha/kernel/systbls.S 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/alpha/kernel/systbls.S linux-2.6.18-vs2.0.2.1-t6/arch/alpha/kernel/systbls.S
+--- linux-2.6.18/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/alpha/kernel/systbls.S 2006-09-20 17:01:44 +0200
@@ -447,7 +447,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -174,10 +174,10 @@
.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.17.11/arch/alpha/mm/init.c linux-2.6.17.11-vs2.0.2/arch/alpha/mm/init.c
---- linux-2.6.17.11/arch/alpha/mm/init.c 2006-06-18 04:51:38 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/alpha/mm/init.c 2006-08-17 00:28:21 +0200
-@@ -21,6 +21,7 @@
+diff -NurpP --minimal linux-2.6.18/arch/alpha/mm/init.c linux-2.6.18-vs2.0.2.1-t6/arch/alpha/mm/init.c
+--- linux-2.6.18/arch/alpha/mm/init.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/alpha/mm/init.c 2006-09-20 17:01:44 +0200
+@@ -20,6 +20,7 @@
#include <linux/init.h>
#include <linux/bootmem.h> /* max_low_pfn */
#include <linux/vmalloc.h>
@@ -185,10 +185,10 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.17.11/arch/arm/Kconfig linux-2.6.17.11-vs2.0.2/arch/arm/Kconfig
---- linux-2.6.17.11/arch/arm/Kconfig 2006-06-18 04:51:38 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/arm/Kconfig 2006-08-17 00:28:21 +0200
-@@ -873,6 +873,8 @@ source "arch/arm/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.18/arch/arm/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/arm/Kconfig
+--- linux-2.6.18/arch/arm/Kconfig 2006-09-20 16:57:57 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/arm/Kconfig 2006-09-20 17:01:44 +0200
+@@ -907,6 +907,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -197,9 +197,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/arm/kernel/calls.S linux-2.6.17.11-vs2.0.2/arch/arm/kernel/calls.S
---- linux-2.6.17.11/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
-+++ linux-2.6.17.11-vs2.0.2/arch/arm/kernel/calls.S 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/arm/kernel/calls.S linux-2.6.18-vs2.0.2.1-t6/arch/arm/kernel/calls.S
+--- linux-2.6.18/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/arch/arm/kernel/calls.S 2006-09-20 17:01:44 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -209,9 +209,9 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.17.11/arch/arm26/Kconfig linux-2.6.17.11-vs2.0.2/arch/arm26/Kconfig
---- linux-2.6.17.11/arch/arm26/Kconfig 2006-06-18 04:51:48 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/arm26/Kconfig 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/arm26/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/arm26/Kconfig
+--- linux-2.6.18/arch/arm26/Kconfig 2006-09-20 16:57:57 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/arm26/Kconfig 2006-09-20 17:01:44 +0200
@@ -234,6 +234,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -221,9 +221,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/arm26/kernel/calls.S linux-2.6.17.11-vs2.0.2/arch/arm26/kernel/calls.S
---- linux-2.6.17.11/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.17.11-vs2.0.2/arch/arm26/kernel/calls.S 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/arm26/kernel/calls.S linux-2.6.18-vs2.0.2.1-t6/arch/arm26/kernel/calls.S
+--- linux-2.6.18/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/arch/arm26/kernel/calls.S 2006-09-20 17:01:44 +0200
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -236,10 +236,10 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.17.11/arch/arm26/kernel/traps.c linux-2.6.17.11-vs2.0.2/arch/arm26/kernel/traps.c
---- linux-2.6.17.11/arch/arm26/kernel/traps.c 2006-06-18 04:51:48 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/arm26/kernel/traps.c 2006-08-17 00:28:21 +0200
-@@ -186,8 +186,9 @@ NORET_TYPE void die(const char *str, str
+diff -NurpP --minimal linux-2.6.18/arch/arm26/kernel/traps.c linux-2.6.18-vs2.0.2.1-t6/arch/arm26/kernel/traps.c
+--- linux-2.6.18/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/arm26/kernel/traps.c 2006-09-20 17:01:44 +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());
show_regs(regs);
@@ -251,10 +251,10 @@
if (!user_mode(regs) || in_interrupt()) {
__dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.17.11/arch/cris/Kconfig linux-2.6.17.11-vs2.0.2/arch/cris/Kconfig
---- linux-2.6.17.11/arch/cris/Kconfig 2006-06-18 04:51:48 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/cris/Kconfig 2006-08-17 00:28:21 +0200
-@@ -181,6 +181,8 @@ source "drivers/usb/Kconfig"
+diff -NurpP --minimal linux-2.6.18/arch/cris/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/cris/Kconfig
+--- linux-2.6.18/arch/cris/Kconfig 2006-09-20 16:57:57 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/cris/Kconfig 2006-09-20 17:01:44 +0200
+@@ -185,6 +185,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -263,9 +263,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/frv/mm/mmu-context.c linux-2.6.17.11-vs2.0.2/arch/frv/mm/mmu-context.c
---- linux-2.6.17.11/arch/frv/mm/mmu-context.c 2006-06-18 04:51:49 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/frv/mm/mmu-context.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/frv/mm/mmu-context.c linux-2.6.18-vs2.0.2.1-t6/arch/frv/mm/mmu-context.c
+--- linux-2.6.18/arch/frv/mm/mmu-context.c 2006-06-18 04:51:49 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/frv/mm/mmu-context.c 2006-09-20 17:01:44 +0200
@@ -11,6 +11,7 @@
#include <linux/sched.h>
@@ -274,9 +274,9 @@
#include <asm/tlbflush.h>
#define NR_CXN 4096
-diff -NurpP --minimal linux-2.6.17.11/arch/h8300/Kconfig linux-2.6.17.11-vs2.0.2/arch/h8300/Kconfig
---- linux-2.6.17.11/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/h8300/Kconfig 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/h8300/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/h8300/Kconfig
+--- linux-2.6.18/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/h8300/Kconfig 2006-09-20 17:01:44 +0200
@@ -199,6 +199,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -286,10 +286,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/i386/Kconfig linux-2.6.17.11-vs2.0.2/arch/i386/Kconfig
---- linux-2.6.17.11/arch/i386/Kconfig 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/i386/Kconfig 2006-08-17 00:28:21 +0200
-@@ -1088,6 +1088,8 @@ endmenu
+diff -NurpP --minimal linux-2.6.18/arch/i386/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/i386/Kconfig
+--- linux-2.6.18/arch/i386/Kconfig 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/i386/Kconfig 2006-09-20 17:01:44 +0200
+@@ -1142,6 +1142,8 @@ endmenu
source "arch/i386/Kconfig.debug"
@@ -298,9 +298,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/i386/kernel/sys_i386.c linux-2.6.17.11-vs2.0.2/arch/i386/kernel/sys_i386.c
---- linux-2.6.17.11/arch/i386/kernel/sys_i386.c 2006-06-18 04:51:53 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/i386/kernel/sys_i386.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/i386/kernel/sys_i386.c linux-2.6.18-vs2.0.2.1-t6/arch/i386/kernel/sys_i386.c
+--- linux-2.6.18/arch/i386/kernel/sys_i386.c 2006-06-18 04:51:53 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/i386/kernel/sys_i386.c 2006-09-20 17:01:44 +0200
@@ -19,6 +19,7 @@
#include <linux/mman.h>
#include <linux/file.h>
@@ -348,9 +348,9 @@
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.17.11/arch/i386/kernel/syscall_table.S linux-2.6.17.11-vs2.0.2/arch/i386/kernel/syscall_table.S
---- linux-2.6.17.11/arch/i386/kernel/syscall_table.S 2006-06-18 04:51:53 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/i386/kernel/syscall_table.S 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/i386/kernel/syscall_table.S linux-2.6.18-vs2.0.2.1-t6/arch/i386/kernel/syscall_table.S
+--- linux-2.6.18/arch/i386/kernel/syscall_table.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/i386/kernel/syscall_table.S 2006-09-20 17:01:44 +0200
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
@@ -360,9 +360,29 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.17.11/arch/i386/kernel/traps.c linux-2.6.17.11-vs2.0.2/arch/i386/kernel/traps.c
---- linux-2.6.17.11/arch/i386/kernel/traps.c 2006-06-18 04:51:53 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/i386/kernel/traps.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/i386/kernel/sysenter.c linux-2.6.18-vs2.0.2.1-t6/arch/i386/kernel/sysenter.c
+--- linux-2.6.18/arch/i386/kernel/sysenter.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/i386/kernel/sysenter.c 2006-09-20 21:46:26 +0200
+@@ -17,6 +17,7 @@
+ #include <linux/elf.h>
+ #include <linux/mm.h>
+ #include <linux/module.h>
++#include <linux/vs_memory.h>
+
+ #include <asm/cpufeature.h>
+ #include <asm/msr.h>
+@@ -156,7 +157,7 @@ int arch_setup_additional_pages(struct l
+ current->mm->context.vdso = (void *)addr;
+ current_thread_info()->sysenter_return =
+ (void *)VDSO_SYM(&SYSENTER_RETURN);
+- mm->total_vm++;
++ vx_vmpages_inc(mm);
+ up_fail:
+ up_write(&mm->mmap_sem);
+ return ret;
+diff -NurpP --minimal linux-2.6.18/arch/i386/kernel/traps.c linux-2.6.18-vs2.0.2.1-t6/arch/i386/kernel/traps.c
+--- linux-2.6.18/arch/i386/kernel/traps.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/i386/kernel/traps.c 2006-09-20 20:10:14 +0200
@@ -53,6 +53,7 @@
#include <asm/kdebug.h>
@@ -371,19 +391,18 @@
#include "mach_traps.h"
-@@ -268,8 +269,9 @@ void show_registers(struct pt_regs *regs
+@@ -304,8 +305,8 @@ void show_registers(struct pt_regs *regs
regs->esi, regs->edi, regs->ebp, esp);
printk(KERN_EMERG "ds: %04x es: %04x ss: %04x\n",
regs->xds & 0xffff, regs->xes & 0xffff, ss);
-- printk(KERN_EMERG "Process %s (pid: %d, threadinfo=%p task=%p)",
-- current->comm, current->pid, current_thread_info(), current);
-+ printk(KERN_EMERG "Process %s (pid: %d[#%u], threadinfo=%p task=%p)",
-+ current->comm, current->pid, current->xid,
-+ current_thread_info(), current);
+- printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)",
+- TASK_COMM_LEN, current->comm, current->pid,
++ printk(KERN_EMERG "Process %.*s (pid: %d[#%u], ti=%p task=%p task.ti=%p)",
++ TASK_COMM_LEN, current->comm, current->pid, current->xid,
+ current_thread_info(), current, current->thread_info);
/*
* When in-kernel, we also print out the stack and code at the
- * time of the fault..
-@@ -351,6 +353,8 @@ void die(const char * str, struct pt_reg
+@@ -388,6 +389,8 @@ void die(const char * str, struct pt_reg
oops_enter();
@@ -392,7 +411,7 @@
if (die.lock_owner != raw_smp_processor_id()) {
console_verbose();
spin_lock_irqsave(&die.lock, flags);
-@@ -387,9 +391,9 @@ void die(const char * str, struct pt_reg
+@@ -424,9 +427,9 @@ void die(const char * str, struct pt_reg
if (nl)
printk("\n");
if (notify_die(DIE_OOPS, str, regs, err,
@@ -404,10 +423,10 @@
/* Executive summary in case the oops scrolled away */
esp = (unsigned long) (®s->esp);
savesegment(ss, ss);
-diff -NurpP --minimal linux-2.6.17.11/arch/ia64/Kconfig linux-2.6.17.11-vs2.0.2/arch/ia64/Kconfig
---- linux-2.6.17.11/arch/ia64/Kconfig 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/ia64/Kconfig 2006-08-17 00:28:21 +0200
-@@ -506,6 +506,8 @@ endmenu
+diff -NurpP --minimal linux-2.6.18/arch/ia64/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/ia64/Kconfig
+--- linux-2.6.18/arch/ia64/Kconfig 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/ia64/Kconfig 2006-09-20 17:01:44 +0200
+@@ -525,6 +525,8 @@ endmenu
source "arch/ia64/Kconfig.debug"
@@ -416,10 +435,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/ia64/ia32/binfmt_elf32.c linux-2.6.17.11-vs2.0.2/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.17.11/arch/ia64/ia32/binfmt_elf32.c 2006-06-18 04:51:55 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/ia64/ia32/binfmt_elf32.c 2006-08-17 00:28:21 +0200
-@@ -239,7 +239,8 @@ ia32_setup_arg_pages (struct linux_binpr
+diff -NurpP --minimal linux-2.6.18/arch/ia64/ia32/binfmt_elf32.c linux-2.6.18-vs2.0.2.1-t6/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.18/arch/ia64/ia32/binfmt_elf32.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/ia64/ia32/binfmt_elf32.c 2006-09-20 17:01:44 +0200
+@@ -238,7 +238,8 @@ ia32_setup_arg_pages (struct linux_binpr
kmem_cache_free(vm_area_cachep, mpnt);
return ret;
}
@@ -429,9 +448,9 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.17.11/arch/ia64/ia32/ia32_entry.S linux-2.6.17.11-vs2.0.2/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.17.11/arch/ia64/ia32/ia32_entry.S 2006-06-18 04:51:55 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/ia64/ia32/ia32_entry.S 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/ia64/ia32/ia32_entry.S linux-2.6.18-vs2.0.2.1-t6/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.18/arch/ia64/ia32/ia32_entry.S 2006-06-18 04:51:55 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/ia64/ia32/ia32_entry.S 2006-09-20 17:01:44 +0200
@@ -483,7 +483,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -441,10 +460,10 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.17.11/arch/ia64/kernel/entry.S linux-2.6.17.11-vs2.0.2/arch/ia64/kernel/entry.S
---- linux-2.6.17.11/arch/ia64/kernel/entry.S 2006-06-18 04:51:55 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/ia64/kernel/entry.S 2006-08-17 00:28:21 +0200
-@@ -1577,7 +1577,7 @@ sys_call_table:
+diff -NurpP --minimal linux-2.6.18/arch/ia64/kernel/entry.S linux-2.6.18-vs2.0.2.1-t6/arch/ia64/kernel/entry.S
+--- linux-2.6.18/arch/ia64/kernel/entry.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/ia64/kernel/entry.S 2006-09-20 17:01:44 +0200
+@@ -1576,7 +1576,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
data8 sys_ni_syscall // reserved for kexec_load
@@ -453,10 +472,10 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.17.11/arch/ia64/kernel/perfmon.c linux-2.6.17.11-vs2.0.2/arch/ia64/kernel/perfmon.c
---- linux-2.6.17.11/arch/ia64/kernel/perfmon.c 2006-06-18 04:51:56 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/ia64/kernel/perfmon.c 2006-08-17 00:28:21 +0200
-@@ -41,6 +41,8 @@
+diff -NurpP --minimal linux-2.6.18/arch/ia64/kernel/perfmon.c linux-2.6.18-vs2.0.2.1-t6/arch/ia64/kernel/perfmon.c
+--- linux-2.6.18/arch/ia64/kernel/perfmon.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/ia64/kernel/perfmon.c 2006-09-20 17:01:44 +0200
+@@ -40,6 +40,8 @@
#include <linux/capability.h>
#include <linux/rcupdate.h>
#include <linux/completion.h>
@@ -465,7 +484,7 @@
#include <asm/errno.h>
#include <asm/intrinsics.h>
-@@ -2355,7 +2357,7 @@ pfm_smpl_buffer_alloc(struct task_struct
+@@ -2354,7 +2356,7 @@ pfm_smpl_buffer_alloc(struct task_struct
*/
insert_vm_struct(mm, vma);
@@ -474,10 +493,10 @@
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.17.11/arch/ia64/kernel/ptrace.c linux-2.6.17.11-vs2.0.2/arch/ia64/kernel/ptrace.c
---- linux-2.6.17.11/arch/ia64/kernel/ptrace.c 2006-06-18 04:51:56 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/ia64/kernel/ptrace.c 2006-08-17 00:28:21 +0200
-@@ -18,6 +18,7 @@
+diff -NurpP --minimal linux-2.6.18/arch/ia64/kernel/ptrace.c linux-2.6.18-vs2.0.2.1-t6/arch/ia64/kernel/ptrace.c
+--- linux-2.6.18/arch/ia64/kernel/ptrace.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/ia64/kernel/ptrace.c 2006-09-20 17:01:44 +0200
+@@ -17,6 +17,7 @@
#include <linux/security.h>
#include <linux/audit.h>
#include <linux/signal.h>
@@ -485,7 +504,7 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-@@ -1443,6 +1444,9 @@ sys_ptrace (long request, pid_t pid, uns
+@@ -1442,6 +1443,9 @@ sys_ptrace (long request, pid_t pid, uns
read_unlock(&tasklist_lock);
if (!child)
goto out;
@@ -495,9 +514,9 @@
ret = -EPERM;
if (pid == 1) /* no messing around with init! */
goto out_tsk;
-diff -NurpP --minimal linux-2.6.17.11/arch/ia64/mm/fault.c linux-2.6.17.11-vs2.0.2/arch/ia64/mm/fault.c
---- linux-2.6.17.11/arch/ia64/mm/fault.c 2006-06-18 04:51:56 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/ia64/mm/fault.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/ia64/mm/fault.c linux-2.6.18-vs2.0.2.1-t6/arch/ia64/mm/fault.c
+--- linux-2.6.18/arch/ia64/mm/fault.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/ia64/mm/fault.c 2006-09-20 17:01:44 +0200
@@ -10,6 +10,7 @@
#include <linux/smp_lock.h>
#include <linux/interrupt.h>
@@ -506,9 +525,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.17.11/arch/ia64/sn/kernel/xpc_main.c linux-2.6.17.11-vs2.0.2/arch/ia64/sn/kernel/xpc_main.c
---- linux-2.6.17.11/arch/ia64/sn/kernel/xpc_main.c 2006-06-18 04:51:57 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/ia64/sn/kernel/xpc_main.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/ia64/sn/kernel/xpc_main.c linux-2.6.18-vs2.0.2.1-t6/arch/ia64/sn/kernel/xpc_main.c
+--- linux-2.6.18/arch/ia64/sn/kernel/xpc_main.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/ia64/sn/kernel/xpc_main.c 2006-09-20 17:01:44 +0200
@@ -108,6 +108,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] =
0644,
NULL,
@@ -533,10 +552,10 @@
&sysctl_intvec,
NULL,
&xpc_disengage_request_min_timelimit,
-diff -NurpP --minimal linux-2.6.17.11/arch/m32r/kernel/sys_m32r.c linux-2.6.17.11-vs2.0.2/arch/m32r/kernel/sys_m32r.c
---- linux-2.6.17.11/arch/m32r/kernel/sys_m32r.c 2006-04-09 13:49:43 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/m32r/kernel/sys_m32r.c 2006-08-17 00:28:21 +0200
-@@ -21,6 +21,7 @@
+diff -NurpP --minimal linux-2.6.18/arch/m32r/kernel/sys_m32r.c linux-2.6.18-vs2.0.2.1-t6/arch/m32r/kernel/sys_m32r.c
+--- linux-2.6.18/arch/m32r/kernel/sys_m32r.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/m32r/kernel/sys_m32r.c 2006-09-20 17:01:44 +0200
+@@ -20,6 +20,7 @@
#include <linux/mman.h>
#include <linux/file.h>
#include <linux/utsname.h>
@@ -544,7 +563,7 @@
#include <asm/uaccess.h>
#include <asm/cachectl.h>
-@@ -206,7 +207,7 @@ asmlinkage int sys_uname(struct old_utsn
+@@ -205,7 +206,7 @@ asmlinkage int sys_uname(struct old_utsn
if (!name)
return -EFAULT;
down_read(&uts_sem);
@@ -553,9 +572,9 @@
up_read(&uts_sem);
return err?-EFAULT:0;
}
-diff -NurpP --minimal linux-2.6.17.11/arch/m68k/Kconfig linux-2.6.17.11-vs2.0.2/arch/m68k/Kconfig
---- linux-2.6.17.11/arch/m68k/Kconfig 2006-06-18 04:51:57 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/m68k/Kconfig 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/m68k/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/m68k/Kconfig
+--- linux-2.6.18/arch/m68k/Kconfig 2006-06-18 04:51:57 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/m68k/Kconfig 2006-09-20 17:01:44 +0200
@@ -654,6 +654,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -565,10 +584,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/m68k/kernel/ptrace.c linux-2.6.17.11-vs2.0.2/arch/m68k/kernel/ptrace.c
---- linux-2.6.17.11/arch/m68k/kernel/ptrace.c 2006-01-03 17:29:10 +0100
-+++ linux-2.6.17.11-vs2.0.2/arch/m68k/kernel/ptrace.c 2006-08-17 00:28:21 +0200
-@@ -280,6 +280,8 @@ long arch_ptrace(struct task_struct *chi
+diff -NurpP --minimal linux-2.6.18/arch/m68k/kernel/ptrace.c linux-2.6.18-vs2.0.2.1-t6/arch/m68k/kernel/ptrace.c
+--- linux-2.6.18/arch/m68k/kernel/ptrace.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/m68k/kernel/ptrace.c 2006-09-20 17:01:44 +0200
+@@ -279,6 +279,8 @@ long arch_ptrace(struct task_struct *chi
ret = ptrace_request(child, request, addr, data);
break;
}
@@ -577,10 +596,10 @@
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.17.11/arch/m68knommu/Kconfig linux-2.6.17.11-vs2.0.2/arch/m68knommu/Kconfig
---- linux-2.6.17.11/arch/m68knommu/Kconfig 2006-06-18 04:51:58 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/m68knommu/Kconfig 2006-08-17 00:28:21 +0200
-@@ -654,6 +654,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.18/arch/m68knommu/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/m68knommu/Kconfig
+--- linux-2.6.18/arch/m68knommu/Kconfig 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/m68knommu/Kconfig 2006-09-20 17:01:44 +0200
+@@ -663,6 +663,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
@@ -589,10 +608,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/mips/Kconfig linux-2.6.17.11-vs2.0.2/arch/mips/Kconfig
---- linux-2.6.17.11/arch/mips/Kconfig 2006-06-18 04:51:58 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/mips/Kconfig 2006-08-17 00:28:21 +0200
-@@ -1852,6 +1852,8 @@ source "arch/mips/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.18/arch/mips/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/mips/Kconfig
+--- linux-2.6.18/arch/mips/Kconfig 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/mips/Kconfig 2006-09-20 17:01:44 +0200
+@@ -2057,6 +2057,8 @@ source "arch/mips/oprofile/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -601,10 +620,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/mips/kernel/linux32.c linux-2.6.17.11-vs2.0.2/arch/mips/kernel/linux32.c
---- linux-2.6.17.11/arch/mips/kernel/linux32.c 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/mips/kernel/linux32.c 2006-08-17 00:28:21 +0200
-@@ -36,6 +36,7 @@
+diff -NurpP --minimal linux-2.6.18/arch/mips/kernel/linux32.c linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/linux32.c
+--- linux-2.6.18/arch/mips/kernel/linux32.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/linux32.c 2006-09-20 17:01:44 +0200
+@@ -35,6 +35,7 @@
#include <linux/security.h>
#include <linux/compat.h>
#include <linux/vfs.h>
@@ -612,7 +631,7 @@
#include <net/sock.h>
#include <net/scm.h>
-@@ -1040,7 +1041,7 @@ asmlinkage long sys32_newuname(struct ne
+@@ -1039,7 +1040,7 @@ asmlinkage long sys32_newuname(struct ne
int ret = 0;
down_read(&uts_sem);
@@ -621,21 +640,21 @@
ret = -EFAULT;
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.17.11/arch/mips/kernel/mips-mt.c linux-2.6.17.11-vs2.0.2/arch/mips/kernel/mips-mt.c
---- linux-2.6.17.11/arch/mips/kernel/mips-mt.c 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/mips/kernel/mips-mt.c 2006-08-17 00:28:21 +0200
-@@ -7,6 +7,7 @@
- #include <linux/sched.h>
+diff -NurpP --minimal linux-2.6.18/arch/mips/kernel/mips-mt.c linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/mips-mt.c
+--- linux-2.6.18/arch/mips/kernel/mips-mt.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/mips-mt.c 2006-09-20 20:02:43 +0200
+@@ -8,6 +8,7 @@
#include <linux/cpumask.h>
#include <linux/interrupt.h>
+ #include <linux/security.h>
+#include <linux/vs_cvirt.h>
#include <asm/cpu.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.17.11/arch/mips/kernel/ptrace.c linux-2.6.17.11-vs2.0.2/arch/mips/kernel/ptrace.c
---- linux-2.6.17.11/arch/mips/kernel/ptrace.c 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/mips/kernel/ptrace.c 2006-08-17 00:28:21 +0200
-@@ -490,6 +490,8 @@ asmlinkage void do_syscall_trace(struct
+diff -NurpP --minimal linux-2.6.18/arch/mips/kernel/ptrace.c linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/ptrace.c
+--- linux-2.6.18/arch/mips/kernel/ptrace.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/ptrace.c 2006-09-20 17:01:44 +0200
+@@ -479,6 +479,8 @@ asmlinkage void do_syscall_trace(struct
goto out;
if (!test_thread_flag(TIF_SYSCALL_TRACE))
goto out;
@@ -644,10 +663,10 @@
/* The 0x80 provides a way for the tracing parent to distinguish
between a syscall stop and SIGTRAP delivery */
-diff -NurpP --minimal linux-2.6.17.11/arch/mips/kernel/scall32-o32.S linux-2.6.17.11-vs2.0.2/arch/mips/kernel/scall32-o32.S
---- linux-2.6.17.11/arch/mips/kernel/scall32-o32.S 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/mips/kernel/scall32-o32.S 2006-08-17 00:28:21 +0200
-@@ -618,7 +618,7 @@ einval: li v0, -EINVAL
+diff -NurpP --minimal linux-2.6.18/arch/mips/kernel/scall32-o32.S linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/scall32-o32.S
+--- linux-2.6.18/arch/mips/kernel/scall32-o32.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/scall32-o32.S 2006-09-20 17:01:44 +0200
+@@ -630,7 +630,7 @@ einval: li v0, -EINVAL
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
sys sys_mq_getsetattr 3
@@ -656,10 +675,10 @@
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-2.6.17.11/arch/mips/kernel/scall64-64.S linux-2.6.17.11-vs2.0.2/arch/mips/kernel/scall64-64.S
---- linux-2.6.17.11/arch/mips/kernel/scall64-64.S 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/mips/kernel/scall64-64.S 2006-08-17 00:28:21 +0200
-@@ -433,7 +433,7 @@ sys_call_table:
+diff -NurpP --minimal linux-2.6.18/arch/mips/kernel/scall64-64.S linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/scall64-64.S
+--- linux-2.6.18/arch/mips/kernel/scall64-64.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/scall64-64.S 2006-09-20 17:01:44 +0200
+@@ -434,7 +434,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
PTR sys_mq_getsetattr /* 5235 */
@@ -668,10 +687,10 @@
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.17.11/arch/mips/kernel/scall64-n32.S linux-2.6.17.11-vs2.0.2/arch/mips/kernel/scall64-n32.S
---- linux-2.6.17.11/arch/mips/kernel/scall64-n32.S 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/mips/kernel/scall64-n32.S 2006-08-17 00:28:21 +0200
-@@ -359,7 +359,7 @@ EXPORT(sysn32_call_table)
+diff -NurpP --minimal linux-2.6.18/arch/mips/kernel/scall64-n32.S linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/scall64-n32.S
+--- linux-2.6.18/arch/mips/kernel/scall64-n32.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/scall64-n32.S 2006-09-20 17:01:44 +0200
+@@ -360,7 +360,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
PTR compat_sys_mq_getsetattr
@@ -680,10 +699,10 @@
PTR sysn32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.17.11/arch/mips/kernel/scall64-o32.S linux-2.6.17.11-vs2.0.2/arch/mips/kernel/scall64-o32.S
---- linux-2.6.17.11/arch/mips/kernel/scall64-o32.S 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/mips/kernel/scall64-o32.S 2006-08-17 00:28:21 +0200
-@@ -481,7 +481,7 @@ sys_call_table:
+diff -NurpP --minimal linux-2.6.18/arch/mips/kernel/scall64-o32.S linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/scall64-o32.S
+--- linux-2.6.18/arch/mips/kernel/scall64-o32.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/scall64-o32.S 2006-09-20 17:01:44 +0200
+@@ -482,7 +482,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
PTR compat_sys_mq_getsetattr
@@ -692,10 +711,10 @@
PTR sys32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.17.11/arch/mips/kernel/syscall.c linux-2.6.17.11-vs2.0.2/arch/mips/kernel/syscall.c
---- linux-2.6.17.11/arch/mips/kernel/syscall.c 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/mips/kernel/syscall.c 2006-08-17 00:28:21 +0200
-@@ -29,6 +29,7 @@
+diff -NurpP --minimal linux-2.6.18/arch/mips/kernel/syscall.c linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/syscall.c
+--- linux-2.6.18/arch/mips/kernel/syscall.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/syscall.c 2006-09-20 17:01:44 +0200
+@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/compiler.h>
#include <linux/module.h>
@@ -703,7 +722,7 @@
#include <asm/branch.h>
#include <asm/cachectl.h>
-@@ -232,7 +233,7 @@ out:
+@@ -231,7 +232,7 @@ out:
*/
asmlinkage int sys_uname(struct old_utsname __user * name)
{
@@ -712,7 +731,7 @@
return 0;
return -EFAULT;
}
-@@ -243,21 +244,23 @@ asmlinkage int sys_uname(struct old_utsn
+@@ -242,21 +243,23 @@ asmlinkage int sys_uname(struct old_utsn
asmlinkage int sys_olduname(struct oldold_utsname __user * name)
{
int error;
@@ -741,13 +760,13 @@
error = __put_user(0,name->machine+__OLD_UTS_LEN);
error = error ? -EFAULT : 0;
-diff -NurpP --minimal linux-2.6.17.11/arch/mips/kernel/sysirix.c linux-2.6.17.11-vs2.0.2/arch/mips/kernel/sysirix.c
---- linux-2.6.17.11/arch/mips/kernel/sysirix.c 2006-06-18 04:52:06 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/mips/kernel/sysirix.c 2006-08-17 00:28:21 +0200
-@@ -31,6 +31,7 @@
- #include <linux/socket.h>
+diff -NurpP --minimal linux-2.6.18/arch/mips/kernel/sysirix.c linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/sysirix.c
+--- linux-2.6.18/arch/mips/kernel/sysirix.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/mips/kernel/sysirix.c 2006-09-20 20:02:24 +0200
+@@ -32,6 +32,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
+ #include <linux/resource.h>
+#include <linux/vs_cvirt.h>
#include <asm/ptrace.h>
@@ -778,10 +797,10 @@
return -EFAULT;
}
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.17.11/arch/parisc/Kconfig linux-2.6.17.11-vs2.0.2/arch/parisc/Kconfig
---- linux-2.6.17.11/arch/parisc/Kconfig 2006-06-18 04:52:14 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/parisc/Kconfig 2006-08-17 00:28:21 +0200
-@@ -253,6 +253,8 @@ source "arch/parisc/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.18/arch/parisc/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/parisc/Kconfig
+--- linux-2.6.18/arch/parisc/Kconfig 2006-09-20 16:58:00 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/parisc/Kconfig 2006-09-20 17:01:44 +0200
+@@ -257,6 +257,8 @@ source "arch/parisc/oprofile/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -790,9 +809,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/parisc/hpux/sys_hpux.c linux-2.6.17.11-vs2.0.2/arch/parisc/hpux/sys_hpux.c
---- linux-2.6.17.11/arch/parisc/hpux/sys_hpux.c 2006-02-15 13:54:11 +0100
-+++ linux-2.6.17.11-vs2.0.2/arch/parisc/hpux/sys_hpux.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/parisc/hpux/sys_hpux.c linux-2.6.18-vs2.0.2.1-t6/arch/parisc/hpux/sys_hpux.c
+--- linux-2.6.18/arch/parisc/hpux/sys_hpux.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/parisc/hpux/sys_hpux.c 2006-09-20 17:01:44 +0200
@@ -33,6 +33,7 @@
#include <linux/utsname.h>
#include <linux/vfs.h>
@@ -860,10 +879,10 @@
goto done;
err = 0;
done:
-diff -NurpP --minimal linux-2.6.17.11/arch/parisc/kernel/sys_parisc32.c linux-2.6.17.11-vs2.0.2/arch/parisc/kernel/sys_parisc32.c
---- linux-2.6.17.11/arch/parisc/kernel/sys_parisc32.c 2006-06-18 04:52:15 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/parisc/kernel/sys_parisc32.c 2006-08-17 00:28:21 +0200
-@@ -599,6 +599,7 @@ asmlinkage int sys32_sysinfo(struct sysi
+diff -NurpP --minimal linux-2.6.18/arch/parisc/kernel/sys_parisc32.c linux-2.6.18-vs2.0.2.1-t6/arch/parisc/kernel/sys_parisc32.c
+--- linux-2.6.18/arch/parisc/kernel/sys_parisc32.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/parisc/kernel/sys_parisc32.c 2006-09-20 17:01:44 +0200
+@@ -598,6 +598,7 @@ asmlinkage int sys32_sysinfo(struct sysi
do {
seq = read_seqbegin(&xtime_lock);
@@ -871,9 +890,9 @@
val.uptime = jiffies / HZ;
val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
-diff -NurpP --minimal linux-2.6.17.11/arch/parisc/kernel/syscall_table.S linux-2.6.17.11-vs2.0.2/arch/parisc/kernel/syscall_table.S
---- linux-2.6.17.11/arch/parisc/kernel/syscall_table.S 2006-06-18 04:52:15 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/parisc/kernel/syscall_table.S 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/parisc/kernel/syscall_table.S linux-2.6.18-vs2.0.2.1-t6/arch/parisc/kernel/syscall_table.S
+--- linux-2.6.18/arch/parisc/kernel/syscall_table.S 2006-06-18 04:52:15 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/parisc/kernel/syscall_table.S 2006-09-20 17:01:44 +0200
@@ -368,7 +368,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -883,10 +902,10 @@
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-2.6.17.11/arch/powerpc/Kconfig linux-2.6.17.11-vs2.0.2/arch/powerpc/Kconfig
---- linux-2.6.17.11/arch/powerpc/Kconfig 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/powerpc/Kconfig 2006-08-17 00:28:21 +0200
-@@ -1018,6 +1018,8 @@ endmenu
+diff -NurpP --minimal linux-2.6.18/arch/powerpc/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/powerpc/Kconfig
+--- linux-2.6.18/arch/powerpc/Kconfig 2006-09-20 16:58:01 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/powerpc/Kconfig 2006-09-20 17:01:44 +0200
+@@ -1069,6 +1069,8 @@ endmenu
source "arch/powerpc/Kconfig.debug"
@@ -895,10 +914,10 @@
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.17.11/arch/powerpc/kernel/process.c linux-2.6.17.11-vs2.0.2/arch/powerpc/kernel/process.c
---- linux-2.6.17.11/arch/powerpc/kernel/process.c 2006-06-18 04:52:16 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/powerpc/kernel/process.c 2006-08-17 00:28:21 +0200
-@@ -432,8 +432,9 @@ void show_regs(struct pt_regs * regs)
+diff -NurpP --minimal linux-2.6.18/arch/powerpc/kernel/process.c linux-2.6.18-vs2.0.2.1-t6/arch/powerpc/kernel/process.c
+--- linux-2.6.18/arch/powerpc/kernel/process.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/powerpc/kernel/process.c 2006-09-20 17:01:44 +0200
+@@ -431,8 +431,9 @@ void show_regs(struct pt_regs * regs)
trap = TRAP(regs);
if (trap == 0x300 || trap == 0x600)
printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
@@ -910,9 +929,9 @@
#ifdef CONFIG_SMP
printk(" CPU: %d", smp_processor_id());
-diff -NurpP --minimal linux-2.6.17.11/arch/powerpc/kernel/syscalls.c linux-2.6.17.11-vs2.0.2/arch/powerpc/kernel/syscalls.c
---- linux-2.6.17.11/arch/powerpc/kernel/syscalls.c 2006-06-18 04:52:17 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/powerpc/kernel/syscalls.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/powerpc/kernel/syscalls.c linux-2.6.18-vs2.0.2.1-t6/arch/powerpc/kernel/syscalls.c
+--- linux-2.6.18/arch/powerpc/kernel/syscalls.c 2006-06-18 04:52:17 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/powerpc/kernel/syscalls.c 2006-09-20 17:01:44 +0200
@@ -36,6 +36,7 @@
#include <linux/file.h>
#include <linux/init.h>
@@ -972,22 +991,10 @@
error |= override_machine(name->machine);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.17.11/arch/powerpc/kernel/systbl.S linux-2.6.17.11-vs2.0.2/arch/powerpc/kernel/systbl.S
---- linux-2.6.17.11/arch/powerpc/kernel/systbl.S 2006-06-18 04:52:17 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/powerpc/kernel/systbl.S 2006-08-17 00:28:21 +0200
-@@ -296,7 +296,7 @@ COMPAT_SYS(fstatfs64)
- SYSX(sys_ni_syscall, ppc_fadvise64_64, ppc_fadvise64_64)
- PPC_SYS(rtas)
- OLDSYS(debug_setcontext)
--SYSCALL(ni_syscall)
-+SYSX(sys_vserver, sys32_vserver, sys_vserver)
- SYSCALL(ni_syscall)
- COMPAT_SYS(mbind)
- COMPAT_SYS(get_mempolicy)
-diff -NurpP --minimal linux-2.6.17.11/arch/powerpc/kernel/vdso.c linux-2.6.17.11-vs2.0.2/arch/powerpc/kernel/vdso.c
---- linux-2.6.17.11/arch/powerpc/kernel/vdso.c 2006-06-18 04:52:17 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/powerpc/kernel/vdso.c 2006-08-17 00:28:21 +0200
-@@ -23,6 +23,7 @@
+diff -NurpP --minimal linux-2.6.18/arch/powerpc/kernel/vdso.c linux-2.6.18-vs2.0.2.1-t6/arch/powerpc/kernel/vdso.c
+--- linux-2.6.18/arch/powerpc/kernel/vdso.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/powerpc/kernel/vdso.c 2006-09-20 19:58:24 +0200
+@@ -22,6 +22,7 @@
#include <linux/elf.h>
#include <linux/security.h>
#include <linux/bootmem.h>
@@ -996,18 +1003,18 @@
#include <asm/pgtable.h>
#include <asm/system.h>
@@ -293,7 +294,7 @@ int arch_setup_additional_pages(struct l
- kmem_cache_free(vm_area_cachep, vma);
- return -ENOMEM;
- }
+
+ /* Put vDSO base into mm struct and account for memory usage */
+ current->mm->context.vdso_base = vdso_base;
- mm->total_vm += (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+ vx_vmpages_add(mm, (vma->vm_end - vma->vm_start) >> PAGE_SHIFT);
up_write(&mm->mmap_sem);
-
return 0;
-diff -NurpP --minimal linux-2.6.17.11/arch/ppc/Kconfig linux-2.6.17.11-vs2.0.2/arch/ppc/Kconfig
---- linux-2.6.17.11/arch/ppc/Kconfig 2006-06-18 04:52:22 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/ppc/Kconfig 2006-08-17 00:28:21 +0200
-@@ -1414,6 +1414,8 @@ source "arch/powerpc/oprofile/Kconfig"
+
+diff -NurpP --minimal linux-2.6.18/arch/ppc/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/ppc/Kconfig
+--- linux-2.6.18/arch/ppc/Kconfig 2006-09-20 16:58:01 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/ppc/Kconfig 2006-09-20 17:01:44 +0200
+@@ -1418,6 +1418,8 @@ source "arch/powerpc/oprofile/Kconfig"
source "arch/ppc/Kconfig.debug"
@@ -1016,10 +1023,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/s390/Kconfig linux-2.6.17.11-vs2.0.2/arch/s390/Kconfig
---- linux-2.6.17.11/arch/s390/Kconfig 2006-06-18 04:52:32 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/s390/Kconfig 2006-08-17 00:28:21 +0200
-@@ -478,6 +478,8 @@ source "arch/s390/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.18/arch/s390/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/s390/Kconfig
+--- linux-2.6.18/arch/s390/Kconfig 2006-09-20 16:58:01 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/s390/Kconfig 2006-09-20 17:01:44 +0200
+@@ -491,6 +491,8 @@ source "arch/s390/oprofile/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -1028,9 +1035,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/s390/kernel/process.c linux-2.6.17.11-vs2.0.2/arch/s390/kernel/process.c
---- linux-2.6.17.11/arch/s390/kernel/process.c 2006-06-18 04:52:33 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/s390/kernel/process.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/s390/kernel/process.c linux-2.6.18-vs2.0.2.1-t6/arch/s390/kernel/process.c
+--- linux-2.6.18/arch/s390/kernel/process.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/s390/kernel/process.c 2006-09-20 17:01:44 +0200
@@ -165,9 +165,9 @@ void show_regs(struct pt_regs *regs)
struct task_struct *tsk = current;
@@ -1044,9 +1051,9 @@
show_registers(regs);
/* Show stack backtrace if pt_regs is from kernel mode */
-diff -NurpP --minimal linux-2.6.17.11/arch/s390/kernel/ptrace.c linux-2.6.17.11-vs2.0.2/arch/s390/kernel/ptrace.c
---- linux-2.6.17.11/arch/s390/kernel/ptrace.c 2006-06-18 04:52:33 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/s390/kernel/ptrace.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/s390/kernel/ptrace.c linux-2.6.18-vs2.0.2.1-t6/arch/s390/kernel/ptrace.c
+--- linux-2.6.18/arch/s390/kernel/ptrace.c 2006-06-18 04:52:33 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/s390/kernel/ptrace.c 2006-09-20 17:01:44 +0200
@@ -723,7 +723,13 @@ sys_ptrace(long request, long pid, long
goto out;
}
@@ -1061,9 +1068,9 @@
put_task_struct(child);
out:
unlock_kernel();
-diff -NurpP --minimal linux-2.6.17.11/arch/s390/kernel/syscalls.S linux-2.6.17.11-vs2.0.2/arch/s390/kernel/syscalls.S
---- linux-2.6.17.11/arch/s390/kernel/syscalls.S 2006-06-18 04:52:33 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/s390/kernel/syscalls.S 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/s390/kernel/syscalls.S linux-2.6.18-vs2.0.2.1-t6/arch/s390/kernel/syscalls.S
+--- linux-2.6.18/arch/s390/kernel/syscalls.S 2006-06-18 04:52:33 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/s390/kernel/syscalls.S 2006-09-20 17:01:44 +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)
@@ -1073,9 +1080,9 @@
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.17.11/arch/sh/Kconfig linux-2.6.17.11-vs2.0.2/arch/sh/Kconfig
---- linux-2.6.17.11/arch/sh/Kconfig 2006-06-18 04:52:33 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/sh/Kconfig 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/sh/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/sh/Kconfig
+--- linux-2.6.18/arch/sh/Kconfig 2006-09-20 16:58:01 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sh/Kconfig 2006-09-20 17:01:44 +0200
@@ -646,6 +646,8 @@ source "arch/sh/oprofile/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -1085,9 +1092,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/sh/kernel/kgdb_stub.c linux-2.6.17.11-vs2.0.2/arch/sh/kernel/kgdb_stub.c
---- linux-2.6.17.11/arch/sh/kernel/kgdb_stub.c 2004-08-14 12:54:51 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/sh/kernel/kgdb_stub.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/sh/kernel/kgdb_stub.c linux-2.6.18-vs2.0.2.1-t6/arch/sh/kernel/kgdb_stub.c
+--- linux-2.6.18/arch/sh/kernel/kgdb_stub.c 2004-08-14 12:54:51 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sh/kernel/kgdb_stub.c 2006-09-20 17:01:44 +0200
@@ -412,7 +412,7 @@ static struct task_struct *get_thread(in
if (pid == PID_MAX) pid = 0;
@@ -1097,9 +1104,9 @@
if (thread)
return thread;
-diff -NurpP --minimal linux-2.6.17.11/arch/sh/kernel/setup.c linux-2.6.17.11-vs2.0.2/arch/sh/kernel/setup.c
---- linux-2.6.17.11/arch/sh/kernel/setup.c 2006-06-18 04:52:33 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/sh/kernel/setup.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/sh/kernel/setup.c linux-2.6.18-vs2.0.2.1-t6/arch/sh/kernel/setup.c
+--- linux-2.6.18/arch/sh/kernel/setup.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sh/kernel/setup.c 2006-09-20 17:01:44 +0200
@@ -21,6 +21,7 @@
#include <linux/utsname.h>
#include <linux/cpu.h>
@@ -1117,9 +1124,9 @@
seq_printf(m, "cpu type\t: %s\n", get_cpu_subtype());
show_cpuflags(m);
-diff -NurpP --minimal linux-2.6.17.11/arch/sh/kernel/sys_sh.c linux-2.6.17.11-vs2.0.2/arch/sh/kernel/sys_sh.c
---- linux-2.6.17.11/arch/sh/kernel/sys_sh.c 2005-08-29 22:24:55 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/sh/kernel/sys_sh.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/sh/kernel/sys_sh.c linux-2.6.18-vs2.0.2.1-t6/arch/sh/kernel/sys_sh.c
+--- linux-2.6.18/arch/sh/kernel/sys_sh.c 2005-08-29 22:24:55 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sh/kernel/sys_sh.c 2006-09-20 17:01:44 +0200
@@ -21,6 +21,7 @@
#include <linux/mman.h>
#include <linux/file.h>
@@ -1137,9 +1144,9 @@
up_read(&uts_sem);
return err?-EFAULT:0;
}
-diff -NurpP --minimal linux-2.6.17.11/arch/sh64/kernel/sys_sh64.c linux-2.6.17.11-vs2.0.2/arch/sh64/kernel/sys_sh64.c
---- linux-2.6.17.11/arch/sh64/kernel/sys_sh64.c 2005-06-22 02:37:59 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/sh64/kernel/sys_sh64.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/sh64/kernel/sys_sh64.c linux-2.6.18-vs2.0.2.1-t6/arch/sh64/kernel/sys_sh64.c
+--- linux-2.6.18/arch/sh64/kernel/sys_sh64.c 2005-06-22 02:37:59 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sh64/kernel/sys_sh64.c 2006-09-20 17:01:44 +0200
@@ -29,6 +29,7 @@
#include <linux/file.h>
#include <linux/utsname.h>
@@ -1157,9 +1164,9 @@
up_read(&uts_sem);
return err?-EFAULT:0;
}
-diff -NurpP --minimal linux-2.6.17.11/arch/sparc/Kconfig linux-2.6.17.11-vs2.0.2/arch/sparc/Kconfig
---- linux-2.6.17.11/arch/sparc/Kconfig 2006-06-18 04:52:33 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/sparc/Kconfig 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/sparc/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/sparc/Kconfig
+--- linux-2.6.18/arch/sparc/Kconfig 2006-06-18 04:52:33 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sparc/Kconfig 2006-09-20 17:01:44 +0200
@@ -291,6 +291,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
@@ -1169,9 +1176,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/sparc/kernel/ptrace.c linux-2.6.17.11-vs2.0.2/arch/sparc/kernel/ptrace.c
---- linux-2.6.17.11/arch/sparc/kernel/ptrace.c 2006-04-09 13:49:44 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/sparc/kernel/ptrace.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/sparc/kernel/ptrace.c linux-2.6.18-vs2.0.2.1-t6/arch/sparc/kernel/ptrace.c
+--- linux-2.6.18/arch/sparc/kernel/ptrace.c 2006-04-09 13:49:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sparc/kernel/ptrace.c 2006-09-20 17:01:44 +0200
@@ -299,6 +299,10 @@ asmlinkage void do_ptrace(struct pt_regs
pt_error_return(regs, -ret);
goto out;
@@ -1183,9 +1190,9 @@
if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
|| (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
-diff -NurpP --minimal linux-2.6.17.11/arch/sparc/kernel/sys_sparc.c linux-2.6.17.11-vs2.0.2/arch/sparc/kernel/sys_sparc.c
---- linux-2.6.17.11/arch/sparc/kernel/sys_sparc.c 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/sparc/kernel/sys_sparc.c 2006-08-25 05:44:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/sparc/kernel/sys_sparc.c linux-2.6.18-vs2.0.2.1-t6/arch/sparc/kernel/sys_sparc.c
+--- linux-2.6.18/arch/sparc/kernel/sys_sparc.c 2006-09-20 16:58:04 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sparc/kernel/sys_sparc.c 2006-09-20 19:57:58 +0200
@@ -21,6 +21,7 @@
#include <linux/utsname.h>
#include <linux/smp.h>
@@ -1194,25 +1201,25 @@
#include <asm/uaccess.h>
#include <asm/ipc.h>
-@@ -473,13 +474,13 @@ asmlinkage int sys_getdomainname(char __
-
+@@ -475,13 +476,13 @@ asmlinkage int sys_getdomainname(char __
+
down_read(&uts_sem);
- nlen = strlen(system_utsname.domainname) + 1;
+ nlen = strlen(vx_new_uts(domainname)) + 1;
+ err = -EINVAL;
+ if (nlen > len)
+ goto out;
- if (nlen < len)
- len = nlen;
- if (len > __NEW_UTS_LEN)
- goto done;
-- if (copy_to_user(name, system_utsname.domainname, len))
-+ if (copy_to_user(name, vx_new_uts(domainname), len))
- goto done;
- err = 0;
- done:
-diff -NurpP --minimal linux-2.6.17.11/arch/sparc/kernel/sys_sunos.c linux-2.6.17.11-vs2.0.2/arch/sparc/kernel/sys_sunos.c
---- linux-2.6.17.11/arch/sparc/kernel/sys_sunos.c 2006-02-15 13:54:13 +0100
-+++ linux-2.6.17.11-vs2.0.2/arch/sparc/kernel/sys_sunos.c 2006-08-17 00:28:21 +0200
+ err = -EFAULT;
+- if (!copy_to_user(name, system_utsname.domainname, nlen))
++ if (!copy_to_user(name, vx_new_uts(domainname), nlen))
+ err = 0;
+
+ out:
+diff -NurpP --minimal linux-2.6.18/arch/sparc/kernel/sys_sunos.c linux-2.6.18-vs2.0.2.1-t6/arch/sparc/kernel/sys_sunos.c
+--- linux-2.6.18/arch/sparc/kernel/sys_sunos.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sparc/kernel/sys_sunos.c 2006-09-20 17:01:44 +0200
@@ -35,6 +35,7 @@
#include <linux/smp.h>
#include <linux/smp_lock.h>
@@ -1243,10 +1250,10 @@
}
up_read(&uts_sem);
return ret ? -EFAULT : 0;
-diff -NurpP --minimal linux-2.6.17.11/arch/sparc/kernel/systbls.S linux-2.6.17.11-vs2.0.2/arch/sparc/kernel/systbls.S
---- linux-2.6.17.11/arch/sparc/kernel/systbls.S 2006-06-18 04:52:34 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/sparc/kernel/systbls.S 2006-08-17 00:28:21 +0200
-@@ -72,7 +72,7 @@ sys_call_table:
+diff -NurpP --minimal linux-2.6.18/arch/sparc/kernel/systbls.S linux-2.6.18-vs2.0.2.1-t6/arch/sparc/kernel/systbls.S
+--- linux-2.6.18/arch/sparc/kernel/systbls.S 2006-09-20 16:58:06 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sparc/kernel/systbls.S 2006-09-20 17:01:44 +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
/*260*/ .long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
@@ -1255,10 +1262,10 @@
/*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.17.11/arch/sparc64/Kconfig linux-2.6.17.11-vs2.0.2/arch/sparc64/Kconfig
---- linux-2.6.17.11/arch/sparc64/Kconfig 2006-06-18 04:52:34 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/sparc64/Kconfig 2006-08-17 00:28:21 +0200
-@@ -423,6 +423,8 @@ endmenu
+diff -NurpP --minimal linux-2.6.18/arch/sparc64/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/sparc64/Kconfig
+--- linux-2.6.18/arch/sparc64/Kconfig 2006-09-20 16:58:06 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sparc64/Kconfig 2006-09-20 17:01:44 +0200
+@@ -431,6 +431,8 @@ endmenu
source "arch/sparc64/Kconfig.debug"
@@ -1267,9 +1274,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/sparc64/kernel/binfmt_aout32.c linux-2.6.17.11-vs2.0.2/arch/sparc64/kernel/binfmt_aout32.c
---- linux-2.6.17.11/arch/sparc64/kernel/binfmt_aout32.c 2006-06-18 04:52:34 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/sparc64/kernel/binfmt_aout32.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/sparc64/kernel/binfmt_aout32.c linux-2.6.18-vs2.0.2.1-t6/arch/sparc64/kernel/binfmt_aout32.c
+--- linux-2.6.18/arch/sparc64/kernel/binfmt_aout32.c 2006-06-18 04:52:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sparc64/kernel/binfmt_aout32.c 2006-09-20 17:01:44 +0200
@@ -27,6 +27,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
@@ -1278,9 +1285,9 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.17.11/arch/sparc64/kernel/ptrace.c linux-2.6.17.11-vs2.0.2/arch/sparc64/kernel/ptrace.c
---- linux-2.6.17.11/arch/sparc64/kernel/ptrace.c 2006-06-18 04:52:35 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/sparc64/kernel/ptrace.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/sparc64/kernel/ptrace.c linux-2.6.18-vs2.0.2.1-t6/arch/sparc64/kernel/ptrace.c
+--- linux-2.6.18/arch/sparc64/kernel/ptrace.c 2006-06-18 04:52:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sparc64/kernel/ptrace.c 2006-09-20 17:01:44 +0200
@@ -212,6 +212,10 @@ asmlinkage void do_ptrace(struct pt_regs
pt_error_return(regs, -ret);
goto out;
@@ -1292,10 +1299,10 @@
if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
|| (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
-diff -NurpP --minimal linux-2.6.17.11/arch/sparc64/kernel/sys_sparc.c linux-2.6.17.11-vs2.0.2/arch/sparc64/kernel/sys_sparc.c
---- linux-2.6.17.11/arch/sparc64/kernel/sys_sparc.c 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/sparc64/kernel/sys_sparc.c 2006-08-25 05:44:21 +0200
-@@ -26,6 +26,7 @@
+diff -NurpP --minimal linux-2.6.18/arch/sparc64/kernel/sys_sparc.c linux-2.6.18-vs2.0.2.1-t6/arch/sparc64/kernel/sys_sparc.c
+--- linux-2.6.18/arch/sparc64/kernel/sys_sparc.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sparc64/kernel/sys_sparc.c 2006-09-20 19:57:05 +0200
+@@ -25,6 +25,7 @@
#include <linux/ipc.h>
#include <linux/personality.h>
#include <linux/random.h>
@@ -1303,25 +1310,25 @@
#include <asm/uaccess.h>
#include <asm/ipc.h>
-@@ -711,13 +712,13 @@ asmlinkage long sys_getdomainname(char _
+@@ -712,13 +713,13 @@ asmlinkage long sys_getdomainname(char _
down_read(&uts_sem);
- nlen = strlen(system_utsname.domainname) + 1;
+ nlen = strlen(vx_new_uts(domainname)) + 1;
+ err = -EINVAL;
+ if (nlen > len)
+ goto out;
- if (nlen < len)
- len = nlen;
- if (len > __NEW_UTS_LEN)
- goto done;
-- if (copy_to_user(name, system_utsname.domainname, len))
-+ if (copy_to_user(name, vx_new_uts(domainname), len))
- goto done;
- err = 0;
- done:
-diff -NurpP --minimal linux-2.6.17.11/arch/sparc64/kernel/sys_sunos32.c linux-2.6.17.11-vs2.0.2/arch/sparc64/kernel/sys_sunos32.c
---- linux-2.6.17.11/arch/sparc64/kernel/sys_sunos32.c 2006-02-15 13:54:13 +0100
-+++ linux-2.6.17.11-vs2.0.2/arch/sparc64/kernel/sys_sunos32.c 2006-08-17 00:28:21 +0200
+ err = -EFAULT;
+- if (!copy_to_user(name, system_utsname.domainname, nlen))
++ if (!copy_to_user(name, vx_new_uts(domainname), nlen))
+ err = 0;
+
+ out:
+diff -NurpP --minimal linux-2.6.18/arch/sparc64/kernel/sys_sunos32.c linux-2.6.18-vs2.0.2.1-t6/arch/sparc64/kernel/sys_sunos32.c
+--- linux-2.6.18/arch/sparc64/kernel/sys_sunos32.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sparc64/kernel/sys_sunos32.c 2006-09-20 17:01:44 +0200
@@ -35,6 +35,7 @@
#include <linux/smp.h>
#include <linux/smp_lock.h>
@@ -1356,10 +1363,10 @@
sizeof(name->mach) - 1);
up_read(&uts_sem);
return (ret ? -EFAULT : 0);
-diff -NurpP --minimal linux-2.6.17.11/arch/sparc64/kernel/systbls.S linux-2.6.17.11-vs2.0.2/arch/sparc64/kernel/systbls.S
---- linux-2.6.17.11/arch/sparc64/kernel/systbls.S 2006-06-18 04:52:35 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/sparc64/kernel/systbls.S 2006-08-17 00:28:21 +0200
-@@ -73,7 +73,7 @@ sys_call_table32:
+diff -NurpP --minimal linux-2.6.18/arch/sparc64/kernel/systbls.S linux-2.6.18-vs2.0.2.1-t6/arch/sparc64/kernel/systbls.S
+--- linux-2.6.18/arch/sparc64/kernel/systbls.S 2006-09-20 16:58:06 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sparc64/kernel/systbls.S 2006-09-20 17:01:44 +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
/*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun
@@ -1368,7 +1375,7 @@
/*270*/ .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink
.word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
/*280*/ .word sys32_tee, sys_add_key, sys_request_key, sys_keyctl, compat_sys_openat
-@@ -143,7 +143,7 @@ sys_call_table:
+@@ -142,7 +142,7 @@ sys_call_table:
/*250*/ .word sys64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
.word sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
/*260*/ .word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
@@ -1377,9 +1384,9 @@
/*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.17.11/arch/sparc64/solaris/fs.c linux-2.6.17.11-vs2.0.2/arch/sparc64/solaris/fs.c
---- linux-2.6.17.11/arch/sparc64/solaris/fs.c 2006-04-09 13:49:44 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/sparc64/solaris/fs.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/sparc64/solaris/fs.c linux-2.6.18-vs2.0.2.1-t6/arch/sparc64/solaris/fs.c
+--- linux-2.6.18/arch/sparc64/solaris/fs.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sparc64/solaris/fs.c 2006-09-20 17:01:44 +0200
@@ -363,7 +363,7 @@ static int report_statvfs(struct vfsmoun
int j = strlen (p);
@@ -1398,10 +1405,10 @@
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.17.11/arch/sparc64/solaris/misc.c linux-2.6.17.11-vs2.0.2/arch/sparc64/solaris/misc.c
---- linux-2.6.17.11/arch/sparc64/solaris/misc.c 2006-06-18 04:52:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/sparc64/solaris/misc.c 2006-08-17 00:28:21 +0200
-@@ -17,6 +17,7 @@
+diff -NurpP --minimal linux-2.6.18/arch/sparc64/solaris/misc.c linux-2.6.18-vs2.0.2.1-t6/arch/sparc64/solaris/misc.c
+--- linux-2.6.18/arch/sparc64/solaris/misc.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/sparc64/solaris/misc.c 2006-09-20 17:01:44 +0200
+@@ -16,6 +16,7 @@
#include <linux/timex.h>
#include <linux/major.h>
#include <linux/compat.h>
@@ -1409,7 +1416,7 @@
#include <asm/uaccess.h>
#include <asm/string.h>
-@@ -239,7 +240,7 @@ asmlinkage int solaris_utssys(u32 buf, u
+@@ -248,7 +249,7 @@ asmlinkage int solaris_utssys(u32 buf, u
/* Let's cheat */
err = set_utsfield(v->sysname, "SunOS", 1, 0);
down_read(&uts_sem);
@@ -1418,7 +1425,7 @@
1, 1);
up_read(&uts_sem);
err |= set_utsfield(v->release, "2.6", 0, 0);
-@@ -263,7 +264,7 @@ asmlinkage int solaris_utsname(u32 buf)
+@@ -272,7 +273,7 @@ asmlinkage int solaris_utsname(u32 buf)
/* Why should we not lie a bit? */
down_read(&uts_sem);
err = set_utsfield(v->sysname, "SunOS", 0, 0);
@@ -1427,7 +1434,7 @@
err |= set_utsfield(v->release, "5.6", 0, 0);
err |= set_utsfield(v->version, "Generic", 0, 0);
err |= set_utsfield(v->machine, machine(), 0, 0);
-@@ -295,7 +296,7 @@ asmlinkage int solaris_sysinfo(int cmd,
+@@ -304,7 +305,7 @@ asmlinkage int solaris_sysinfo(int cmd,
case SI_HOSTNAME:
r = buffer + 256;
down_read(&uts_sem);
@@ -1436,9 +1443,9 @@
q < r && *p && *p != '.'; *q++ = *p++);
up_read(&uts_sem);
*q = 0;
-diff -NurpP --minimal linux-2.6.17.11/arch/um/Kconfig linux-2.6.17.11-vs2.0.2/arch/um/Kconfig
---- linux-2.6.17.11/arch/um/Kconfig 2006-06-18 04:52:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/um/Kconfig 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/um/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/um/Kconfig
+--- linux-2.6.18/arch/um/Kconfig 2006-06-18 04:52:36 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/um/Kconfig 2006-09-20 17:01:44 +0200
@@ -279,6 +279,8 @@ source "drivers/connector/Kconfig"
source "fs/Kconfig"
@@ -1448,9 +1455,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/um/drivers/mconsole_kern.c linux-2.6.17.11-vs2.0.2/arch/um/drivers/mconsole_kern.c
---- linux-2.6.17.11/arch/um/drivers/mconsole_kern.c 2006-06-18 04:52:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/um/drivers/mconsole_kern.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/um/drivers/mconsole_kern.c linux-2.6.18-vs2.0.2.1-t6/arch/um/drivers/mconsole_kern.c
+--- linux-2.6.18/arch/um/drivers/mconsole_kern.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/um/drivers/mconsole_kern.c 2006-09-20 17:01:44 +0200
@@ -23,6 +23,7 @@
#include "linux/list.h"
#include "linux/mm.h"
@@ -1459,9 +1466,9 @@
#include "asm/irq.h"
#include "asm/uaccess.h"
#include "user_util.h"
-diff -NurpP --minimal linux-2.6.17.11/arch/um/kernel/syscall_kern.c linux-2.6.17.11-vs2.0.2/arch/um/kernel/syscall_kern.c
---- linux-2.6.17.11/arch/um/kernel/syscall_kern.c 2006-06-18 04:52:38 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/um/kernel/syscall_kern.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/um/kernel/syscall.c linux-2.6.18-vs2.0.2.1-t6/arch/um/kernel/syscall.c
+--- linux-2.6.18/arch/um/kernel/syscall.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/um/kernel/syscall.c 2006-09-21 16:41:49 +0200
@@ -15,6 +15,8 @@
#include "linux/unistd.h"
#include "linux/slab.h"
@@ -1475,8 +1482,8 @@
if (!name)
return -EFAULT;
down_read(&uts_sem);
-- err=copy_to_user(name, &system_utsname, sizeof (*name));
-+ err=copy_to_user(name, vx_new_utsname(), sizeof (*name));
+- err = copy_to_user(name, &system_utsname, sizeof (*name));
++ err = copy_to_user(name, vx_new_utsname(), sizeof (*name));
up_read(&uts_sem);
return err?-EFAULT:0;
}
@@ -1489,9 +1496,9 @@
if (!name)
return -EFAULT;
@@ -126,19 +129,20 @@ long sys_olduname(struct oldold_utsname
-
+
down_read(&uts_sem);
-
+
- error = __copy_to_user(&name->sysname,&system_utsname.sysname,
+ ptr = vx_new_utsname();
+ error = __copy_to_user(&name->sysname,ptr->sysname,
@@ -1513,10 +1520,10 @@
+ error |= __copy_to_user(&name->machine,ptr->machine,
__OLD_UTS_LEN);
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
-
-diff -NurpP --minimal linux-2.6.17.11/arch/um/sys-x86_64/syscalls.c linux-2.6.17.11-vs2.0.2/arch/um/sys-x86_64/syscalls.c
---- linux-2.6.17.11/arch/um/sys-x86_64/syscalls.c 2006-06-18 04:52:42 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/um/sys-x86_64/syscalls.c 2006-08-17 00:28:21 +0200
+
+diff -NurpP --minimal linux-2.6.18/arch/um/sys-x86_64/syscalls.c linux-2.6.18-vs2.0.2.1-t6/arch/um/sys-x86_64/syscalls.c
+--- linux-2.6.18/arch/um/sys-x86_64/syscalls.c 2006-06-18 04:52:42 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/um/sys-x86_64/syscalls.c 2006-09-20 17:01:44 +0200
@@ -9,6 +9,7 @@
#include "linux/shm.h"
#include "linux/utsname.h"
@@ -1534,9 +1541,9 @@
up_read(&uts_sem);
if (personality(current->personality) == PER_LINUX32)
err |= copy_to_user(&name->machine, "i686", 5);
-diff -NurpP --minimal linux-2.6.17.11/arch/v850/Kconfig linux-2.6.17.11-vs2.0.2/arch/v850/Kconfig
---- linux-2.6.17.11/arch/v850/Kconfig 2006-06-18 04:52:42 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/v850/Kconfig 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/v850/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/v850/Kconfig
+--- linux-2.6.18/arch/v850/Kconfig 2006-06-18 04:52:42 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/v850/Kconfig 2006-09-20 17:01:44 +0200
@@ -326,6 +326,8 @@ source "drivers/usb/Kconfig"
source "arch/v850/Kconfig.debug"
@@ -1546,9 +1553,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/v850/kernel/ptrace.c linux-2.6.17.11-vs2.0.2/arch/v850/kernel/ptrace.c
---- linux-2.6.17.11/arch/v850/kernel/ptrace.c 2006-04-09 13:49:44 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/v850/kernel/ptrace.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/v850/kernel/ptrace.c linux-2.6.18-vs2.0.2.1-t6/arch/v850/kernel/ptrace.c
+--- linux-2.6.18/arch/v850/kernel/ptrace.c 2006-04-09 13:49:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/v850/kernel/ptrace.c 2006-09-20 17:01:44 +0200
@@ -117,6 +117,9 @@ long arch_ptrace(struct task_struct *chi
{
int rval;
@@ -1559,10 +1566,10 @@
switch (request) {
unsigned long val, copied;
-diff -NurpP --minimal linux-2.6.17.11/arch/x86_64/Kconfig linux-2.6.17.11-vs2.0.2/arch/x86_64/Kconfig
---- linux-2.6.17.11/arch/x86_64/Kconfig 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/x86_64/Kconfig 2006-08-17 00:28:21 +0200
-@@ -617,6 +617,8 @@ endmenu
+diff -NurpP --minimal linux-2.6.18/arch/x86_64/Kconfig linux-2.6.18-vs2.0.2.1-t6/arch/x86_64/Kconfig
+--- linux-2.6.18/arch/x86_64/Kconfig 2006-09-20 16:58:06 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/x86_64/Kconfig 2006-09-20 17:01:44 +0200
+@@ -654,6 +654,8 @@ endmenu
source "arch/x86_64/Kconfig.debug"
@@ -1571,9 +1578,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.17.11/arch/x86_64/ia32/ia32_aout.c linux-2.6.17.11-vs2.0.2/arch/x86_64/ia32/ia32_aout.c
---- linux-2.6.17.11/arch/x86_64/ia32/ia32_aout.c 2006-01-03 17:29:20 +0100
-+++ linux-2.6.17.11-vs2.0.2/arch/x86_64/ia32/ia32_aout.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/x86_64/ia32/ia32_aout.c linux-2.6.18-vs2.0.2.1-t6/arch/x86_64/ia32/ia32_aout.c
+--- linux-2.6.18/arch/x86_64/ia32/ia32_aout.c 2006-01-03 17:29:20 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/arch/x86_64/ia32/ia32_aout.c 2006-09-20 17:01:44 +0200
@@ -25,6 +25,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
@@ -1582,10 +1589,10 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.17.11/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.17.11-vs2.0.2/arch/x86_64/ia32/ia32_binfmt.c
---- linux-2.6.17.11/arch/x86_64/ia32/ia32_binfmt.c 2006-06-18 04:52:43 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/x86_64/ia32/ia32_binfmt.c 2006-08-17 00:28:21 +0200
-@@ -371,7 +371,8 @@ int ia32_setup_arg_pages(struct linux_bi
+diff -NurpP --minimal linux-2.6.18/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.18-vs2.0.2.1-t6/arch/x86_64/ia32/ia32_binfmt.c
+--- linux-2.6.18/arch/x86_64/ia32/ia32_binfmt.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/x86_64/ia32/ia32_binfmt.c 2006-09-20 17:01:44 +0200
+@@ -376,7 +376,8 @@ int ia32_setup_arg_pages(struct linux_bi
kmem_cache_free(vm_area_cachep, mpnt);
return ret;
}
@@ -1595,10 +1602,10 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.17.11/arch/x86_64/ia32/ia32entry.S linux-2.6.17.11-vs2.0.2/arch/x86_64/ia32/ia32entry.S
---- linux-2.6.17.11/arch/x86_64/ia32/ia32entry.S 2006-06-18 04:52:43 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/x86_64/ia32/ia32entry.S 2006-08-17 00:28:21 +0200
-@@ -652,7 +652,7 @@ ia32_sys_call_table:
+diff -NurpP --minimal linux-2.6.18/arch/x86_64/ia32/ia32entry.S linux-2.6.18-vs2.0.2.1-t6/arch/x86_64/ia32/ia32entry.S
+--- linux-2.6.18/arch/x86_64/ia32/ia32entry.S 2006-09-20 16:58:06 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/x86_64/ia32/ia32entry.S 2006-09-20 17:01:44 +0200
+@@ -668,7 +668,7 @@ ia32_sys_call_table:
.quad sys_tgkill /* 270 */
.quad compat_sys_utimes
.quad sys32_fadvise64_64
@@ -1607,10 +1614,10 @@
.quad sys_mbind
.quad compat_sys_get_mempolicy /* 275 */
.quad sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.17.11/arch/x86_64/ia32/sys_ia32.c linux-2.6.17.11-vs2.0.2/arch/x86_64/ia32/sys_ia32.c
---- linux-2.6.17.11/arch/x86_64/ia32/sys_ia32.c 2006-06-18 04:52:43 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/x86_64/ia32/sys_ia32.c 2006-08-17 00:28:21 +0200
-@@ -61,6 +61,7 @@
+diff -NurpP --minimal linux-2.6.18/arch/x86_64/ia32/sys_ia32.c linux-2.6.18-vs2.0.2.1-t6/arch/x86_64/ia32/sys_ia32.c
+--- linux-2.6.18/arch/x86_64/ia32/sys_ia32.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/x86_64/ia32/sys_ia32.c 2006-09-20 17:01:44 +0200
+@@ -60,6 +60,7 @@
#include <linux/highuid.h>
#include <linux/vmalloc.h>
#include <linux/fsnotify.h>
@@ -1618,7 +1625,7 @@
#include <asm/mman.h>
#include <asm/types.h>
#include <asm/uaccess.h>
-@@ -793,6 +794,7 @@ asmlinkage long sys32_mmap2(unsigned lon
+@@ -779,6 +780,7 @@ asmlinkage long sys32_mmap2(unsigned lon
asmlinkage long sys32_olduname(struct oldold_utsname __user * name)
{
int error;
@@ -1626,7 +1633,7 @@
if (!name)
return -EFAULT;
-@@ -801,13 +803,14 @@ asmlinkage long sys32_olduname(struct ol
+@@ -787,13 +789,14 @@ asmlinkage long sys32_olduname(struct ol
down_read(&uts_sem);
@@ -1645,7 +1652,7 @@
__put_user(0,name->version+__OLD_UTS_LEN);
{
char *arch = "x86_64";
-@@ -830,7 +833,7 @@ long sys32_uname(struct old_utsname __us
+@@ -816,7 +819,7 @@ long sys32_uname(struct old_utsname __us
if (!name)
return -EFAULT;
down_read(&uts_sem);
@@ -1654,9 +1661,9 @@
up_read(&uts_sem);
if (personality(current->personality) == PER_LINUX32)
err |= copy_to_user(&name->machine, "i686", 5);
-diff -NurpP --minimal linux-2.6.17.11/arch/x86_64/ia32/syscall32.c linux-2.6.17.11-vs2.0.2/arch/x86_64/ia32/syscall32.c
---- linux-2.6.17.11/arch/x86_64/ia32/syscall32.c 2005-10-28 20:49:18 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/x86_64/ia32/syscall32.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/x86_64/ia32/syscall32.c linux-2.6.18-vs2.0.2.1-t6/arch/x86_64/ia32/syscall32.c
+--- linux-2.6.18/arch/x86_64/ia32/syscall32.c 2005-10-28 20:49:18 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/x86_64/ia32/syscall32.c 2006-09-20 17:01:44 +0200
@@ -10,6 +10,7 @@
#include <linux/init.h>
#include <linux/stringify.h>
@@ -1674,9 +1681,9 @@
up_write(&mm->mmap_sem);
return 0;
}
-diff -NurpP --minimal linux-2.6.17.11/arch/x86_64/kernel/sys_x86_64.c linux-2.6.17.11-vs2.0.2/arch/x86_64/kernel/sys_x86_64.c
---- linux-2.6.17.11/arch/x86_64/kernel/sys_x86_64.c 2006-01-03 17:29:20 +0100
-+++ linux-2.6.17.11-vs2.0.2/arch/x86_64/kernel/sys_x86_64.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/arch/x86_64/kernel/sys_x86_64.c linux-2.6.18-vs2.0.2.1-t6/arch/x86_64/kernel/sys_x86_64.c
+--- linux-2.6.18/arch/x86_64/kernel/sys_x86_64.c 2006-01-03 17:29:20 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/arch/x86_64/kernel/sys_x86_64.c 2006-09-20 17:01:44 +0200
@@ -16,6 +16,7 @@
#include <linux/file.h>
#include <linux/utsname.h>
@@ -1694,10 +1701,10 @@
up_read(&uts_sem);
if (personality(current->personality) == PER_LINUX32)
err |= copy_to_user(&name->machine, "i686", 5);
-diff -NurpP --minimal linux-2.6.17.11/arch/x86_64/kernel/traps.c linux-2.6.17.11-vs2.0.2/arch/x86_64/kernel/traps.c
---- linux-2.6.17.11/arch/x86_64/kernel/traps.c 2006-06-18 04:52:44 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/x86_64/kernel/traps.c 2006-08-17 00:28:21 +0200
-@@ -324,8 +324,9 @@ void show_registers(struct pt_regs *regs
+diff -NurpP --minimal linux-2.6.18/arch/x86_64/kernel/traps.c linux-2.6.18-vs2.0.2.1-t6/arch/x86_64/kernel/traps.c
+--- linux-2.6.18/arch/x86_64/kernel/traps.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/x86_64/kernel/traps.c 2006-09-20 17:01:44 +0200
+@@ -435,8 +435,9 @@ void show_registers(struct pt_regs *regs
printk("CPU %d ", cpu);
__show_regs(regs);
@@ -1709,10 +1716,10 @@
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.17.11/arch/xtensa/kernel/syscalls.c linux-2.6.17.11-vs2.0.2/arch/xtensa/kernel/syscalls.c
---- linux-2.6.17.11/arch/xtensa/kernel/syscalls.c 2005-08-29 22:24:57 +0200
-+++ linux-2.6.17.11-vs2.0.2/arch/xtensa/kernel/syscalls.c 2006-08-17 00:28:21 +0200
-@@ -35,6 +35,7 @@
+diff -NurpP --minimal linux-2.6.18/arch/xtensa/kernel/syscalls.c linux-2.6.18-vs2.0.2.1-t6/arch/xtensa/kernel/syscalls.c
+--- linux-2.6.18/arch/xtensa/kernel/syscalls.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/arch/xtensa/kernel/syscalls.c 2006-09-20 17:01:44 +0200
+@@ -34,6 +34,7 @@
#include <linux/msg.h>
#include <linux/shm.h>
#include <linux/errno.h>
@@ -1720,7 +1727,7 @@
#include <asm/ptrace.h>
#include <asm/signal.h>
#include <asm/uaccess.h>
-@@ -129,7 +130,7 @@ out:
+@@ -128,7 +129,7 @@ out:
int sys_uname(struct old_utsname * name)
{
@@ -1729,9 +1736,9 @@
return 0;
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.17.11/drivers/block/Kconfig linux-2.6.17.11-vs2.0.2/drivers/block/Kconfig
---- linux-2.6.17.11/drivers/block/Kconfig 2006-06-18 04:52:46 +0200
-+++ linux-2.6.17.11-vs2.0.2/drivers/block/Kconfig 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/drivers/block/Kconfig linux-2.6.18-vs2.0.2.1-t6/drivers/block/Kconfig
+--- linux-2.6.18/drivers/block/Kconfig 2006-09-20 16:58:07 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/drivers/block/Kconfig 2006-09-20 17:01:44 +0200
@@ -315,6 +315,13 @@ config BLK_DEV_CRYPTOLOOP
instead, which can be configured to be on-disk compatible with the
cryptoloop device.
@@ -1746,19 +1753,19 @@
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-2.6.17.11/drivers/block/Makefile linux-2.6.17.11-vs2.0.2/drivers/block/Makefile
---- linux-2.6.17.11/drivers/block/Makefile 2006-06-18 04:52:46 +0200
-+++ linux-2.6.17.11-vs2.0.2/drivers/block/Makefile 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/drivers/block/Makefile linux-2.6.18-vs2.0.2.1-t6/drivers/block/Makefile
+--- linux-2.6.18/drivers/block/Makefile 2006-06-18 04:52:46 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/drivers/block/Makefile 2006-09-20 17:01:44 +0200
@@ -29,4 +29,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.17.11/drivers/block/vroot.c linux-2.6.17.11-vs2.0.2/drivers/block/vroot.c
---- linux-2.6.17.11/drivers/block/vroot.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/drivers/block/vroot.c 2006-08-17 00:28:21 +0200
-@@ -0,0 +1,288 @@
+diff -NurpP --minimal linux-2.6.18/drivers/block/vroot.c linux-2.6.18-vs2.0.2.1-t6/drivers/block/vroot.c
+--- linux-2.6.18/drivers/block/vroot.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/drivers/block/vroot.c 2006-09-21 01:26:54 +0200
+@@ -0,0 +1,281 @@
+/*
+ * linux/drivers/block/vroot.c
+ *
@@ -1767,7 +1774,7 @@
+ *
+ * based on the loop.c code by Theodore Ts'o.
+ *
-+ * Copyright (C) 2002-2005 by Herbert Pötzl.
++ * Copyright (C) 2002-2006 by Herbert Pötzl.
+ * Redistribution of this file is permitted under the
+ * GNU General Public License.
+ *
@@ -1778,7 +1785,6 @@
+#include <linux/file.h>
+#include <linux/major.h>
+#include <linux/blkdev.h>
-+#include <linux/devfs_fs_kernel.h>
+
+#include <linux/vroot.h>
+#include <linux/vserver/debug.h>
@@ -1973,8 +1979,6 @@
+ goto out_mem3;
+ }
+
-+ devfs_mk_dir("vroot");
-+
+ for (i = 0; i < max_vroot; i++) {
+ struct vroot_device *vr = &vroot_dev[i];
+ struct gendisk *disk = disks[i];
@@ -1986,21 +1990,18 @@
+ disk->first_minor = i;
+ disk->fops = &vr_fops;
+ sprintf(disk->disk_name, "vroot%d", i);
-+ sprintf(disk->devfs_name, "vroot/%d", i);
+ disk->private_data = vr;
+ }
+
+ err = register_vroot_grb(&__vroot_get_real_bdev);
+ if (err)
-+ goto out_reg;
++ goto out_mem3;
+
+ for (i = 0; i < max_vroot; i++)
+ add_disk(disks[i]);
+ printk(KERN_INFO "vroot: loaded (max %d devices)\n", max_vroot);
+ return 0;
+
-+out_reg:
-+ devfs_remove("vroot");
+out_mem3:
+ while (i--)
+ put_disk(disks[i]);
@@ -2024,7 +2025,6 @@
+ del_gendisk(disks[i]);
+ put_disk(disks[i]);
+ }
-+ devfs_remove("vroot");
+ if (unregister_blkdev(VROOT_MAJOR, "vroot"))
+ printk(KERN_WARNING "vroot: cannot unregister blkdev\n");
+
@@ -2047,10 +2047,10 @@
+
+#endif
+
-diff -NurpP --minimal linux-2.6.17.11/drivers/char/random.c linux-2.6.17.11-vs2.0.2/drivers/char/random.c
---- linux-2.6.17.11/drivers/char/random.c 2006-06-18 04:52:53 +0200
-+++ linux-2.6.17.11-vs2.0.2/drivers/char/random.c 2006-08-17 00:28:21 +0200
-@@ -1174,7 +1174,7 @@ static char sysctl_bootid[16];
+diff -NurpP --minimal linux-2.6.18/drivers/char/random.c linux-2.6.18-vs2.0.2.1-t6/drivers/char/random.c
+--- linux-2.6.18/drivers/char/random.c 2006-09-20 16:58:13 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/drivers/char/random.c 2006-09-20 17:01:44 +0200
+@@ -1173,7 +1173,7 @@ static char sysctl_bootid[16];
static int proc_do_uuid(ctl_table *table, int write, struct file *filp,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
@@ -2059,18 +2059,18 @@
unsigned char buf[64], tmp_uuid[16], *uuid;
uuid = table->data;
-diff -NurpP --minimal linux-2.6.17.11/drivers/char/tty_io.c linux-2.6.17.11-vs2.0.2/drivers/char/tty_io.c
---- linux-2.6.17.11/drivers/char/tty_io.c 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/drivers/char/tty_io.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/drivers/char/tty_io.c linux-2.6.18-vs2.0.2.1-t6/drivers/char/tty_io.c
+--- linux-2.6.18/drivers/char/tty_io.c 2006-09-20 16:58:13 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/drivers/char/tty_io.c 2006-09-20 19:55:41 +0200
@@ -103,6 +103,7 @@
- #include <linux/vt_kern.h>
#include <linux/selection.h>
- #include <linux/devfs_fs_kernel.h>
-+#include <linux/vs_cvirt.h>
#include <linux/kmod.h>
++#include <linux/vs_cvirt.h>
+
+ #undef TTY_DEBUG_HANGUP
-@@ -2388,13 +2389,16 @@ static int tiocsctty(struct tty_struct *
+@@ -2940,13 +2941,16 @@ static int tiocsctty(struct tty_struct *
static int tiocgpgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t __user *p)
{
@@ -2087,8 +2087,8 @@
+ return put_user(pgrp, p);
}
- static int tiocspgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t __user *p)
-@@ -2412,6 +2416,8 @@ static int tiocspgrp(struct tty_struct *
+ /**
+@@ -2978,6 +2982,8 @@ static int tiocspgrp(struct tty_struct *
return -ENOTTY;
if (get_user(pgrp, p))
return -EFAULT;
@@ -2097,9 +2097,9 @@
if (pgrp < 0)
return -EINVAL;
if (session_of_pgrp(pgrp) != current->signal->session)
-diff -NurpP --minimal linux-2.6.17.11/drivers/infiniband/core/uverbs_mem.c linux-2.6.17.11-vs2.0.2/drivers/infiniband/core/uverbs_mem.c
---- linux-2.6.17.11/drivers/infiniband/core/uverbs_mem.c 2006-06-18 04:53:04 +0200
-+++ linux-2.6.17.11-vs2.0.2/drivers/infiniband/core/uverbs_mem.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/drivers/infiniband/core/uverbs_mem.c linux-2.6.18-vs2.0.2.1-t6/drivers/infiniband/core/uverbs_mem.c
+--- linux-2.6.18/drivers/infiniband/core/uverbs_mem.c 2006-06-18 04:53:04 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/drivers/infiniband/core/uverbs_mem.c 2006-09-20 17:01:44 +0200
@@ -36,6 +36,7 @@
#include <linux/mm.h>
@@ -2137,10 +2137,10 @@
up_write(&work->mm->mmap_sem);
mmput(work->mm);
kfree(work);
-diff -NurpP --minimal linux-2.6.17.11/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.17.11-vs2.0.2/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-2.6.17.11/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-06-18 04:53:04 +0200
-+++ linux-2.6.17.11-vs2.0.2/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-08-17 00:28:21 +0200
-@@ -32,6 +32,7 @@
+diff -NurpP --minimal linux-2.6.18/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.18-vs2.0.2.1-t6/drivers/infiniband/hw/ipath/ipath_user_pages.c
+--- linux-2.6.18/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-09-20 16:58:14 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-09-20 17:01:44 +0200
+@@ -33,6 +33,7 @@
#include <linux/mm.h>
#include <linux/device.h>
@@ -2148,7 +2148,7 @@
#include "ipath_kernel.h"
-@@ -71,7 +72,8 @@ static int __get_user_pages(unsigned lon
+@@ -61,7 +62,8 @@ static int __get_user_pages(unsigned lon
lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >>
PAGE_SHIFT;
@@ -2158,7 +2158,7 @@
ret = -ENOMEM;
goto bail;
}
-@@ -88,7 +90,7 @@ static int __get_user_pages(unsigned lon
+@@ -78,7 +80,7 @@ static int __get_user_pages(unsigned lon
goto bail_release;
}
@@ -2167,7 +2167,7 @@
ret = 0;
goto bail;
-@@ -157,7 +159,7 @@ void ipath_release_user_pages(struct pag
+@@ -147,7 +149,7 @@ void ipath_release_user_pages(struct pag
__ipath_release_user_pages(p, num_pages, 1);
@@ -2176,7 +2176,7 @@
up_write(¤t->mm->mmap_sem);
}
-@@ -173,7 +175,7 @@ static void user_pages_account(void *ptr
+@@ -163,7 +165,7 @@ static void user_pages_account(void *ptr
struct ipath_user_pages_work *work = ptr;
down_write(&work->mm->mmap_sem);
@@ -2185,9 +2185,9 @@
up_write(&work->mm->mmap_sem);
mmput(work->mm);
kfree(work);
-diff -NurpP --minimal linux-2.6.17.11/fs/attr.c linux-2.6.17.11-vs2.0.2/fs/attr.c
---- linux-2.6.17.11/fs/attr.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/attr.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/attr.c linux-2.6.18-vs2.0.2.1-t6/fs/attr.c
+--- linux-2.6.18/fs/attr.c 2006-04-09 13:49:53 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/attr.c 2006-09-20 17:01:44 +0200
@@ -15,6 +15,9 @@
#include <linux/fcntl.h>
#include <linux/quotaops.h>
@@ -2246,9 +2246,9 @@
error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;
if (!error)
error = inode_setattr(inode, attr);
-diff -NurpP --minimal linux-2.6.17.11/fs/binfmt_aout.c linux-2.6.17.11-vs2.0.2/fs/binfmt_aout.c
---- linux-2.6.17.11/fs/binfmt_aout.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/binfmt_aout.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/binfmt_aout.c linux-2.6.18-vs2.0.2.1-t6/fs/binfmt_aout.c
+--- linux-2.6.18/fs/binfmt_aout.c 2006-04-09 13:49:53 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/binfmt_aout.c 2006-09-20 17:01:44 +0200
@@ -24,6 +24,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
@@ -2257,22 +2257,22 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.17.11/fs/binfmt_elf.c linux-2.6.17.11-vs2.0.2/fs/binfmt_elf.c
---- linux-2.6.17.11/fs/binfmt_elf.c 2006-06-18 04:54:29 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/binfmt_elf.c 2006-08-17 00:28:21 +0200
-@@ -38,6 +38,8 @@
- #include <linux/security.h>
+diff -NurpP --minimal linux-2.6.18/fs/binfmt_elf.c linux-2.6.18-vs2.0.2.1-t6/fs/binfmt_elf.c
+--- linux-2.6.18/fs/binfmt_elf.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/binfmt_elf.c 2006-09-20 18:28:33 +0200
+@@ -39,6 +39,8 @@
#include <linux/syscalls.h>
#include <linux/random.h>
+ #include <linux/elf.h>
+#include <linux/vs_memory.h>
+#include <linux/vs_cvirt.h>
-
#include <asm/uaccess.h>
#include <asm/param.h>
-diff -NurpP --minimal linux-2.6.17.11/fs/binfmt_elf_fdpic.c linux-2.6.17.11-vs2.0.2/fs/binfmt_elf_fdpic.c
---- linux-2.6.17.11/fs/binfmt_elf_fdpic.c 2006-06-18 04:54:29 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/binfmt_elf_fdpic.c 2006-08-17 00:28:21 +0200
-@@ -32,6 +32,7 @@
+ #include <asm/page.h>
+diff -NurpP --minimal linux-2.6.18/fs/binfmt_elf_fdpic.c linux-2.6.18-vs2.0.2.1-t6/fs/binfmt_elf_fdpic.c
+--- linux-2.6.18/fs/binfmt_elf_fdpic.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/binfmt_elf_fdpic.c 2006-09-20 17:01:44 +0200
+@@ -34,6 +34,7 @@
#include <linux/elf.h>
#include <linux/elf-fdpic.h>
#include <linux/elfcore.h>
@@ -2280,10 +2280,10 @@
#include <asm/uaccess.h>
#include <asm/param.h>
-diff -NurpP --minimal linux-2.6.17.11/fs/binfmt_flat.c linux-2.6.17.11-vs2.0.2/fs/binfmt_flat.c
---- linux-2.6.17.11/fs/binfmt_flat.c 2006-06-18 04:54:29 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/binfmt_flat.c 2006-08-17 00:28:21 +0200
-@@ -37,6 +37,7 @@
+diff -NurpP --minimal linux-2.6.18/fs/binfmt_flat.c linux-2.6.18-vs2.0.2.1-t6/fs/binfmt_flat.c
+--- linux-2.6.18/fs/binfmt_flat.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/binfmt_flat.c 2006-09-20 17:01:44 +0200
+@@ -36,6 +36,7 @@
#include <linux/init.h>
#include <linux/flat.h>
#include <linux/syscalls.h>
@@ -2291,9 +2291,9 @@
#include <asm/byteorder.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.17.11/fs/binfmt_som.c linux-2.6.17.11-vs2.0.2/fs/binfmt_som.c
---- linux-2.6.17.11/fs/binfmt_som.c 2006-01-03 17:29:55 +0100
-+++ linux-2.6.17.11-vs2.0.2/fs/binfmt_som.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/binfmt_som.c linux-2.6.18-vs2.0.2.1-t6/fs/binfmt_som.c
+--- linux-2.6.18/fs/binfmt_som.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/binfmt_som.c 2006-09-20 17:01:44 +0200
@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/personality.h>
@@ -2302,9 +2302,9 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.17.11/fs/devpts/inode.c linux-2.6.17.11-vs2.0.2/fs/devpts/inode.c
---- linux-2.6.17.11/fs/devpts/inode.c 2006-06-18 04:54:31 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/devpts/inode.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/devpts/inode.c linux-2.6.18-vs2.0.2.1-t6/fs/devpts/inode.c
+--- linux-2.6.18/fs/devpts/inode.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/devpts/inode.c 2006-09-20 17:01:44 +0200
@@ -20,7 +20,19 @@
#include <linux/devpts_fs.h>
#include <linux/parser.h>
@@ -2371,13 +2371,13 @@
inode->u.generic_ip = tty;
dentry = get_node(number);
-diff -NurpP --minimal linux-2.6.17.11/fs/exec.c linux-2.6.17.11-vs2.0.2/fs/exec.c
---- linux-2.6.17.11/fs/exec.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/exec.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/exec.c linux-2.6.18-vs2.0.2.1-t6/fs/exec.c
+--- linux-2.6.18/fs/exec.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/exec.c 2006-09-20 18:03:28 +0200
@@ -49,6 +49,8 @@
- #include <linux/rmap.h>
#include <linux/acct.h>
#include <linux/cn_proc.h>
+ #include <linux/audit.h>
+#include <linux/vs_memory.h>
+#include <linux/vs_cvirt.h>
@@ -2393,7 +2393,7 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-@@ -1337,7 +1340,7 @@ static void format_corename(char *corena
+@@ -1322,7 +1325,7 @@ static void format_corename(char *corena
case 'h':
down_read(&uts_sem);
rc = snprintf(out_ptr, out_end - out_ptr,
@@ -2402,10 +2402,10 @@
up_read(&uts_sem);
if (rc > out_end - out_ptr)
goto out;
-diff -NurpP --minimal linux-2.6.17.11/fs/ext2/balloc.c linux-2.6.17.11-vs2.0.2/fs/ext2/balloc.c
---- linux-2.6.17.11/fs/ext2/balloc.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ext2/balloc.c 2006-08-17 00:28:21 +0200
-@@ -17,6 +17,7 @@
+diff -NurpP --minimal linux-2.6.18/fs/ext2/balloc.c linux-2.6.18-vs2.0.2.1-t6/fs/ext2/balloc.c
+--- linux-2.6.18/fs/ext2/balloc.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext2/balloc.c 2006-09-20 17:01:44 +0200
+@@ -16,6 +16,7 @@
#include <linux/sched.h>
#include <linux/buffer_head.h>
#include <linux/capability.h>
@@ -2413,7 +2413,7 @@
/*
* balloc.c contains the blocks allocation and deallocation routines
-@@ -109,6 +110,8 @@ static int reserve_blocks(struct super_b
+@@ -108,6 +109,8 @@ static int reserve_blocks(struct super_b
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
root_blocks = le32_to_cpu(es->s_r_blocks_count);
@@ -2422,7 +2422,7 @@
if (free_blocks < count)
count = free_blocks;
-@@ -259,6 +262,7 @@ do_more:
+@@ -258,6 +261,7 @@ do_more:
}
error_return:
brelse(bitmap_bh);
@@ -2430,7 +2430,7 @@
release_blocks(sb, freed);
DQUOT_FREE_BLOCK(inode, freed);
}
-@@ -362,6 +366,10 @@ int ext2_new_block(struct inode *inode,
+@@ -361,6 +365,10 @@ int ext2_new_block(struct inode *inode,
*err = -ENOSPC;
goto out_dquot;
}
@@ -2441,7 +2441,7 @@
ext2_debug ("goal=%lu.\n", goal);
-@@ -509,6 +517,8 @@ got_block:
+@@ -508,6 +516,8 @@ got_block:
*err = 0;
out_release:
group_release_blocks(sb, group_no, desc, gdp_bh, group_alloc);
@@ -2450,30 +2450,30 @@
release_blocks(sb, es_alloc);
out_dquot:
DQUOT_FREE_BLOCK(inode, dq_alloc);
-diff -NurpP --minimal linux-2.6.17.11/fs/ext2/ext2.h linux-2.6.17.11-vs2.0.2/fs/ext2/ext2.h
---- linux-2.6.17.11/fs/ext2/ext2.h 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ext2/ext2.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/ext2/ext2.h linux-2.6.18-vs2.0.2.1-t6/fs/ext2/ext2.h
+--- linux-2.6.18/fs/ext2/ext2.h 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext2/ext2.h 2006-09-20 19:55:12 +0200
@@ -165,6 +165,7 @@ extern const struct file_operations ext2
- extern struct address_space_operations ext2_aops;
- extern struct address_space_operations ext2_aops_xip;
- extern struct address_space_operations ext2_nobh_aops;
+ extern const struct address_space_operations ext2_aops;
+ extern const struct address_space_operations ext2_aops_xip;
+ extern const struct address_space_operations ext2_nobh_aops;
+extern int ext2_sync_flags(struct inode *inode);
/* namei.c */
extern struct inode_operations ext2_dir_inode_operations;
-diff -NurpP --minimal linux-2.6.17.11/fs/ext2/file.c linux-2.6.17.11-vs2.0.2/fs/ext2/file.c
---- linux-2.6.17.11/fs/ext2/file.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ext2/file.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/ext2/file.c linux-2.6.18-vs2.0.2.1-t6/fs/ext2/file.c
+--- linux-2.6.18/fs/ext2/file.c 2006-06-18 04:54:33 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext2/file.c 2006-09-20 17:01:44 +0200
@@ -81,4 +81,5 @@ struct inode_operations ext2_file_inode_
#endif
.setattr = ext2_setattr,
.permission = ext2_permission,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.11/fs/ext2/ialloc.c linux-2.6.17.11-vs2.0.2/fs/ext2/ialloc.c
---- linux-2.6.17.11/fs/ext2/ialloc.c 2006-02-18 14:40:21 +0100
-+++ linux-2.6.17.11-vs2.0.2/fs/ext2/ialloc.c 2006-08-17 00:28:21 +0200
-@@ -18,6 +18,8 @@
+diff -NurpP --minimal linux-2.6.18/fs/ext2/ialloc.c linux-2.6.18-vs2.0.2.1-t6/fs/ext2/ialloc.c
+--- linux-2.6.18/fs/ext2/ialloc.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext2/ialloc.c 2006-09-20 17:01:44 +0200
+@@ -17,6 +17,8 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
#include <linux/random.h>
@@ -2482,7 +2482,7 @@
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
-@@ -126,6 +128,7 @@ void ext2_free_inode (struct inode * ino
+@@ -125,6 +127,7 @@ void ext2_free_inode (struct inode * ino
ext2_xattr_delete_inode(inode);
DQUOT_FREE_INODE(inode);
DQUOT_DROP(inode);
@@ -2490,7 +2490,7 @@
}
es = EXT2_SB(sb)->s_es;
-@@ -465,6 +468,11 @@ struct inode *ext2_new_inode(struct inod
+@@ -464,6 +467,11 @@ struct inode *ext2_new_inode(struct inod
if (!inode)
return ERR_PTR(-ENOMEM);
@@ -2502,7 +2502,7 @@
ei = EXT2_I(inode);
sbi = EXT2_SB(sb);
es = sbi->s_es;
-@@ -579,7 +587,8 @@ got:
+@@ -578,7 +586,8 @@ got:
inode->i_blocks = 0;
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
memset(ei->i_data, 0, sizeof(ei->i_data));
@@ -2512,7 +2512,7 @@
if (S_ISLNK(mode))
ei->i_flags &= ~(EXT2_IMMUTABLE_FL|EXT2_APPEND_FL);
/* dirsync is only applied to directories */
-@@ -627,12 +636,15 @@ fail_free_drop:
+@@ -626,12 +635,15 @@ fail_free_drop:
fail_drop:
DQUOT_DROP(inode);
@@ -2528,9 +2528,9 @@
make_bad_inode(inode);
iput(inode);
return ERR_PTR(err);
-diff -NurpP --minimal linux-2.6.17.11/fs/ext2/inode.c linux-2.6.17.11-vs2.0.2/fs/ext2/inode.c
---- linux-2.6.17.11/fs/ext2/inode.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ext2/inode.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/ext2/inode.c linux-2.6.18-vs2.0.2.1-t6/fs/ext2/inode.c
+--- linux-2.6.18/fs/ext2/inode.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext2/inode.c 2006-09-20 17:01:44 +0200
@@ -31,6 +31,7 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -2666,9 +2666,9 @@
error = DQUOT_TRANSFER(inode, iattr) ? -EDQUOT : 0;
if (error)
return error;
-diff -NurpP --minimal linux-2.6.17.11/fs/ext2/ioctl.c linux-2.6.17.11-vs2.0.2/fs/ext2/ioctl.c
---- linux-2.6.17.11/fs/ext2/ioctl.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ext2/ioctl.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/ext2/ioctl.c linux-2.6.18-vs2.0.2.1-t6/fs/ext2/ioctl.c
+--- linux-2.6.18/fs/ext2/ioctl.c 2006-04-09 13:49:53 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext2/ioctl.c 2006-09-20 17:01:44 +0200
@@ -11,6 +11,7 @@
#include <linux/capability.h>
#include <linux/time.h>
@@ -2708,9 +2708,9 @@
return -EROFS;
if (get_user(inode->i_generation, (int __user *) arg))
return -EFAULT;
-diff -NurpP --minimal linux-2.6.17.11/fs/ext2/namei.c linux-2.6.17.11-vs2.0.2/fs/ext2/namei.c
---- linux-2.6.17.11/fs/ext2/namei.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ext2/namei.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/ext2/namei.c linux-2.6.18-vs2.0.2.1-t6/fs/ext2/namei.c
+--- linux-2.6.18/fs/ext2/namei.c 2006-06-18 04:54:33 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext2/namei.c 2006-09-20 17:01:44 +0200
@@ -31,6 +31,7 @@
*/
@@ -2741,10 +2741,10 @@
.permission = ext2_permission,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.11/fs/ext2/super.c linux-2.6.17.11-vs2.0.2/fs/ext2/super.c
---- linux-2.6.17.11/fs/ext2/super.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ext2/super.c 2006-08-17 00:28:21 +0200
-@@ -287,7 +287,7 @@ enum {
+diff -NurpP --minimal linux-2.6.18/fs/ext2/super.c linux-2.6.18-vs2.0.2.1-t6/fs/ext2/super.c
+--- linux-2.6.18/fs/ext2/super.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext2/super.c 2006-09-20 17:01:44 +0200
+@@ -325,7 +325,7 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
Opt_acl, Opt_noacl, Opt_xip, Opt_ignore, Opt_err, Opt_quota,
@@ -2753,7 +2753,7 @@
};
static match_table_t tokens = {
-@@ -315,6 +315,7 @@ static match_table_t tokens = {
+@@ -353,6 +353,7 @@ static match_table_t tokens = {
{Opt_acl, "acl"},
{Opt_noacl, "noacl"},
{Opt_xip, "xip"},
@@ -2761,7 +2761,7 @@
{Opt_grpquota, "grpquota"},
{Opt_ignore, "noquota"},
{Opt_quota, "quota"},
-@@ -378,6 +379,11 @@ static int parse_options (char * options
+@@ -416,6 +417,11 @@ static int parse_options (char * options
case Opt_nouid32:
set_opt (sbi->s_mount_opt, NO_UID32);
break;
@@ -2773,7 +2773,7 @@
case Opt_nocheck:
clear_opt (sbi->s_mount_opt, CHECK);
break;
-@@ -679,6 +685,8 @@ static int ext2_fill_super(struct super_
+@@ -717,6 +723,8 @@ static int ext2_fill_super(struct super_
if (!parse_options ((char *) data, sbi))
goto failed_mount;
@@ -2782,7 +2782,7 @@
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
MS_POSIXACL : 0);
-@@ -988,6 +996,13 @@ static int ext2_remount (struct super_bl
+@@ -1026,6 +1034,13 @@ static int ext2_remount (struct super_bl
goto restore_opts;
}
@@ -2796,9 +2796,9 @@
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.17.11/fs/ext2/symlink.c linux-2.6.17.11-vs2.0.2/fs/ext2/symlink.c
---- linux-2.6.17.11/fs/ext2/symlink.c 2005-08-29 22:25:30 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ext2/symlink.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/ext2/symlink.c linux-2.6.18-vs2.0.2.1-t6/fs/ext2/symlink.c
+--- linux-2.6.18/fs/ext2/symlink.c 2005-08-29 22:25:30 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext2/symlink.c 2006-09-20 17:01:44 +0200
@@ -38,6 +38,7 @@ struct inode_operations ext2_symlink_ino
.listxattr = ext2_listxattr,
.removexattr = generic_removexattr,
@@ -2813,9 +2813,9 @@
#endif
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.11/fs/ext2/xattr.c linux-2.6.17.11-vs2.0.2/fs/ext2/xattr.c
---- linux-2.6.17.11/fs/ext2/xattr.c 2006-02-18 14:40:21 +0100
-+++ linux-2.6.17.11-vs2.0.2/fs/ext2/xattr.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/ext2/xattr.c linux-2.6.18-vs2.0.2.1-t6/fs/ext2/xattr.c
+--- linux-2.6.18/fs/ext2/xattr.c 2006-02-18 14:40:21 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext2/xattr.c 2006-09-20 17:01:44 +0200
@@ -60,6 +60,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
@@ -2853,10 +2853,10 @@
DQUOT_FREE_BLOCK(inode, 1);
}
EXT2_I(inode)->i_file_acl = 0;
-diff -NurpP --minimal linux-2.6.17.11/fs/ext3/balloc.c linux-2.6.17.11-vs2.0.2/fs/ext3/balloc.c
---- linux-2.6.17.11/fs/ext3/balloc.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ext3/balloc.c 2006-08-17 00:28:21 +0200
-@@ -20,6 +20,7 @@
+diff -NurpP --minimal linux-2.6.18/fs/ext3/balloc.c linux-2.6.18-vs2.0.2.1-t6/fs/ext3/balloc.c
+--- linux-2.6.18/fs/ext3/balloc.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext3/balloc.c 2006-09-20 19:54:32 +0200
+@@ -19,6 +19,7 @@
#include <linux/ext3_jbd.h>
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -2864,7 +2864,7 @@
/*
* balloc.c contains the blocks allocation and deallocation routines
-@@ -504,8 +505,10 @@ void ext3_free_blocks(handle_t *handle,
+@@ -503,8 +504,10 @@ void ext3_free_blocks(handle_t *handle,
return;
}
ext3_free_blocks_sb(handle, sb, block, count, &dquot_freed_blocks);
@@ -2876,20 +2876,25 @@
return;
}
-@@ -1162,18 +1165,32 @@ out:
+@@ -1161,18 +1164,33 @@ out:
return ret;
}
-static int ext3_has_free_blocks(struct ext3_sb_info *sbi)
+static int ext3_has_free_blocks(struct super_block *sb)
{
-- int free_blocks, root_blocks;
+ struct ext3_sb_info *sbi = EXT3_SB(sb);
-+ int free_blocks, root_blocks, cond;
+ ext3_fsblk_t free_blocks, root_blocks;
++ int cond;
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
+- sbi->s_resuid != current->fsuid &&
+- (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
+- return 0;
+- }
+- return 1;
+
+ vxdprintk(VXD_CBIT(dlim, 3),
+ "ext3_has_free_blocks(%p): free=%u, root=%u",
@@ -2899,11 +2904,7 @@
+
+ cond = (free_blocks < root_blocks + 1 &&
+ !capable(CAP_SYS_RESOURCE) &&
- sbi->s_resuid != current->fsuid &&
-- (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
-- return 0;
-- }
-- return 1;
++ sbi->s_resuid != current->fsuid &&
+ (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid)));
+
+ vxdprintk(VXD_CBIT(dlim, 3),
@@ -2916,7 +2917,7 @@
}
/*
-@@ -1184,7 +1201,7 @@ static int ext3_has_free_blocks(struct e
+@@ -1183,7 +1201,7 @@ static int ext3_has_free_blocks(struct e
*/
int ext3_should_retry_alloc(struct super_block *sb, int *retries)
{
@@ -2925,7 +2926,7 @@
return 0;
jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);
-@@ -1240,6 +1257,8 @@ int ext3_new_blocks(handle_t *handle, st
+@@ -1240,6 +1258,8 @@ ext3_fsblk_t ext3_new_blocks(handle_t *h
*errp = -EDQUOT;
return 0;
}
@@ -2934,7 +2935,7 @@
sbi = EXT3_SB(sb);
es = EXT3_SB(sb)->s_es;
-@@ -1256,7 +1275,7 @@ int ext3_new_blocks(handle_t *handle, st
+@@ -1256,7 +1276,7 @@ ext3_fsblk_t ext3_new_blocks(handle_t *h
if (block_i && ((windowsz = block_i->rsv_window_node.rsv_goal_size) > 0))
my_rsv = &block_i->rsv_window_node;
@@ -2943,7 +2944,7 @@
*errp = -ENOSPC;
goto out;
}
-@@ -1448,6 +1467,9 @@ allocated:
+@@ -1450,6 +1470,9 @@ allocated:
io_error:
*errp = -EIO;
out:
@@ -2953,9 +2954,9 @@
if (fatal) {
*errp = fatal;
ext3_std_error(sb, fatal);
-diff -NurpP --minimal linux-2.6.17.11/fs/ext3/file.c linux-2.6.17.11-vs2.0.2/fs/ext3/file.c
---- linux-2.6.17.11/fs/ext3/file.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ext3/file.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/ext3/file.c linux-2.6.18-vs2.0.2.1-t6/fs/ext3/file.c
+--- linux-2.6.18/fs/ext3/file.c 2006-06-18 04:54:33 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext3/file.c 2006-09-20 17:01:44 +0200
@@ -133,5 +133,6 @@ struct inode_operations ext3_file_inode_
.removexattr = generic_removexattr,
#endif
@@ -2963,9 +2964,9 @@
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.11/fs/ext3/ialloc.c linux-2.6.17.11-vs2.0.2/fs/ext3/ialloc.c
---- linux-2.6.17.11/fs/ext3/ialloc.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ext3/ialloc.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/ext3/ialloc.c linux-2.6.18-vs2.0.2.1-t6/fs/ext3/ialloc.c
+--- linux-2.6.18/fs/ext3/ialloc.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext3/ialloc.c 2006-09-20 17:01:44 +0200
@@ -23,6 +23,8 @@
#include <linux/buffer_head.h>
#include <linux/random.h>
@@ -2983,7 +2984,7 @@
is_directory = S_ISDIR(inode->i_mode);
-@@ -443,6 +446,12 @@ struct inode *ext3_new_inode(handle_t *h
+@@ -445,6 +448,12 @@ struct inode *ext3_new_inode(handle_t *h
inode = new_inode(sb);
if (!inode)
return ERR_PTR(-ENOMEM);
@@ -2996,7 +2997,7 @@
ei = EXT3_I(inode);
sbi = EXT3_SB(sb);
-@@ -565,7 +574,8 @@ got:
+@@ -567,7 +576,8 @@ got:
ei->i_dir_start_lookup = 0;
ei->i_disksize = 0;
@@ -3006,7 +3007,7 @@
if (S_ISLNK(mode))
ei->i_flags &= ~(EXT3_IMMUTABLE_FL|EXT3_APPEND_FL);
/* dirsync only applies to directories */
-@@ -620,6 +630,8 @@ got:
+@@ -622,6 +632,8 @@ got:
fail:
ext3_std_error(sb, err);
out:
@@ -3015,7 +3016,7 @@
iput(inode);
ret = ERR_PTR(err);
really_out:
-@@ -631,6 +643,7 @@ fail_free_drop:
+@@ -633,6 +645,7 @@ fail_free_drop:
fail_drop:
DQUOT_DROP(inode);
@@ -3023,9 +3024,9 @@
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
iput(inode);
-diff -NurpP --minimal linux-2.6.17.11/fs/ext3/inode.c linux-2.6.17.11-vs2.0.2/fs/ext3/inode.c
---- linux-2.6.17.11/fs/ext3/inode.c 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ext3/inode.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/ext3/inode.c linux-2.6.18-vs2.0.2.1-t6/fs/ext3/inode.c
+--- linux-2.6.18/fs/ext3/inode.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext3/inode.c 2006-09-20 17:01:44 +0200
@@ -36,6 +36,7 @@
#include <linux/writeback.h>
#include <linux/mpage.h>
@@ -3034,7 +3035,7 @@
#include "xattr.h"
#include "acl.h"
-@@ -2563,19 +2564,77 @@ void ext3_set_inode_flags(struct inode *
+@@ -2567,19 +2568,77 @@ void ext3_set_inode_flags(struct inode *
{
unsigned int flags = EXT3_I(inode)->i_flags;
@@ -3115,7 +3116,7 @@
void ext3_read_inode(struct inode * inode)
{
struct ext3_iloc iloc;
-@@ -2583,6 +2642,8 @@ void ext3_read_inode(struct inode * inod
+@@ -2587,6 +2646,8 @@ void ext3_read_inode(struct inode * inod
struct ext3_inode_info *ei = EXT3_I(inode);
struct buffer_head *bh;
int block;
@@ -3124,7 +3125,7 @@
#ifdef CONFIG_EXT3_FS_POSIX_ACL
ei->i_acl = EXT3_ACL_NOT_CACHED;
-@@ -2595,12 +2656,17 @@ void ext3_read_inode(struct inode * inod
+@@ -2599,12 +2660,17 @@ void ext3_read_inode(struct inode * inod
bh = iloc.bh;
raw_inode = ext3_raw_inode(&iloc);
inode->i_mode = le16_to_cpu(raw_inode->i_mode);
@@ -3146,7 +3147,7 @@
inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
inode->i_size = le32_to_cpu(raw_inode->i_size);
inode->i_atime.tv_sec = le32_to_cpu(raw_inode->i_atime);
-@@ -2727,6 +2793,8 @@ static int ext3_do_update_inode(handle_t
+@@ -2731,6 +2797,8 @@ static int ext3_do_update_inode(handle_t
struct ext3_inode *raw_inode = ext3_raw_inode(iloc);
struct ext3_inode_info *ei = EXT3_I(inode);
struct buffer_head *bh = iloc->bh;
@@ -3155,7 +3156,7 @@
int err = 0, rc, block;
/* For fields not not tracking in the in-memory inode,
-@@ -2736,29 +2804,32 @@ static int ext3_do_update_inode(handle_t
+@@ -2740,29 +2808,32 @@ static int ext3_do_update_inode(handle_t
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
if(!(test_opt(inode->i_sb, NO_UID32))) {
@@ -3194,7 +3195,7 @@
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
raw_inode->i_size = cpu_to_le32(ei->i_disksize);
raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
-@@ -2911,7 +2982,8 @@ int ext3_setattr(struct dentry *dentry,
+@@ -2915,7 +2986,8 @@ int ext3_setattr(struct dentry *dentry,
return error;
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
@@ -3204,7 +3205,7 @@
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -2933,6 +3005,8 @@ int ext3_setattr(struct dentry *dentry,
+@@ -2937,6 +3009,8 @@ int ext3_setattr(struct dentry *dentry,
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
@@ -3213,9 +3214,9 @@
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-2.6.17.11/fs/ext3/ioctl.c linux-2.6.17.11-vs2.0.2/fs/ext3/ioctl.c
---- linux-2.6.17.11/fs/ext3/ioctl.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ext3/ioctl.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/ext3/ioctl.c linux-2.6.18-vs2.0.2.1-t6/fs/ext3/ioctl.c
+--- linux-2.6.18/fs/ext3/ioctl.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext3/ioctl.c 2006-09-20 17:01:44 +0200
@@ -8,11 +8,13 @@
*/
@@ -3330,9 +3331,9 @@
default:
return -ENOTTY;
-diff -NurpP --minimal linux-2.6.17.11/fs/ext3/namei.c linux-2.6.17.11-vs2.0.2/fs/ext3/namei.c
---- linux-2.6.17.11/fs/ext3/namei.c 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ext3/namei.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/ext3/namei.c linux-2.6.18-vs2.0.2.1-t6/fs/ext3/namei.c
+--- linux-2.6.18/fs/ext3/namei.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext3/namei.c 2006-09-20 17:01:44 +0200
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3349,7 +3350,7 @@
}
return d_splice_alias(inode, dentry);
}
-@@ -2384,6 +2386,7 @@ struct inode_operations ext3_dir_inode_o
+@@ -2382,6 +2384,7 @@ struct inode_operations ext3_dir_inode_o
.removexattr = generic_removexattr,
#endif
.permission = ext3_permission,
@@ -3357,16 +3358,16 @@
};
struct inode_operations ext3_special_inode_operations = {
-@@ -2395,4 +2398,5 @@ struct inode_operations ext3_special_ino
+@@ -2393,4 +2396,5 @@ struct inode_operations ext3_special_ino
.removexattr = generic_removexattr,
#endif
.permission = ext3_permission,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.11/fs/ext3/super.c linux-2.6.17.11-vs2.0.2/fs/ext3/super.c
---- linux-2.6.17.11/fs/ext3/super.c 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ext3/super.c 2006-08-25 05:44:21 +0200
-@@ -675,7 +675,7 @@ enum {
+diff -NurpP --minimal linux-2.6.18/fs/ext3/super.c linux-2.6.18-vs2.0.2.1-t6/fs/ext3/super.c
+--- linux-2.6.18/fs/ext3/super.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext3/super.c 2006-09-20 17:01:44 +0200
+@@ -677,7 +677,7 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
@@ -3375,7 +3376,7 @@
};
static match_table_t tokens = {
-@@ -724,6 +724,7 @@ static match_table_t tokens = {
+@@ -727,6 +727,7 @@ static match_table_t tokens = {
{Opt_quota, "quota"},
{Opt_usrquota, "usrquota"},
{Opt_barrier, "barrier=%u"},
@@ -3383,7 +3384,7 @@
{Opt_err, NULL},
{Opt_resize, "resize"},
};
-@@ -816,6 +817,11 @@ static int parse_options (char *options,
+@@ -820,6 +821,11 @@ static int parse_options (char *options,
case Opt_nouid32:
set_opt (sbi->s_mount_opt, NO_UID32);
break;
@@ -3395,7 +3396,7 @@
case Opt_nocheck:
clear_opt (sbi->s_mount_opt, CHECK);
break;
-@@ -1470,6 +1476,9 @@ static int ext3_fill_super (struct super
+@@ -1476,6 +1482,9 @@ static int ext3_fill_super (struct super
NULL, 0))
goto failed_mount;
@@ -3405,7 +3406,7 @@
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -2273,6 +2282,12 @@ static int ext3_remount (struct super_bl
+@@ -2291,6 +2300,12 @@ static int ext3_remount (struct super_bl
if (sbi->s_mount_opt & EXT3_MOUNT_ABORT)
ext3_abort(sb, __FUNCTION__, "Abort forced by user");
@@ -3418,9 +3419,9 @@
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.17.11/fs/ext3/symlink.c linux-2.6.17.11-vs2.0.2/fs/ext3/symlink.c
---- linux-2.6.17.11/fs/ext3/symlink.c 2005-08-29 22:25:30 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ext3/symlink.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/ext3/symlink.c linux-2.6.18-vs2.0.2.1-t6/fs/ext3/symlink.c
+--- linux-2.6.18/fs/ext3/symlink.c 2005-08-29 22:25:30 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext3/symlink.c 2006-09-20 17:01:44 +0200
@@ -40,6 +40,7 @@ struct inode_operations ext3_symlink_ino
.listxattr = ext3_listxattr,
.removexattr = generic_removexattr,
@@ -3435,9 +3436,9 @@
#endif
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.11/fs/ext3/xattr.c linux-2.6.17.11-vs2.0.2/fs/ext3/xattr.c
---- linux-2.6.17.11/fs/ext3/xattr.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ext3/xattr.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/ext3/xattr.c linux-2.6.18-vs2.0.2.1-t6/fs/ext3/xattr.c
+--- linux-2.6.18/fs/ext3/xattr.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ext3/xattr.c 2006-09-20 17:01:44 +0200
@@ -58,6 +58,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
@@ -3470,7 +3471,7 @@
error = ext3_journal_get_write_access(handle,
new_bh);
if (error)
-@@ -843,6 +848,8 @@ cleanup:
+@@ -844,6 +849,8 @@ cleanup:
cleanup_dquot:
DQUOT_FREE_BLOCK(inode, 1);
@@ -3479,9 +3480,9 @@
goto cleanup;
bad_block:
-diff -NurpP --minimal linux-2.6.17.11/fs/fcntl.c linux-2.6.17.11-vs2.0.2/fs/fcntl.c
---- linux-2.6.17.11/fs/fcntl.c 2006-06-18 04:54:34 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/fcntl.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/fcntl.c linux-2.6.18-vs2.0.2.1-t6/fs/fcntl.c
+--- linux-2.6.18/fs/fcntl.c 2006-06-18 04:54:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/fcntl.c 2006-09-20 17:01:44 +0200
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/signal.h>
@@ -3535,10 +3536,10 @@
if (p) {
send_sigurg_to_task(p, fown);
}
-diff -NurpP --minimal linux-2.6.17.11/fs/file_table.c linux-2.6.17.11-vs2.0.2/fs/file_table.c
---- linux-2.6.17.11/fs/file_table.c 2006-06-18 04:54:34 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/file_table.c 2006-08-17 00:28:21 +0200
-@@ -22,6 +22,8 @@
+diff -NurpP --minimal linux-2.6.18/fs/file_table.c linux-2.6.18-vs2.0.2.1-t6/fs/file_table.c
+--- linux-2.6.18/fs/file_table.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/file_table.c 2006-09-20 17:01:44 +0200
+@@ -21,6 +21,8 @@
#include <linux/fsnotify.h>
#include <linux/sysctl.h>
#include <linux/percpu_counter.h>
@@ -3547,7 +3548,7 @@
#include <asm/atomic.h>
-@@ -121,6 +123,8 @@ struct file *get_empty_filp(void)
+@@ -120,6 +122,8 @@ struct file *get_empty_filp(void)
f->f_gid = tsk->fsgid;
eventpoll_init_file(f);
/* f->f_version: 0 */
@@ -3556,7 +3557,7 @@
return f;
over:
-@@ -175,6 +179,8 @@ void fastcall __fput(struct file *file)
+@@ -174,6 +178,8 @@ void fastcall __fput(struct file *file)
fops_put(file->f_op);
if (file->f_mode & FMODE_WRITE)
put_write_access(inode);
@@ -3565,7 +3566,7 @@
file_kill(file);
file->f_dentry = NULL;
file->f_vfsmnt = NULL;
-@@ -240,6 +246,8 @@ void put_filp(struct file *file)
+@@ -239,6 +245,8 @@ void put_filp(struct file *file)
{
if (atomic_dec_and_test(&file->f_count)) {
security_file_free(file);
@@ -3574,9 +3575,9 @@
file_kill(file);
file_free(file);
}
-diff -NurpP --minimal linux-2.6.17.11/fs/hfsplus/ioctl.c linux-2.6.17.11-vs2.0.2/fs/hfsplus/ioctl.c
---- linux-2.6.17.11/fs/hfsplus/ioctl.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/hfsplus/ioctl.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/hfsplus/ioctl.c linux-2.6.18-vs2.0.2.1-t6/fs/hfsplus/ioctl.c
+--- linux-2.6.18/fs/hfsplus/ioctl.c 2006-04-09 13:49:53 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/hfsplus/ioctl.c 2006-09-20 17:01:44 +0200
@@ -16,6 +16,7 @@
#include <linux/fs.h>
#include <linux/sched.h>
@@ -3595,10 +3596,10 @@
return -EROFS;
if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
-diff -NurpP --minimal linux-2.6.17.11/fs/inode.c linux-2.6.17.11-vs2.0.2/fs/inode.c
---- linux-2.6.17.11/fs/inode.c 2006-06-18 04:54:35 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/inode.c 2006-08-17 00:28:21 +0200
-@@ -116,6 +116,9 @@ static struct inode *alloc_inode(struct
+diff -NurpP --minimal linux-2.6.18/fs/inode.c linux-2.6.18-vs2.0.2.1-t6/fs/inode.c
+--- linux-2.6.18/fs/inode.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/inode.c 2006-09-20 17:01:44 +0200
+@@ -115,6 +115,9 @@ static struct inode *alloc_inode(struct
struct address_space * const mapping = &inode->i_data;
inode->i_sb = sb;
@@ -3608,7 +3609,7 @@
inode->i_blkbits = sb->s_blocksize_bits;
inode->i_flags = 0;
atomic_set(&inode->i_count, 1);
-@@ -235,6 +238,8 @@ void __iget(struct inode * inode)
+@@ -234,6 +237,8 @@ void __iget(struct inode * inode)
inodes_stat.nr_unused--;
}
@@ -3617,10 +3618,10 @@
/**
* clear_inode - clear an inode
* @inode: inode to clear
-diff -NurpP --minimal linux-2.6.17.11/fs/ioctl.c linux-2.6.17.11-vs2.0.2/fs/ioctl.c
---- linux-2.6.17.11/fs/ioctl.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ioctl.c 2006-08-17 00:28:21 +0200
-@@ -13,10 +13,19 @@
+diff -NurpP --minimal linux-2.6.18/fs/ioctl.c linux-2.6.18-vs2.0.2.1-t6/fs/ioctl.c
+--- linux-2.6.18/fs/ioctl.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ioctl.c 2006-09-20 17:01:44 +0200
+@@ -12,10 +12,19 @@
#include <linux/fs.h>
#include <linux/security.h>
#include <linux/module.h>
@@ -3640,7 +3641,7 @@
static long do_ioctl(struct file *filp, unsigned int cmd,
unsigned long arg)
{
-@@ -147,6 +156,48 @@ int vfs_ioctl(struct file *filp, unsigne
+@@ -146,6 +155,48 @@ int vfs_ioctl(struct file *filp, unsigne
else
error = -ENOTTY;
break;
@@ -3689,18 +3690,18 @@
default:
if (S_ISREG(filp->f_dentry->d_inode->i_mode))
error = file_ioctl(filp, cmd, arg);
-diff -NurpP --minimal linux-2.6.17.11/fs/ioprio.c linux-2.6.17.11-vs2.0.2/fs/ioprio.c
---- linux-2.6.17.11/fs/ioprio.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/ioprio.c 2006-08-17 00:28:21 +0200
-@@ -24,6 +24,7 @@
- #include <linux/blkdev.h>
+diff -NurpP --minimal linux-2.6.18/fs/ioprio.c linux-2.6.18-vs2.0.2.1-t6/fs/ioprio.c
+--- linux-2.6.18/fs/ioprio.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/ioprio.c 2006-09-20 18:03:08 +0200
+@@ -25,6 +25,7 @@
#include <linux/capability.h>
#include <linux/syscalls.h>
+ #include <linux/security.h>
+#include <linux/vs_cvirt.h>
static int set_task_ioprio(struct task_struct *task, int ioprio)
{
-@@ -95,7 +96,7 @@ asmlinkage long sys_ioprio_set(int which
+@@ -104,7 +105,7 @@ asmlinkage long sys_ioprio_set(int which
if (!who)
user = current->user;
else
@@ -3709,7 +3710,7 @@
if (!user)
break;
-@@ -149,7 +150,7 @@ asmlinkage long sys_ioprio_get(int which
+@@ -197,7 +198,7 @@ asmlinkage long sys_ioprio_get(int which
if (!who)
user = current->user;
else
@@ -3718,9 +3719,9 @@
if (!user)
break;
-diff -NurpP --minimal linux-2.6.17.11/fs/jfs/acl.c linux-2.6.17.11-vs2.0.2/fs/jfs/acl.c
---- linux-2.6.17.11/fs/jfs/acl.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/jfs/acl.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/jfs/acl.c linux-2.6.18-vs2.0.2.1-t6/fs/jfs/acl.c
+--- linux-2.6.18/fs/jfs/acl.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/jfs/acl.c 2006-09-20 17:01:44 +0200
@@ -232,7 +232,8 @@ int jfs_setattr(struct dentry *dentry, s
return rc;
@@ -3731,9 +3732,9 @@
if (DQUOT_TRANSFER(inode, iattr))
return -EDQUOT;
}
-diff -NurpP --minimal linux-2.6.17.11/fs/jfs/file.c linux-2.6.17.11-vs2.0.2/fs/jfs/file.c
---- linux-2.6.17.11/fs/jfs/file.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/jfs/file.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/jfs/file.c linux-2.6.18-vs2.0.2.1-t6/fs/jfs/file.c
+--- linux-2.6.18/fs/jfs/file.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/jfs/file.c 2006-09-20 17:01:44 +0200
@@ -98,6 +98,7 @@ struct inode_operations jfs_file_inode_o
.setattr = jfs_setattr,
.permission = jfs_permission,
@@ -3742,9 +3743,9 @@
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-2.6.17.11/fs/jfs/inode.c linux-2.6.17.11-vs2.0.2/fs/jfs/inode.c
---- linux-2.6.17.11/fs/jfs/inode.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/jfs/inode.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/jfs/inode.c linux-2.6.18-vs2.0.2.1-t6/fs/jfs/inode.c
+--- linux-2.6.18/fs/jfs/inode.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/jfs/inode.c 2006-09-20 17:01:44 +0200
@@ -22,6 +22,7 @@
#include <linux/buffer_head.h>
#include <linux/pagemap.h>
@@ -3761,9 +3762,9 @@
}
clear_inode(inode);
-diff -NurpP --minimal linux-2.6.17.11/fs/jfs/ioctl.c linux-2.6.17.11-vs2.0.2/fs/jfs/ioctl.c
---- linux-2.6.17.11/fs/jfs/ioctl.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/jfs/ioctl.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/jfs/ioctl.c linux-2.6.18-vs2.0.2.1-t6/fs/jfs/ioctl.c
+--- linux-2.6.18/fs/jfs/ioctl.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/jfs/ioctl.c 2006-09-20 17:01:44 +0200
@@ -10,6 +10,7 @@
#include <linux/ctype.h>
#include <linux/capability.h>
@@ -3793,9 +3794,9 @@
if (!capable(CAP_LINUX_IMMUTABLE))
return -EPERM;
}
-diff -NurpP --minimal linux-2.6.17.11/fs/jfs/jfs_dinode.h linux-2.6.17.11-vs2.0.2/fs/jfs/jfs_dinode.h
---- linux-2.6.17.11/fs/jfs/jfs_dinode.h 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/jfs/jfs_dinode.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/jfs/jfs_dinode.h linux-2.6.18-vs2.0.2.1-t6/fs/jfs/jfs_dinode.h
+--- linux-2.6.18/fs/jfs/jfs_dinode.h 2006-06-18 04:54:36 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/jfs/jfs_dinode.h 2006-09-20 17:01:44 +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 */
@@ -3811,9 +3812,9 @@
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
#define JFS_IOC_GETFLAGS _IOR('f', 1, long)
-diff -NurpP --minimal linux-2.6.17.11/fs/jfs/jfs_dtree.c linux-2.6.17.11-vs2.0.2/fs/jfs/jfs_dtree.c
---- linux-2.6.17.11/fs/jfs/jfs_dtree.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/jfs/jfs_dtree.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/jfs/jfs_dtree.c linux-2.6.18-vs2.0.2.1-t6/fs/jfs/jfs_dtree.c
+--- linux-2.6.18/fs/jfs/jfs_dtree.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/jfs/jfs_dtree.c 2006-09-20 17:01:44 +0200
@@ -102,6 +102,7 @@
#include <linux/fs.h>
@@ -3923,9 +3924,9 @@
/* Free quota allocation */
DQUOT_FREE_BLOCK(ip, xlen);
-diff -NurpP --minimal linux-2.6.17.11/fs/jfs/jfs_extent.c linux-2.6.17.11-vs2.0.2/fs/jfs/jfs_extent.c
---- linux-2.6.17.11/fs/jfs/jfs_extent.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/jfs/jfs_extent.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/jfs/jfs_extent.c linux-2.6.18-vs2.0.2.1-t6/fs/jfs/jfs_extent.c
+--- linux-2.6.18/fs/jfs/jfs_extent.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/jfs/jfs_extent.c 2006-09-20 17:01:44 +0200
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -3986,9 +3987,9 @@
DQUOT_FREE_BLOCK(ip, nxlen);
goto exit;
}
-diff -NurpP --minimal linux-2.6.17.11/fs/jfs/jfs_filsys.h linux-2.6.17.11-vs2.0.2/fs/jfs/jfs_filsys.h
---- linux-2.6.17.11/fs/jfs/jfs_filsys.h 2005-10-28 20:49:44 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/jfs/jfs_filsys.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/jfs/jfs_filsys.h linux-2.6.18-vs2.0.2.1-t6/fs/jfs/jfs_filsys.h
+--- linux-2.6.18/fs/jfs/jfs_filsys.h 2005-10-28 20:49:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/jfs/jfs_filsys.h 2006-09-20 17:01:44 +0200
@@ -84,6 +84,7 @@
#define JFS_DIR_INDEX 0x00200000 /* Persistant index for */
/* directory entries */
@@ -3997,9 +3998,9 @@
/*
* buffer cache configuration
-diff -NurpP --minimal linux-2.6.17.11/fs/jfs/jfs_imap.c linux-2.6.17.11-vs2.0.2/fs/jfs/jfs_imap.c
---- linux-2.6.17.11/fs/jfs/jfs_imap.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/jfs/jfs_imap.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/jfs/jfs_imap.c linux-2.6.18-vs2.0.2.1-t6/fs/jfs/jfs_imap.c
+--- linux-2.6.18/fs/jfs/jfs_imap.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/jfs/jfs_imap.c 2006-09-20 17:01:44 +0200
@@ -45,6 +45,7 @@
#include <linux/buffer_head.h>
#include <linux/pagemap.h>
@@ -4059,9 +4060,9 @@
/*
* mode2 is only needed for storing the higher order bits.
* Trust i_mode for the lower order ones
-diff -NurpP --minimal linux-2.6.17.11/fs/jfs/jfs_inode.c linux-2.6.17.11-vs2.0.2/fs/jfs/jfs_inode.c
---- linux-2.6.17.11/fs/jfs/jfs_inode.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/jfs/jfs_inode.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/jfs/jfs_inode.c linux-2.6.18-vs2.0.2.1-t6/fs/jfs/jfs_inode.c
+--- linux-2.6.18/fs/jfs/jfs_inode.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/jfs/jfs_inode.c 2006-09-20 17:01:44 +0200
@@ -18,6 +18,8 @@
#include <linux/fs.h>
@@ -4153,20 +4154,20 @@
DQUOT_DROP(inode);
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
-diff -NurpP --minimal linux-2.6.17.11/fs/jfs/jfs_inode.h linux-2.6.17.11-vs2.0.2/fs/jfs/jfs_inode.h
---- linux-2.6.17.11/fs/jfs/jfs_inode.h 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/jfs/jfs_inode.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/jfs/jfs_inode.h linux-2.6.18-vs2.0.2.1-t6/fs/jfs/jfs_inode.h
+--- linux-2.6.18/fs/jfs/jfs_inode.h 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/jfs/jfs_inode.h 2006-09-20 17:01:44 +0200
@@ -31,6 +31,7 @@ extern void jfs_truncate(struct inode *)
extern void jfs_truncate_nolock(struct inode *, loff_t);
extern void jfs_free_zero_link(struct inode *);
extern struct dentry *jfs_get_parent(struct dentry *dentry);
+extern int jfs_sync_flags(struct inode *);
extern void jfs_set_inode_flags(struct inode *);
+ extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
- extern struct address_space_operations jfs_aops;
-diff -NurpP --minimal linux-2.6.17.11/fs/jfs/jfs_xtree.c linux-2.6.17.11-vs2.0.2/fs/jfs/jfs_xtree.c
---- linux-2.6.17.11/fs/jfs/jfs_xtree.c 2006-01-03 17:29:57 +0100
-+++ linux-2.6.17.11-vs2.0.2/fs/jfs/jfs_xtree.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/jfs/jfs_xtree.c linux-2.6.18-vs2.0.2.1-t6/fs/jfs/jfs_xtree.c
+--- linux-2.6.18/fs/jfs/jfs_xtree.c 2006-01-03 17:29:57 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/fs/jfs/jfs_xtree.c 2006-09-20 17:01:44 +0200
@@ -21,6 +21,7 @@
#include <linux/fs.h>
@@ -4250,9 +4251,9 @@
/* update quota allocation to reflect freed blocks */
DQUOT_FREE_BLOCK(ip, nfreed);
-diff -NurpP --minimal linux-2.6.17.11/fs/jfs/namei.c linux-2.6.17.11-vs2.0.2/fs/jfs/namei.c
---- linux-2.6.17.11/fs/jfs/namei.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/jfs/namei.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/jfs/namei.c linux-2.6.18-vs2.0.2.1-t6/fs/jfs/namei.c
+--- linux-2.6.18/fs/jfs/namei.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/jfs/namei.c 2006-09-20 17:01:44 +0200
@@ -20,6 +20,7 @@
#include <linux/fs.h>
#include <linux/ctype.h>
@@ -4261,7 +4262,7 @@
#include "jfs_incore.h"
#include "jfs_superblock.h"
#include "jfs_inode.h"
-@@ -1465,6 +1466,7 @@ static struct dentry *jfs_lookup(struct
+@@ -1464,6 +1465,7 @@ static struct dentry *jfs_lookup(struct
return ERR_PTR(-EACCES);
}
@@ -4269,7 +4270,7 @@
dentry = d_splice_alias(ip, dentry);
if (dentry && (JFS_SBI(dip->i_sb)->mntflag & JFS_OS2))
-@@ -1517,6 +1519,7 @@ struct inode_operations jfs_dir_inode_op
+@@ -1516,6 +1518,7 @@ struct inode_operations jfs_dir_inode_op
.setattr = jfs_setattr,
.permission = jfs_permission,
#endif
@@ -4277,9 +4278,9 @@
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-2.6.17.11/fs/jfs/super.c linux-2.6.17.11-vs2.0.2/fs/jfs/super.c
---- linux-2.6.17.11/fs/jfs/super.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/jfs/super.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/jfs/super.c linux-2.6.18-vs2.0.2.1-t6/fs/jfs/super.c
+--- linux-2.6.18/fs/jfs/super.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/jfs/super.c 2006-09-20 17:01:44 +0200
@@ -194,7 +194,8 @@ static void jfs_put_super(struct super_b
enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
@@ -4334,9 +4335,9 @@
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-2.6.17.11/fs/jfs/xattr.c linux-2.6.17.11-vs2.0.2/fs/jfs/xattr.c
---- linux-2.6.17.11/fs/jfs/xattr.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/jfs/xattr.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/jfs/xattr.c linux-2.6.18-vs2.0.2.1-t6/fs/jfs/xattr.c
+--- linux-2.6.18/fs/jfs/xattr.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/jfs/xattr.c 2006-09-20 17:01:44 +0200
@@ -23,6 +23,7 @@
#include <linux/posix_acl_xattr.h>
#include <linux/quotaops.h>
@@ -4414,9 +4415,9 @@
inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-2.6.17.11/fs/libfs.c linux-2.6.17.11-vs2.0.2/fs/libfs.c
---- linux-2.6.17.11/fs/libfs.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/libfs.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/libfs.c linux-2.6.18-vs2.0.2.1-t6/fs/libfs.c
+--- linux-2.6.18/fs/libfs.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/libfs.c 2006-09-20 17:01:44 +0200
@@ -124,7 +124,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
@@ -4427,7 +4428,7 @@
{
struct dentry *dentry = filp->f_dentry;
struct dentry *cursor = filp->private_data;
-@@ -158,6 +159,8 @@ int dcache_readdir(struct file * filp, v
+@@ -157,6 +158,8 @@ int dcache_readdir(struct file * filp, v
next = list_entry(p, struct dentry, d_u.d_child);
if (d_unhashed(next) || !next->d_inode)
continue;
@@ -4436,7 +4437,7 @@
spin_unlock(&dcache_lock);
if (filldir(dirent, next->d_name.name, next->d_name.len, filp->f_pos, next->d_inode->i_ino, dt_type(next->d_inode)) < 0)
-@@ -174,6 +177,18 @@ int dcache_readdir(struct file * filp, v
+@@ -172,6 +175,18 @@ int dcache_readdir(struct file * filp, v
return 0;
}
@@ -4455,7 +4456,7 @@
ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
{
return -EISDIR;
-@@ -623,6 +638,7 @@ EXPORT_SYMBOL(dcache_dir_close);
+@@ -621,6 +636,7 @@ EXPORT_SYMBOL(dcache_dir_close);
EXPORT_SYMBOL(dcache_dir_lseek);
EXPORT_SYMBOL(dcache_dir_open);
EXPORT_SYMBOL(dcache_readdir);
@@ -4463,10 +4464,10 @@
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(get_sb_pseudo);
EXPORT_SYMBOL(simple_commit_write);
-diff -NurpP --minimal linux-2.6.17.11/fs/lockd/clntproc.c linux-2.6.17.11-vs2.0.2/fs/lockd/clntproc.c
---- linux-2.6.17.11/fs/lockd/clntproc.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/lockd/clntproc.c 2006-08-17 00:28:21 +0200
-@@ -18,6 +18,7 @@
+diff -NurpP --minimal linux-2.6.18/fs/lockd/clntproc.c linux-2.6.18-vs2.0.2.1-t6/fs/lockd/clntproc.c
+--- linux-2.6.18/fs/lockd/clntproc.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/lockd/clntproc.c 2006-09-20 17:01:44 +0200
+@@ -17,6 +17,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/lockd/lockd.h>
#include <linux/lockd/sm_inter.h>
@@ -4474,7 +4475,7 @@
#define NLMDBG_FACILITY NLMDBG_CLIENT
#define NLMCLNT_GRACE_WAIT (5*HZ)
-@@ -130,11 +131,11 @@ static void nlmclnt_setlockargs(struct n
+@@ -129,11 +130,11 @@ static void nlmclnt_setlockargs(struct n
nlmclnt_next_cookie(&argp->cookie);
argp->state = nsm_local_state;
memcpy(&lock->fh, NFS_FH(fl->fl_file->f_dentry->d_inode), sizeof(struct nfs_fh));
@@ -4488,9 +4489,9 @@
lock->svid = fl->fl_u.nfs_fl.owner->pid;
lock->fl.fl_start = fl->fl_start;
lock->fl.fl_end = fl->fl_end;
-diff -NurpP --minimal linux-2.6.17.11/fs/locks.c linux-2.6.17.11-vs2.0.2/fs/locks.c
---- linux-2.6.17.11/fs/locks.c 2006-06-18 04:54:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/locks.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/locks.c linux-2.6.18-vs2.0.2.1-t6/fs/locks.c
+--- linux-2.6.18/fs/locks.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/locks.c 2006-09-20 18:02:37 +0200
@@ -125,6 +125,7 @@
#include <linux/syscalls.h>
#include <linux/time.h>
@@ -4559,15 +4560,15 @@
error = lease_init(filp, type, fl);
if (error) {
locks_free_lock(fl);
-@@ -780,6 +792,7 @@ static int flock_lock_file(struct file *
+@@ -790,6 +802,7 @@ find_conflict:
+ if (request->fl_flags & FL_ACCESS)
goto out;
- }
locks_copy_lock(new_fl, request);
+ vx_locks_inc(new_fl);
locks_insert_lock(&inode->i_flock, new_fl);
new_fl = NULL;
error = 0;
-@@ -791,7 +804,8 @@ out:
+@@ -801,7 +814,8 @@ out:
return error;
}
@@ -4576,20 +4577,20 @@
+ struct file_lock *conflock, xid_t xid)
{
struct file_lock *fl;
- struct file_lock *new_fl, *new_fl2;
-@@ -805,7 +819,11 @@ static int __posix_lock_file_conf(struct
- * so we get them in advance to avoid races.
- */
- new_fl = locks_alloc_lock();
-+ new_fl->fl_xid = xid;
-+ vx_locks_inc(new_fl);
- new_fl2 = locks_alloc_lock();
-+ new_fl2->fl_xid = xid;
-+ vx_locks_inc(new_fl2);
+ struct file_lock *new_fl = NULL;
+@@ -821,7 +835,11 @@ static int __posix_lock_file_conf(struct
+ (request->fl_type != F_UNLCK ||
+ request->fl_start != 0 || request->fl_end != OFFSET_MAX)) {
+ new_fl = locks_alloc_lock();
++ new_fl->fl_xid = xid;
++ vx_locks_inc(new_fl);
+ new_fl2 = locks_alloc_lock();
++ new_fl2->fl_xid = xid;
++ vx_locks_inc(new_fl2);
+ }
lock_kernel();
- if (request->fl_type != F_UNLCK) {
-@@ -986,7 +1004,8 @@ static int __posix_lock_file_conf(struct
+@@ -1018,7 +1036,8 @@ static int __posix_lock_file_conf(struct
*/
int posix_lock_file(struct file *filp, struct file_lock *fl)
{
@@ -4599,7 +4600,7 @@
}
EXPORT_SYMBOL(posix_lock_file);
-@@ -1001,7 +1020,8 @@ EXPORT_SYMBOL(posix_lock_file);
+@@ -1033,7 +1052,8 @@ EXPORT_SYMBOL(posix_lock_file);
int posix_lock_file_conf(struct file *filp, struct file_lock *fl,
struct file_lock *conflock)
{
@@ -4609,7 +4610,7 @@
}
EXPORT_SYMBOL(posix_lock_file_conf);
-@@ -1091,7 +1111,7 @@ int locks_mandatory_area(int read_write,
+@@ -1123,7 +1143,7 @@ int locks_mandatory_area(int read_write,
fl.fl_end = offset + count - 1;
for (;;) {
@@ -4618,7 +4619,7 @@
if (error != -EAGAIN)
break;
if (!(fl.fl_flags & FL_SLEEP))
-@@ -1651,6 +1671,9 @@ int fcntl_setlk(unsigned int fd, struct
+@@ -1685,6 +1705,9 @@ int fcntl_setlk(unsigned int fd, struct
if (file_lock == NULL)
return -ENOLCK;
@@ -4628,7 +4629,7 @@
/*
* This might block, so we do it before checking the inode.
*/
-@@ -1794,6 +1817,9 @@ int fcntl_setlk64(unsigned int fd, struc
+@@ -1828,6 +1851,9 @@ int fcntl_setlk64(unsigned int fd, struc
if (file_lock == NULL)
return -ENOLCK;
@@ -4638,7 +4639,7 @@
/*
* This might block, so we do it before checking the inode.
*/
-@@ -2104,6 +2130,10 @@ int get_locks_status(char *buffer, char
+@@ -2123,6 +2149,10 @@ int get_locks_status(char *buffer, char
list_for_each(tmp, &file_lock_list) {
struct list_head *btmp;
struct file_lock *fl = list_entry(tmp, struct file_lock, fl_link);
@@ -4649,9 +4650,9 @@
lock_get_status(q, fl, ++i, "");
move_lock_status(&q, &pos, offset);
-diff -NurpP --minimal linux-2.6.17.11/fs/namei.c linux-2.6.17.11-vs2.0.2/fs/namei.c
---- linux-2.6.17.11/fs/namei.c 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/namei.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/namei.c linux-2.6.18-vs2.0.2.1-t6/fs/namei.c
+--- linux-2.6.18/fs/namei.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/namei.c 2006-09-20 17:01:44 +0200
@@ -32,6 +32,9 @@
#include <linux/file.h>
#include <linux/fcntl.h>
@@ -4662,17 +4663,24 @@
#include <asm/namei.h>
#include <asm/uaccess.h>
-@@ -225,6 +228,24 @@ int generic_permission(struct inode *ino
+@@ -225,6 +228,31 @@ int generic_permission(struct inode *ino
return -EACCES;
}
-+static inline int xid_permission(struct inode *inode, int mask, struct nameidata *nd)
++static inline int vx_barrier(struct inode *inode)
+{
+ if (IS_BARRIER(inode) && !vx_check(0, VX_ADMIN)) {
+ vxwprintk(1, "xid=%d did hit the barrier.",
+ vx_current_xid());
-+ return -EACCES;
++ return 1;
+ }
++ return 0;
++}
++
++static inline int xid_permission(struct inode *inode, int mask, struct nameidata *nd)
++{
++ if (vx_barrier(inode))
++ return -EACCES;
+ if (inode->i_xid == 0)
+ return 0;
+ if (vx_check(inode->i_xid, VX_ADMIN|VX_WATCH|VX_IDENT))
@@ -4686,8 +4694,8 @@
+
int permission(struct inode *inode, int mask, struct nameidata *nd)
{
- int retval, submask;
-@@ -235,7 +256,7 @@ int permission(struct inode *inode, int
+ umode_t mode = inode->i_mode;
+@@ -235,7 +263,7 @@ int permission(struct inode *inode, int
/*
* Nobody gets write access to a read-only fs.
*/
@@ -4696,7 +4704,7 @@
(S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)))
return -EROFS;
-@@ -249,6 +270,8 @@ int permission(struct inode *inode, int
+@@ -256,6 +284,8 @@ int permission(struct inode *inode, int
/* Ordinary permission routines do not understand MAY_APPEND. */
submask = mask & ~MAY_APPEND;
@@ -4705,7 +4713,16 @@
if (inode->i_op && inode->i_op->permission)
retval = inode->i_op->permission(inode, submask, nd);
else
-@@ -705,7 +728,8 @@ static __always_inline void follow_dotdo
+@@ -410,6 +440,8 @@ static int exec_permission_lite(struct i
+ {
+ umode_t mode = inode->i_mode;
+
++ if (vx_barrier(inode))
++ return -EACCES;
+ if (inode->i_op && inode->i_op->permission)
+ return -EAGAIN;
+
+@@ -712,7 +744,8 @@ static __always_inline void follow_dotdo
if (nd->dentry == current->fs->root &&
nd->mnt == current->fs->rootmnt) {
read_unlock(¤t->fs->lock);
@@ -4715,7 +4732,7 @@
}
read_unlock(¤t->fs->lock);
spin_lock(&dcache_lock);
-@@ -742,16 +766,34 @@ static int do_lookup(struct nameidata *n
+@@ -749,16 +782,34 @@ static int do_lookup(struct nameidata *n
{
struct vfsmount *mnt = nd->mnt;
struct dentry *dentry = __d_lookup(nd->dentry, name);
@@ -4750,7 +4767,7 @@
need_lookup:
dentry = real_lookup(nd->dentry, name, nd);
-@@ -1349,7 +1391,8 @@ static inline int check_sticky(struct in
+@@ -1356,7 +1407,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().
*/
@@ -4760,9 +4777,9 @@
{
int error;
-@@ -1359,13 +1402,13 @@ static int may_delete(struct inode *dir,
+@@ -1366,13 +1418,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->i_ino);
+ audit_inode_child(victim->d_name.name, victim->d_inode, dir);
- error = permission(dir,MAY_WRITE | MAY_EXEC, NULL);
+ error = permission(dir,MAY_WRITE | MAY_EXEC, nd);
@@ -4776,7 +4793,7 @@
return -EPERM;
if (isdir) {
if (!S_ISDIR(victim->d_inode->i_mode))
-@@ -1512,7 +1555,8 @@ int may_open(struct nameidata *nd, int a
+@@ -1519,7 +1571,8 @@ int may_open(struct nameidata *nd, int a
return -EACCES;
flag &= ~O_TRUNC;
@@ -4786,7 +4803,7 @@
return -EROFS;
/*
* An append-only file must be opened in append mode for writing.
-@@ -1790,9 +1834,10 @@ fail:
+@@ -1801,9 +1854,10 @@ fail:
}
EXPORT_SYMBOL_GPL(lookup_create);
@@ -4799,7 +4816,7 @@
if (error)
return error;
-@@ -1842,11 +1887,12 @@ asmlinkage long sys_mknodat(int dfd, con
+@@ -1853,11 +1907,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:
@@ -4815,7 +4832,7 @@
break;
case S_IFDIR:
error = -EPERM;
-@@ -1869,9 +1915,10 @@ asmlinkage long sys_mknod(const char __u
+@@ -1880,9 +1935,10 @@ asmlinkage long sys_mknod(const char __u
return sys_mknodat(AT_FDCWD, filename, mode, dev);
}
@@ -4828,7 +4845,7 @@
if (error)
return error;
-@@ -1910,7 +1957,8 @@ asmlinkage long sys_mkdirat(int dfd, con
+@@ -1921,7 +1977,8 @@ asmlinkage long sys_mkdirat(int dfd, con
if (!IS_ERR(dentry)) {
if (!IS_POSIXACL(nd.dentry->d_inode))
mode &= ~current->fs->umask;
@@ -4838,7 +4855,7 @@
dput(dentry);
}
mutex_unlock(&nd.dentry->d_inode->i_mutex);
-@@ -1955,9 +2003,10 @@ void dentry_unhash(struct dentry *dentry
+@@ -1966,9 +2023,10 @@ void dentry_unhash(struct dentry *dentry
spin_unlock(&dcache_lock);
}
@@ -4851,7 +4868,7 @@
if (error)
return error;
-@@ -2018,7 +2067,7 @@ static long do_rmdir(int dfd, const char
+@@ -2029,7 +2087,7 @@ static long do_rmdir(int dfd, const char
dentry = lookup_hash(&nd);
error = PTR_ERR(dentry);
if (!IS_ERR(dentry)) {
@@ -4860,7 +4877,7 @@
dput(dentry);
}
mutex_unlock(&nd.dentry->d_inode->i_mutex);
-@@ -2034,9 +2083,10 @@ asmlinkage long sys_rmdir(const char __u
+@@ -2045,9 +2103,10 @@ asmlinkage long sys_rmdir(const char __u
return do_rmdir(AT_FDCWD, pathname);
}
@@ -4873,7 +4890,7 @@
if (error)
return error;
-@@ -2098,7 +2148,7 @@ static long do_unlinkat(int dfd, const c
+@@ -2109,7 +2168,7 @@ static long do_unlinkat(int dfd, const c
inode = dentry->d_inode;
if (inode)
atomic_inc(&inode->i_count);
@@ -4882,7 +4899,7 @@
exit2:
dput(dentry);
}
-@@ -2133,9 +2183,10 @@ asmlinkage long sys_unlink(const char __
+@@ -2144,9 +2203,10 @@ asmlinkage long sys_unlink(const char __
return do_unlinkat(AT_FDCWD, pathname);
}
@@ -4895,7 +4912,7 @@
if (error)
return error;
-@@ -2176,7 +2227,8 @@ asmlinkage long sys_symlinkat(const char
+@@ -2187,7 +2247,8 @@ asmlinkage long sys_symlinkat(const char
dentry = lookup_create(&nd, 0);
error = PTR_ERR(dentry);
if (!IS_ERR(dentry)) {
@@ -4905,7 +4922,7 @@
dput(dentry);
}
mutex_unlock(&nd.dentry->d_inode->i_mutex);
-@@ -2193,7 +2245,8 @@ asmlinkage long sys_symlink(const char _
+@@ -2204,7 +2265,8 @@ asmlinkage long sys_symlink(const char _
return sys_symlinkat(oldname, AT_FDCWD, newname);
}
@@ -4915,7 +4932,7 @@
{
struct inode *inode = old_dentry->d_inode;
int error;
-@@ -2201,7 +2254,7 @@ int vfs_link(struct dentry *old_dentry,
+@@ -2212,7 +2274,7 @@ int vfs_link(struct dentry *old_dentry,
if (!inode)
return -ENOENT;
@@ -4924,7 +4941,7 @@
if (error)
return error;
-@@ -2211,7 +2264,7 @@ int vfs_link(struct dentry *old_dentry,
+@@ -2222,7 +2284,7 @@ int vfs_link(struct dentry *old_dentry,
/*
* A link to an append-only or immutable file cannot be created.
*/
@@ -4933,7 +4950,7 @@
return -EPERM;
if (!dir->i_op || !dir->i_op->link)
return -EPERM;
-@@ -2268,7 +2321,8 @@ asmlinkage long sys_linkat(int olddfd, c
+@@ -2281,7 +2343,8 @@ asmlinkage long sys_linkat(int olddfd, c
new_dentry = lookup_create(&nd, 0);
error = PTR_ERR(new_dentry);
if (!IS_ERR(new_dentry)) {
@@ -4943,7 +4960,7 @@
dput(new_dentry);
}
mutex_unlock(&nd.dentry->d_inode->i_mutex);
-@@ -2400,14 +2454,14 @@ int vfs_rename(struct inode *old_dir, st
+@@ -2413,14 +2476,14 @@ int vfs_rename(struct inode *old_dir, st
if (old_dentry->d_inode == new_dentry->d_inode)
return 0;
@@ -4960,7 +4977,7 @@
if (error)
return error;
-@@ -2485,6 +2539,9 @@ static int do_rename(int olddfd, const c
+@@ -2498,6 +2561,9 @@ static int do_rename(int olddfd, const c
error = -EINVAL;
if (old_dentry == trap)
goto exit4;
@@ -4970,10 +4987,10 @@
new_dentry = lookup_hash(&newnd);
error = PTR_ERR(new_dentry);
if (IS_ERR(new_dentry))
-diff -NurpP --minimal linux-2.6.17.11/fs/namespace.c linux-2.6.17.11-vs2.0.2/fs/namespace.c
---- linux-2.6.17.11/fs/namespace.c 2006-06-18 04:54:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/namespace.c 2006-09-03 18:30:49 +0200
-@@ -23,6 +23,8 @@
+diff -NurpP --minimal linux-2.6.18/fs/namespace.c linux-2.6.18-vs2.0.2.1-t6/fs/namespace.c
+--- linux-2.6.18/fs/namespace.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/namespace.c 2006-09-20 17:01:44 +0200
+@@ -22,6 +22,8 @@
#include <linux/namei.h>
#include <linux/security.h>
#include <linux/mount.h>
@@ -4982,7 +4999,7 @@
#include <asm/uaccess.h>
#include <asm/unistd.h>
#include "pnode.h"
-@@ -241,6 +243,7 @@ static struct vfsmount *clone_mnt(struct
+@@ -249,6 +251,7 @@ static struct vfsmount *clone_mnt(struct
mnt->mnt_root = dget(root);
mnt->mnt_mountpoint = mnt->mnt_root;
mnt->mnt_parent = mnt;
@@ -4990,7 +5007,7 @@
if (flag & CL_SLAVE) {
list_add(&mnt->mnt_slave, &old->mnt_slave_list);
-@@ -349,43 +352,85 @@ static inline void mangle(struct seq_fil
+@@ -357,43 +360,85 @@ static inline void mangle(struct seq_fil
seq_escape(m, s, " \t\n\\");
}
@@ -5103,7 +5120,7 @@
if (mnt->mnt_sb->s_op->show_options)
err = mnt->mnt_sb->s_op->show_options(m, mnt);
seq_puts(m, " 0 0\n");
-@@ -404,17 +449,27 @@ static int show_vfsstat(struct seq_file
+@@ -412,17 +457,27 @@ static int show_vfsstat(struct seq_file
struct vfsmount *mnt = v;
int err = 0;
@@ -5141,7 +5158,7 @@
/* file system type */
seq_puts(m, "with fstype ");
-@@ -646,7 +701,7 @@ asmlinkage long sys_umount(char __user *
+@@ -652,7 +707,7 @@ asmlinkage long sys_umount(char __user *
goto dput_and_out;
retval = -EPERM;
@@ -5150,7 +5167,7 @@
goto dput_and_out;
retval = do_umount(nd.mnt, flags);
-@@ -670,7 +725,7 @@ asmlinkage long sys_oldumount(char __use
+@@ -676,7 +731,7 @@ asmlinkage long sys_oldumount(char __use
static int mount_is_safe(struct nameidata *nd)
{
@@ -5159,7 +5176,7 @@
return 0;
return -EPERM;
#ifdef notyet
-@@ -899,11 +954,13 @@ static int do_change_type(struct nameida
+@@ -905,11 +960,13 @@ static int do_change_type(struct nameida
/*
* do loopback mount.
*/
@@ -5174,7 +5191,7 @@
if (err)
return err;
if (!old_name || !*old_name)
-@@ -929,6 +986,12 @@ static int do_loopback(struct nameidata
+@@ -935,6 +992,12 @@ static int do_loopback(struct nameidata
if (!mnt)
goto out;
@@ -5187,7 +5204,7 @@
err = graft_tree(mnt, nd);
if (err) {
LIST_HEAD(umount_list);
-@@ -937,6 +1000,7 @@ static int do_loopback(struct nameidata
+@@ -943,6 +1006,7 @@ static int do_loopback(struct nameidata
spin_unlock(&vfsmount_lock);
release_mounts(&umount_list);
}
@@ -5195,7 +5212,7 @@
out:
up_write(&namespace_sem);
-@@ -950,12 +1014,12 @@ out:
+@@ -956,12 +1020,12 @@ out:
* on it - tough luck.
*/
static int do_remount(struct nameidata *nd, int flags, int mnt_flags,
@@ -5210,7 +5227,7 @@
return -EPERM;
if (!check_mnt(nd->mnt))
-@@ -989,7 +1053,7 @@ static int do_move_mount(struct nameidat
+@@ -995,7 +1059,7 @@ static int do_move_mount(struct nameidat
struct nameidata old_nd, parent_nd;
struct vfsmount *p;
int err = 0;
@@ -5219,7 +5236,7 @@
return -EPERM;
if (!old_name || !*old_name)
return -EINVAL;
-@@ -1069,7 +1133,7 @@ static int do_new_mount(struct nameidata
+@@ -1075,7 +1139,7 @@ static int do_new_mount(struct nameidata
return -EINVAL;
/* we need capabilities... */
@@ -5228,7 +5245,7 @@
return -EPERM;
mnt = do_kern_mount(type, flags, name, data);
-@@ -1307,6 +1371,7 @@ long do_mount(char *dev_name, char *dir_
+@@ -1387,6 +1451,7 @@ long do_mount(char *dev_name, char *dir_
struct nameidata nd;
int retval = 0;
int mnt_flags = 0;
@@ -5236,7 +5253,7 @@
/* Discard magic */
if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-@@ -1322,7 +1387,17 @@ long do_mount(char *dev_name, char *dir_
+@@ -1402,7 +1467,17 @@ long do_mount(char *dev_name, char *dir_
if (data_page)
((char *)data_page)[PAGE_SIZE - 1] = 0;
@@ -5254,7 +5271,7 @@
if (flags & MS_NOSUID)
mnt_flags |= MNT_NOSUID;
if (flags & MS_NODEV)
-@@ -1334,6 +1409,8 @@ long do_mount(char *dev_name, char *dir_
+@@ -1414,6 +1489,8 @@ long do_mount(char *dev_name, char *dir_
if (flags & MS_NODIRATIME)
mnt_flags |= MNT_NODIRATIME;
@@ -5263,7 +5280,7 @@
flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE |
MS_NOATIME | MS_NODIRATIME);
-@@ -1348,9 +1425,9 @@ long do_mount(char *dev_name, char *dir_
+@@ -1428,9 +1505,9 @@ long do_mount(char *dev_name, char *dir_
if (flags & MS_REMOUNT)
retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
@@ -5275,7 +5292,7 @@
else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
retval = do_change_type(&nd, flags);
else if (flags & MS_MOVE)
-@@ -1448,7 +1525,7 @@ int copy_namespace(int flags, struct tas
+@@ -1528,7 +1605,7 @@ int copy_namespace(int flags, struct tas
if (!(flags & CLONE_NEWNS))
return 0;
@@ -5284,9 +5301,9 @@
err = -EPERM;
goto out;
}
-diff -NurpP --minimal linux-2.6.17.11/fs/nfs/dir.c linux-2.6.17.11-vs2.0.2/fs/nfs/dir.c
---- linux-2.6.17.11/fs/nfs/dir.c 2006-06-18 04:54:38 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/nfs/dir.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/nfs/dir.c linux-2.6.18-vs2.0.2.1-t6/fs/nfs/dir.c
+--- linux-2.6.18/fs/nfs/dir.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/nfs/dir.c 2006-09-20 17:01:44 +0200
@@ -28,9 +28,11 @@
#include <linux/sunrpc/clnt.h>
#include <linux/nfs_fs.h>
@@ -5299,7 +5316,7 @@
#include "nfs4_fs.h"
#include "delegation.h"
-@@ -904,6 +906,7 @@ static struct dentry *nfs_lookup(struct
+@@ -922,6 +924,7 @@ static struct dentry *nfs_lookup(struct
res = (struct dentry *)inode;
if (IS_ERR(res))
goto out_unlock;
@@ -5307,7 +5324,7 @@
no_entry:
res = d_add_unique(dentry, inode);
if (res != NULL)
-@@ -937,7 +940,8 @@ static int is_atomic_open(struct inode *
+@@ -955,7 +958,8 @@ static int is_atomic_open(struct inode *
if (nd->flags & LOOKUP_DIRECTORY)
return 0;
/* Are we trying to write to a read only partition? */
@@ -5317,51 +5334,18 @@
return 0;
return 1;
}
-diff -NurpP --minimal linux-2.6.17.11/fs/nfs/inode.c linux-2.6.17.11-vs2.0.2/fs/nfs/inode.c
---- linux-2.6.17.11/fs/nfs/inode.c 2006-06-18 04:54:41 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/nfs/inode.c 2006-08-17 00:28:21 +0200
-@@ -36,6 +36,7 @@
- #include <linux/mount.h>
- #include <linux/nfs_idmap.h>
+diff -NurpP --minimal linux-2.6.18/fs/nfs/inode.c linux-2.6.18-vs2.0.2.1-t6/fs/nfs/inode.c
+--- linux-2.6.18/fs/nfs/inode.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/nfs/inode.c 2006-09-21 01:31:36 +0200
+@@ -37,6 +37,7 @@
#include <linux/vfs.h>
+ #include <linux/inet.h>
+ #include <linux/nfs_xdr.h>
+#include <linux/vserver/xid.h>
#include <asm/system.h>
#include <asm/uaccess.h>
-@@ -343,12 +344,16 @@ nfs_sb_init(struct super_block *sb, rpc_
- }
- server->backing_dev_info.ra_pages = server->rpages * NFS_MAX_READAHEAD;
-
-+ if (server->flags & NFS_MOUNT_TAGXID)
-+ sb->s_flags |= MS_TAGXID;
-+
- sb->s_maxbytes = fsinfo.maxfilesize;
- if (sb->s_maxbytes > MAX_LFS_FILESIZE)
- sb->s_maxbytes = MAX_LFS_FILESIZE;
-
- server->client->cl_intr = (server->flags & NFS_MOUNT_INTR) ? 1 : 0;
- server->client->cl_softrtry = (server->flags & NFS_MOUNT_SOFT) ? 1 : 0;
-+ server->client->cl_tagxid = (server->flags & NFS_MOUNT_TAGXID) ? 1 : 0;
-
- /* We're airborne Set socket buffersize */
- rpc_setbufsize(server->client, server->wsize + 100, server->rsize + 100);
-@@ -423,6 +428,7 @@ nfs_create_client(struct nfs_server *ser
-
- clnt->cl_intr = 1;
- clnt->cl_softrtry = 1;
-+ clnt->cl_tagxid = 1;
-
- return clnt;
-
-@@ -602,6 +608,7 @@ static void nfs_show_mount_options(struc
- { NFS_MOUNT_NOAC, ",noac", "" },
- { NFS_MOUNT_NONLM, ",nolock", "" },
- { NFS_MOUNT_NOACL, ",noacl", "" },
-+ { NFS_MOUNT_TAGXID, ",tagxid", "" },
- { 0, NULL, NULL }
- };
- struct proc_nfs_info *nfs_infop;
-@@ -903,8 +910,10 @@ nfs_fhget(struct super_block *sb, struct
+@@ -275,8 +276,10 @@ nfs_fhget(struct super_block *sb, struct
nfsi->change_attr = fattr->change_attr;
inode->i_size = nfs_size_to_loff_t(fattr->size);
inode->i_nlink = fattr->nlink;
@@ -5374,7 +5358,7 @@
if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
/*
* report the blocks in 512byte units
-@@ -995,6 +1004,8 @@ void nfs_setattr_update_inode(struct ino
+@@ -367,6 +370,8 @@ void nfs_setattr_update_inode(struct ino
inode->i_uid = attr->ia_uid;
if ((attr->ia_valid & ATTR_GID) != 0)
inode->i_gid = attr->ia_gid;
@@ -5383,7 +5367,7 @@
spin_lock(&inode->i_lock);
NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
spin_unlock(&inode->i_lock);
-@@ -1397,6 +1408,9 @@ static int nfs_check_inode_attributes(st
+@@ -769,6 +774,9 @@ static int nfs_check_inode_attributes(st
struct nfs_inode *nfsi = NFS_I(inode);
loff_t cur_size, new_isize;
int data_unstable;
@@ -5392,8 +5376,8 @@
+ xid_t xid;
- if ((fattr->valid & NFS_ATTR_FATTR) == 0)
-@@ -1434,10 +1448,15 @@ static int nfs_check_inode_attributes(st
+ /* Has the inode gone and changed behind our back? */
+@@ -796,10 +804,15 @@ static int nfs_check_inode_attributes(st
if (cur_size != new_isize && nfsi->npages == 0)
nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
@@ -5411,7 +5395,7 @@
nfsi->cache_validity |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
/* Has the link count changed? */
-@@ -1522,6 +1541,9 @@ static int nfs_update_inode(struct inode
+@@ -883,6 +896,9 @@ static int nfs_update_inode(struct inode
loff_t cur_isize, new_isize;
unsigned int invalid = 0;
int data_stable;
@@ -5421,7 +5405,7 @@
dfprintk(VFS, "NFS: %s(%s/%ld ct=%d info=0x%x)\n",
__FUNCTION__, inode->i_sb->s_id, inode->i_ino,
-@@ -1591,15 +1613,21 @@ static int nfs_update_inode(struct inode
+@@ -955,15 +971,21 @@ static int nfs_update_inode(struct inode
}
memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
@@ -5447,17 +5431,17 @@
if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
/*
-diff -NurpP --minimal linux-2.6.17.11/fs/nfs/nfs3xdr.c linux-2.6.17.11-vs2.0.2/fs/nfs/nfs3xdr.c
---- linux-2.6.17.11/fs/nfs/nfs3xdr.c 2006-06-18 04:54:41 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/nfs/nfs3xdr.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/nfs/nfs3xdr.c linux-2.6.18-vs2.0.2.1-t6/fs/nfs/nfs3xdr.c
+--- linux-2.6.18/fs/nfs/nfs3xdr.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/nfs/nfs3xdr.c 2006-09-20 19:47:41 +0200
@@ -22,6 +22,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
#include <linux/nfsacl.h>
+#include <linux/vserver/xid.h>
+ #include "internal.h"
#define NFSDBG_FACILITY NFSDBG_XDR
-
@@ -178,7 +179,7 @@ xdr_decode_fattr(u32 *p, struct nfs_fatt
}
@@ -5539,9 +5523,9 @@
if (args->type == NF3CHR || args->type == NF3BLK) {
*p++ = htonl(MAJOR(args->rdev));
*p++ = htonl(MINOR(args->rdev));
-diff -NurpP --minimal linux-2.6.17.11/fs/nfs/nfsroot.c linux-2.6.17.11-vs2.0.2/fs/nfs/nfsroot.c
---- linux-2.6.17.11/fs/nfs/nfsroot.c 2006-02-18 14:40:23 +0100
-+++ linux-2.6.17.11-vs2.0.2/fs/nfs/nfsroot.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/nfs/nfsroot.c linux-2.6.18-vs2.0.2.1-t6/fs/nfs/nfsroot.c
+--- linux-2.6.18/fs/nfs/nfsroot.c 2006-02-18 14:40:23 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/fs/nfs/nfsroot.c 2006-09-20 17:01:44 +0200
@@ -87,6 +87,7 @@
#include <linux/root_dev.h>
#include <net/ipconfig.h>
@@ -5588,9 +5572,51 @@
if (strlen(buf) + strlen(cp) > NFS_MAXPATHLEN) {
printk(KERN_ERR "Root-NFS: Pathname for remote directory too long.\n");
return -1;
-diff -NurpP --minimal linux-2.6.17.11/fs/nfsd/auth.c linux-2.6.17.11-vs2.0.2/fs/nfsd/auth.c
---- linux-2.6.17.11/fs/nfsd/auth.c 2006-06-18 04:54:42 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/nfsd/auth.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/nfs/super.c linux-2.6.18-vs2.0.2.1-t6/fs/nfs/super.c
+--- linux-2.6.18/fs/nfs/super.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/nfs/super.c 2006-09-20 20:28:12 +0200
+@@ -40,6 +40,7 @@
+ #include <linux/vfs.h>
+ #include <linux/inet.h>
+ #include <linux/nfs_xdr.h>
++#include <linux/vserver/xid.h>
+
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+@@ -367,6 +368,7 @@ static void nfs_show_mount_options(struc
+ { NFS_MOUNT_NOAC, ",noac", "" },
+ { NFS_MOUNT_NONLM, ",nolock", "" },
+ { NFS_MOUNT_NOACL, ",noacl", "" },
++ { NFS_MOUNT_TAGXID, ",tagxid", "" },
+ { 0, NULL, NULL }
+ };
+ struct proc_nfs_info *nfs_infop;
+@@ -631,10 +633,14 @@ nfs_sb_init(struct super_block *sb, rpc_
+ }
+ server->backing_dev_info.ra_pages = server->rpages * NFS_MAX_READAHEAD;
+
++ if (server->flags & NFS_MOUNT_TAGXID)
++ sb->s_flags |= MS_TAGXID;
++
+ nfs_super_set_maxbytes(sb, fsinfo.maxfilesize);
+
+ server->client->cl_intr = (server->flags & NFS_MOUNT_INTR) ? 1 : 0;
+ server->client->cl_softrtry = (server->flags & NFS_MOUNT_SOFT) ? 1 : 0;
++ server->client->cl_tagxid = (server->flags & NFS_MOUNT_TAGXID) ? 1 : 0;
+
+ /* We're airborne Set socket buffersize */
+ rpc_setbufsize(server->client, server->wsize + 100, server->rsize + 100);
+@@ -712,6 +718,7 @@ nfs_create_client(struct nfs_server *ser
+
+ clnt->cl_intr = 1;
+ clnt->cl_softrtry = 1;
++ clnt->cl_tagxid = 1;
+
+ return clnt;
+
+diff -NurpP --minimal linux-2.6.18/fs/nfsd/auth.c linux-2.6.18-vs2.0.2.1-t6/fs/nfsd/auth.c
+--- linux-2.6.18/fs/nfsd/auth.c 2006-06-18 04:54:42 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/nfsd/auth.c 2006-09-20 17:01:44 +0200
@@ -9,6 +9,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/sunrpc/svcauth.h>
@@ -5625,9 +5651,9 @@
cap_t(current->cap_effective) &= ~CAP_NFSD_MASK;
} else {
cap_t(current->cap_effective) |= (CAP_NFSD_MASK &
-diff -NurpP --minimal linux-2.6.17.11/fs/nfsd/nfs3xdr.c linux-2.6.17.11-vs2.0.2/fs/nfsd/nfs3xdr.c
---- linux-2.6.17.11/fs/nfsd/nfs3xdr.c 2006-04-09 13:49:54 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/nfsd/nfs3xdr.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/nfsd/nfs3xdr.c linux-2.6.18-vs2.0.2.1-t6/fs/nfsd/nfs3xdr.c
+--- linux-2.6.18/fs/nfsd/nfs3xdr.c 2006-04-09 13:49:54 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/nfsd/nfs3xdr.c 2006-09-20 17:01:44 +0200
@@ -21,6 +21,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/nfsd/nfsd.h>
@@ -5676,9 +5702,9 @@
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-2.6.17.11/fs/nfsd/nfs4recover.c linux-2.6.17.11-vs2.0.2/fs/nfsd/nfs4recover.c
---- linux-2.6.17.11/fs/nfsd/nfs4recover.c 2006-02-18 14:40:23 +0100
-+++ linux-2.6.17.11-vs2.0.2/fs/nfsd/nfs4recover.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/nfsd/nfs4recover.c linux-2.6.18-vs2.0.2.1-t6/fs/nfsd/nfs4recover.c
+--- linux-2.6.18/fs/nfsd/nfs4recover.c 2006-02-18 14:40:23 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/fs/nfsd/nfs4recover.c 2006-09-20 17:01:44 +0200
@@ -155,7 +155,7 @@ nfsd4_create_clid_dir(struct nfs4_client
dprintk("NFSD: nfsd4_create_clid_dir: DIRECTORY EXISTS\n");
goto out_put;
@@ -5706,9 +5732,9 @@
mutex_unlock(&dir->d_inode->i_mutex);
return status;
}
-diff -NurpP --minimal linux-2.6.17.11/fs/nfsd/nfs4xdr.c linux-2.6.17.11-vs2.0.2/fs/nfsd/nfs4xdr.c
---- linux-2.6.17.11/fs/nfsd/nfs4xdr.c 2006-06-18 04:54:42 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/nfsd/nfs4xdr.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/nfsd/nfs4xdr.c linux-2.6.18-vs2.0.2.1-t6/fs/nfsd/nfs4xdr.c
+--- linux-2.6.18/fs/nfsd/nfs4xdr.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/nfsd/nfs4xdr.c 2006-09-20 17:01:44 +0200
@@ -57,6 +57,7 @@
#include <linux/nfsd_idmap.h>
#include <linux/nfs4.h>
@@ -5738,9 +5764,9 @@
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-2.6.17.11/fs/nfsd/nfsxdr.c linux-2.6.17.11-vs2.0.2/fs/nfsd/nfsxdr.c
---- linux-2.6.17.11/fs/nfsd/nfsxdr.c 2006-04-09 13:49:54 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/nfsd/nfsxdr.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/nfsd/nfsxdr.c linux-2.6.18-vs2.0.2.1-t6/fs/nfsd/nfsxdr.c
+--- linux-2.6.18/fs/nfsd/nfsxdr.c 2006-04-09 13:49:54 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/nfsd/nfsxdr.c 2006-09-20 17:01:44 +0200
@@ -15,6 +15,7 @@
#include <linux/nfsd/nfsd.h>
#include <linux/nfsd/xdr.h>
@@ -5789,10 +5815,10 @@
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-2.6.17.11/fs/nfsd/vfs.c linux-2.6.17.11-vs2.0.2/fs/nfsd/vfs.c
---- linux-2.6.17.11/fs/nfsd/vfs.c 2006-06-18 04:54:42 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/nfsd/vfs.c 2006-08-17 00:28:21 +0200
-@@ -1156,13 +1156,13 @@ nfsd_create(struct svc_rqst *rqstp, stru
+diff -NurpP --minimal linux-2.6.18/fs/nfsd/vfs.c linux-2.6.18-vs2.0.2.1-t6/fs/nfsd/vfs.c
+--- linux-2.6.18/fs/nfsd/vfs.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/nfsd/vfs.c 2006-09-20 17:01:44 +0200
+@@ -1158,13 +1158,13 @@ nfsd_create(struct svc_rqst *rqstp, stru
err = vfs_create(dirp, dchild, iap->ia_mode, NULL);
break;
case S_IFDIR:
@@ -5808,7 +5834,7 @@
break;
default:
printk("nfsd: bad file type %o in nfsd_create\n", type);
-@@ -1442,11 +1442,13 @@ nfsd_symlink(struct svc_rqst *rqstp, str
+@@ -1444,11 +1444,13 @@ nfsd_symlink(struct svc_rqst *rqstp, str
else {
strncpy(path_alloced, path, plen);
path_alloced[plen] = 0;
@@ -5824,7 +5850,7 @@
if (!err)
if (EX_ISSYNC(fhp->fh_export))
-@@ -1504,7 +1506,7 @@ nfsd_link(struct svc_rqst *rqstp, struct
+@@ -1506,7 +1508,7 @@ nfsd_link(struct svc_rqst *rqstp, struct
dold = tfhp->fh_dentry;
dest = dold->d_inode;
@@ -5833,7 +5859,7 @@
if (!err) {
if (EX_ISSYNC(ffhp->fh_export)) {
err = nfserrno(nfsd_sync_dir(ddir));
-@@ -1666,9 +1668,9 @@ nfsd_unlink(struct svc_rqst *rqstp, stru
+@@ -1669,9 +1671,9 @@ nfsd_unlink(struct svc_rqst *rqstp, stru
err = -EPERM;
} else
#endif
@@ -5845,7 +5871,7 @@
}
dput(rdentry);
-@@ -1777,7 +1779,8 @@ nfsd_permission(struct svc_export *exp,
+@@ -1780,7 +1782,8 @@ nfsd_permission(struct svc_export *exp,
*/
if (!(acc & MAY_LOCAL_ACCESS))
if (acc & (MAY_WRITE | MAY_SATTR | MAY_TRUNC)) {
@@ -5855,9 +5881,9 @@
return nfserr_rofs;
if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE(inode))
return nfserr_perm;
-diff -NurpP --minimal linux-2.6.17.11/fs/open.c linux-2.6.17.11-vs2.0.2/fs/open.c
---- linux-2.6.17.11/fs/open.c 2006-06-18 04:54:44 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/open.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/open.c linux-2.6.18-vs2.0.2.1-t6/fs/open.c
+--- linux-2.6.18/fs/open.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/open.c 2006-09-20 21:05:31 +0200
@@ -28,6 +28,9 @@
#include <linux/syscalls.h>
#include <linux/rcupdate.h>
@@ -5868,7 +5894,21 @@
#include <asm/unistd.h>
-@@ -46,6 +49,8 @@ int vfs_statfs(struct super_block *sb, s
+@@ -36,16 +39,20 @@ int vfs_statfs(struct dentry *dentry, st
+ int retval = -ENODEV;
+
+ if (dentry) {
++ struct super_block *sb = dentry->d_sb;
++
+ retval = -ENOSYS;
+- if (dentry->d_sb->s_op->statfs) {
++ if (sb->s_op->statfs) {
+ memset(buf, 0, sizeof(*buf));
+ retval = security_sb_statfs(dentry);
+ if (retval)
+ return retval;
+- retval = dentry->d_sb->s_op->statfs(dentry, buf);
++ retval = sb->s_op->statfs(dentry, buf);
if (retval == 0 && buf->f_frsize == 0)
buf->f_frsize = buf->f_bsize;
}
@@ -5877,7 +5917,7 @@
}
return retval;
}
-@@ -249,7 +254,7 @@ static long do_sys_truncate(const char _
+@@ -249,7 +256,7 @@ static long do_sys_truncate(const char _
goto dput_and_out;
error = -EROFS;
@@ -5886,7 +5926,7 @@
goto dput_and_out;
error = -EPERM;
-@@ -379,7 +384,7 @@ asmlinkage long sys_utime(char __user *
+@@ -379,7 +386,7 @@ asmlinkage long sys_utime(char __user *
inode = nd.dentry->d_inode;
error = -EROFS;
@@ -5895,7 +5935,7 @@
goto dput_and_out;
/* Don't worry, the checks are done in inode_change_ok() */
-@@ -436,7 +441,7 @@ long do_utimes(int dfd, char __user *fil
+@@ -436,7 +443,7 @@ long do_utimes(int dfd, char __user *fil
inode = nd.dentry->d_inode;
error = -EROFS;
@@ -5904,7 +5944,7 @@
goto dput_and_out;
/* Don't worry, the checks are done in inode_change_ok() */
-@@ -523,7 +528,8 @@ asmlinkage long sys_faccessat(int dfd, c
+@@ -523,7 +530,8 @@ asmlinkage long sys_faccessat(int dfd, c
if (!res) {
res = vfs_permission(&nd, mode);
/* SuS v2 requires we report a read only fs too */
@@ -5914,8 +5954,8 @@
&& !special_file(nd.dentry->d_inode->i_mode))
res = -EROFS;
path_release(&nd);
-@@ -636,7 +642,7 @@ asmlinkage long sys_fchmod(unsigned int
- audit_inode(NULL, inode, 0);
+@@ -636,7 +644,7 @@ asmlinkage long sys_fchmod(unsigned int
+ audit_inode(NULL, inode);
err = -EROFS;
- if (IS_RDONLY(inode))
@@ -5923,7 +5963,7 @@
goto out_putf;
err = -EPERM;
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
-@@ -669,7 +675,7 @@ asmlinkage long sys_fchmodat(int dfd, co
+@@ -669,7 +677,7 @@ asmlinkage long sys_fchmodat(int dfd, co
inode = nd.dentry->d_inode;
error = -EROFS;
@@ -5932,7 +5972,7 @@
goto dput_and_out;
error = -EPERM;
-@@ -695,7 +701,8 @@ asmlinkage long sys_chmod(const char __u
+@@ -695,7 +703,8 @@ asmlinkage long sys_chmod(const char __u
return sys_fchmodat(AT_FDCWD, filename, mode);
}
@@ -5942,7 +5982,7 @@
{
struct inode * inode;
int error;
-@@ -707,7 +714,7 @@ static int chown_common(struct dentry *
+@@ -707,7 +716,7 @@ static int chown_common(struct dentry *
goto out;
}
error = -EROFS;
@@ -5951,7 +5991,7 @@
goto out;
error = -EPERM;
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
-@@ -715,11 +722,11 @@ static int chown_common(struct dentry *
+@@ -715,11 +724,11 @@ static int chown_common(struct dentry *
newattrs.ia_valid = ATTR_CTIME;
if (user != (uid_t) -1) {
newattrs.ia_valid |= ATTR_UID;
@@ -5965,7 +6005,7 @@
}
if (!S_ISDIR(inode->i_mode))
newattrs.ia_valid |= ATTR_KILL_SUID|ATTR_KILL_SGID;
-@@ -737,7 +744,7 @@ asmlinkage long sys_chown(const char __u
+@@ -737,7 +746,7 @@ asmlinkage long sys_chown(const char __u
error = user_path_walk(filename, &nd);
if (!error) {
@@ -5974,7 +6014,7 @@
path_release(&nd);
}
return error;
-@@ -756,7 +763,7 @@ asmlinkage long sys_fchownat(int dfd, co
+@@ -756,7 +765,7 @@ asmlinkage long sys_fchownat(int dfd, co
follow = (flag & AT_SYMLINK_NOFOLLOW) ? 0 : LOOKUP_FOLLOW;
error = __user_walk_fd(dfd, filename, follow, &nd);
if (!error) {
@@ -5983,7 +6023,7 @@
path_release(&nd);
}
out:
-@@ -770,7 +777,7 @@ asmlinkage long sys_lchown(const char __
+@@ -770,7 +779,7 @@ asmlinkage long sys_lchown(const char __
error = user_path_walk_link(filename, &nd);
if (!error) {
@@ -5992,16 +6032,16 @@
path_release(&nd);
}
return error;
-@@ -787,7 +794,7 @@ asmlinkage long sys_fchown(unsigned int
+@@ -787,7 +796,7 @@ asmlinkage long sys_fchown(unsigned int
struct dentry * dentry;
dentry = file->f_dentry;
- audit_inode(NULL, dentry->d_inode, 0);
+ audit_inode(NULL, dentry->d_inode);
- error = chown_common(dentry, user, group);
+ error = chown_common(dentry, file->f_vfsmnt, user, group);
fput(file);
}
return error;
-@@ -1015,6 +1022,7 @@ repeat:
+@@ -1015,6 +1024,7 @@ repeat:
FD_SET(fd, fdt->open_fds);
FD_CLR(fd, fdt->close_on_exec);
files->next_fd = fd + 1;
@@ -6009,7 +6049,7 @@
#if 1
/* Sanity check */
if (fdt->fd[fd] != NULL) {
-@@ -1037,6 +1045,7 @@ static void __put_unused_fd(struct files
+@@ -1037,6 +1047,7 @@ static void __put_unused_fd(struct files
__FD_CLR(fd, fdt->open_fds);
if (fd < files->next_fd)
files->next_fd = fd;
@@ -6017,13 +6057,13 @@
}
void fastcall put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-2.6.17.11/fs/proc/array.c linux-2.6.17.11-vs2.0.2/fs/proc/array.c
---- linux-2.6.17.11/fs/proc/array.c 2006-06-18 04:54:45 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/proc/array.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/proc/array.c linux-2.6.18-vs2.0.2.1-t6/fs/proc/array.c
+--- linux-2.6.18/fs/proc/array.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/proc/array.c 2006-09-20 19:47:01 +0200
@@ -75,6 +75,9 @@
- #include <linux/times.h>
#include <linux/cpuset.h>
#include <linux/rcupdate.h>
+ #include <linux/delayacct.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_cvirt.h>
@@ -6176,16 +6216,16 @@
+
res = sprintf(buffer,"%d (%s) %c %d %d %d %d %d %lu %lu \
%lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
- %lu %lu %lu %lu %lu %lu %lu %lu %d %d %lu %lu\n",
+ %lu %lu %lu %lu %lu %lu %lu %lu %d %d %lu %lu %llu\n",
- task->pid,
+ pid,
tcomm,
state,
ppid,
-diff -NurpP --minimal linux-2.6.17.11/fs/proc/base.c linux-2.6.17.11-vs2.0.2/fs/proc/base.c
---- linux-2.6.17.11/fs/proc/base.c 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/proc/base.c 2006-08-17 00:28:21 +0200
-@@ -72,6 +72,8 @@
+diff -NurpP --minimal linux-2.6.18/fs/proc/base.c linux-2.6.18-vs2.0.2.1-t6/fs/proc/base.c
+--- linux-2.6.18/fs/proc/base.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/proc/base.c 2006-09-23 18:44:15 +0200
+@@ -71,6 +71,8 @@
#include <linux/cpuset.h>
#include <linux/audit.h>
#include <linux/poll.h>
@@ -6193,26 +6233,26 @@
+#include <linux/vs_network.h>
#include "internal.h"
- /*
-@@ -122,6 +124,8 @@ enum pid_directory_inos {
- PROC_TGID_ATTR_EXEC,
- PROC_TGID_ATTR_FSCREATE,
+ /* NOTE:
+@@ -133,6 +135,8 @@ enum pid_directory_inos {
+ PROC_TGID_ATTR_KEYCREATE,
+ PROC_TGID_ATTR_SOCKCREATE,
#endif
+ PROC_TGID_VX_INFO,
+ PROC_TGID_IP_INFO,
#ifdef CONFIG_AUDITSYSCALL
PROC_TGID_LOGINUID,
#endif
-@@ -163,6 +167,8 @@ enum pid_directory_inos {
- PROC_TID_ATTR_EXEC,
- PROC_TID_ATTR_FSCREATE,
+@@ -176,6 +180,8 @@ enum pid_directory_inos {
+ PROC_TID_ATTR_KEYCREATE,
+ PROC_TID_ATTR_SOCKCREATE,
#endif
+ PROC_TID_VX_INFO,
+ PROC_TID_IP_INFO,
#ifdef CONFIG_AUDITSYSCALL
PROC_TID_LOGINUID,
#endif
-@@ -219,6 +225,8 @@ static struct pid_entry tgid_base_stuff[
+@@ -235,6 +241,8 @@ static struct pid_entry tgid_base_stuff[
#ifdef CONFIG_CPUSETS
E(PROC_TGID_CPUSET, "cpuset", S_IFREG|S_IRUGO),
#endif
@@ -6221,7 +6261,7 @@
E(PROC_TGID_OOM_SCORE, "oom_score",S_IFREG|S_IRUGO),
E(PROC_TGID_OOM_ADJUST,"oom_adj", S_IFREG|S_IRUGO|S_IWUSR),
#ifdef CONFIG_AUDITSYSCALL
-@@ -261,6 +269,8 @@ static struct pid_entry tid_base_stuff[]
+@@ -277,6 +285,8 @@ static struct pid_entry tid_base_stuff[]
#ifdef CONFIG_CPUSETS
E(PROC_TID_CPUSET, "cpuset", S_IFREG|S_IRUGO),
#endif
@@ -6230,35 +6270,16 @@
E(PROC_TID_OOM_SCORE, "oom_score",S_IFREG|S_IRUGO),
E(PROC_TID_OOM_ADJUST, "oom_adj", S_IFREG|S_IRUGO|S_IWUSR),
#ifdef CONFIG_AUDITSYSCALL
-@@ -547,6 +557,10 @@ static int proc_check_chroot(struct dent
- struct vfsmount *our_vfsmnt, *mnt;
- int res = 0;
-
-+ /* context admin override */
-+ if (capable(CAP_CONTEXT))
-+ goto override;
-+
- read_lock(¤t->fs->lock);
- our_vfsmnt = mntget(current->fs->rootmnt);
- base = dget(current->fs->root);
-@@ -570,6 +584,7 @@ static int proc_check_chroot(struct dent
- exit:
- dput(base);
- mntput(our_vfsmnt);
-+override:
- dput(root);
- mntput(vfsmnt);
- return res;
-@@ -1286,7 +1301,7 @@ static int proc_pident_readdir(struct fi
- struct inode *inode = dentry->d_inode;
+@@ -1214,7 +1224,7 @@ static int proc_pident_readdir(struct fi
+ struct task_struct *task = get_proc_task(inode);
struct pid_entry *p;
ino_t ino;
- int ret;
+ int ret, hide;
ret = -ENOENT;
- if (!pid_alive(proc_task(inode)))
-@@ -1317,11 +1332,20 @@ static int proc_pident_readdir(struct fi
+ if (!task)
+@@ -1246,11 +1256,20 @@ static int proc_pident_readdir(struct fi
goto out;
}
p = ents + i;
@@ -6279,7 +6300,7 @@
p++;
}
}
-@@ -1396,6 +1420,7 @@ static struct inode *proc_pid_make_inode
+@@ -1322,6 +1341,7 @@ static struct inode *proc_pid_make_inode
inode->i_uid = task->euid;
inode->i_gid = task->egid;
}
@@ -6287,37 +6308,50 @@
security_task_to_inode(task, inode);
out:
-@@ -1421,6 +1446,11 @@ static int pid_revalidate(struct dentry
+@@ -1353,7 +1373,13 @@ static int pid_revalidate(struct dentry
{
struct inode *inode = dentry->d_inode;
- struct task_struct *task = proc_task(inode);
+ struct task_struct *task = get_proc_task(inode);
++ int ret = 0;
+
-+ if (!vx_check(vx_task_xid(task), VX_IDENT))
-+ goto out_drop;
-+ /* discard wrong fakeinit */
+ if (task) {
++ if (!vx_check(vx_task_xid(task), VX_IDENT|VX_WATCH))
++ goto out_drop;
++ /* discard wrong fakeinit */
+
- if (pid_alive(task)) {
- if (proc_type(inode) == PROC_TGID_INO || proc_type(inode) == PROC_TID_INO || task_dumpable(task)) {
+ if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
+ task_dumpable(task)) {
inode->i_uid = task->euid;
-@@ -1433,6 +1463,7 @@ static int pid_revalidate(struct dentry
+@@ -1364,11 +1390,15 @@ static int pid_revalidate(struct dentry
+ }
+ inode->i_mode &= ~(S_ISUID | S_ISGID);
security_task_to_inode(task, inode);
- return 1;
+- put_task_struct(task);
+- return 1;
++ ret = 1;
++ goto out_put;
}
+out_drop:
d_drop(dentry);
- return 0;
+- return 0;
++out_put:
++ if (task)
++ put_task_struct(task);
++ return ret;
}
-@@ -1675,6 +1706,9 @@ static struct file_operations proc_tgid_
+
+ static int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
+@@ -1642,6 +1672,9 @@ static struct file_operations proc_tgid_
static struct inode_operations proc_tgid_attr_inode_operations;
#endif
+extern int proc_pid_vx_info(struct task_struct *, char *);
+extern int proc_pid_nx_info(struct task_struct *, char *);
+
- static int get_tid_list(int index, unsigned int *tids, struct inode *dir);
-
/* SMP-safe */
-@@ -1866,15 +1900,33 @@ static struct dentry *proc_pident_lookup
+ static struct dentry *proc_pident_lookup(struct inode *dir,
+ struct dentry *dentry,
+@@ -1834,17 +1867,37 @@ static struct dentry *proc_pident_lookup
inode->i_fop = &proc_loginuid_operations;
break;
#endif
@@ -6338,25 +6372,30 @@
default:
printk("procfs: impossible type (%d)",p->type);
- iput(inode);
-- return ERR_PTR(-EINVAL);
-+ error = -EINVAL;
+ error = ERR_PTR(-EINVAL);
+- goto out;
+ goto out_put;
}
dentry->d_op = &pid_dentry_operations;
d_add(dentry, inode);
- return NULL;
-
+ /* Close the race of the process dying before we return the dentry */
+- if (pid_revalidate(dentry, NULL))
++ if (pid_revalidate(dentry, NULL)) {
+ error = NULL;
++ goto out;
++ }
++
+out_noent:
-+ error=-ENOENT;
++ error=ERR_PTR(-ENOENT);
+out_put:
+ iput(inode);
out:
- return ERR_PTR(error);
- }
-@@ -1962,14 +2014,14 @@ static int proc_self_readlink(struct den
+ put_task_struct(task);
+ out_no_task:
+@@ -1938,14 +1991,14 @@ static int proc_self_readlink(struct den
int buflen)
{
- char tmp[30];
+ char tmp[PROC_NUMBUF];
- sprintf(tmp, "%d", current->tgid);
+ sprintf(tmp, "%d", vx_map_tgid(current->tgid));
return vfs_readlink(dentry,buffer,buflen,tmp);
@@ -6364,14 +6403,14 @@
static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
{
- char tmp[30];
+ char tmp[PROC_NUMBUF];
- sprintf(tmp, "%d", current->tgid);
+ sprintf(tmp, "%d", vx_map_tgid(current->tgid));
return ERR_PTR(vfs_follow_link(nd,tmp));
}
-@@ -2033,6 +2085,20 @@ void proc_pid_flush(struct dentry *proc_
- }
+@@ -2021,6 +2074,20 @@ out:
+ return;
}
+#define VXF_FAKE_INIT (VXF_INFO_INIT|VXF_STATE_INIT)
@@ -6391,121 +6430,51 @@
/* SMP-safe */
struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
{
-@@ -2069,13 +2135,14 @@ struct dentry *proc_pid_lookup(struct in
- if (!task)
- goto out;
-
-- inode = proc_pid_make_inode(dir->i_sb, task, PROC_TGID_INO);
-+ /* check for context visibility */
-+ if (!proc_pid_visible(task, tgid))
-+ goto out_drop_task;
-
-+ inode = proc_pid_make_inode(dir->i_sb, task, PROC_TGID_INO);
-+ if (!inode)
-+ goto out_drop_task;
-
-- if (!inode) {
-- put_task_struct(task);
-- goto out;
-- }
+@@ -2060,7 +2127,7 @@ struct dentry *proc_pid_lookup(struct in
+ inode = proc_pid_make_inode(dir->i_sb, task, PROC_TGID_INO);
+ if (!inode)
+ goto out_put_task;
+-
++
inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
inode->i_op = &proc_tgid_base_inode_operations;
inode->i_fop = &proc_tgid_base_operations;
-@@ -2104,6 +2171,8 @@ struct dentry *proc_pid_lookup(struct in
- goto out;
- }
- return NULL;
-+out_drop_task:
-+ put_task_struct(task);
- out:
- return ERR_PTR(-ENOENT);
- }
-@@ -2119,6 +2188,8 @@ static struct dentry *proc_task_lookup(s
+@@ -2099,6 +2166,8 @@ static struct dentry *proc_task_lookup(s
tid = name_to_int(dentry);
if (tid == ~0U)
goto out;
+ if (vx_current_initpid(tid))
+ goto out;
- read_lock(&tasklist_lock);
+ rcu_read_lock();
task = find_task_by_pid(tid);
-@@ -2130,11 +2201,14 @@ static struct dentry *proc_task_lookup(s
- if (leader->tgid != task->tgid)
- goto out_drop_task;
-
-- inode = proc_pid_make_inode(dir->i_sb, task, PROC_TID_INO);
--
-+ /* check for context visibility */
-+ if (!proc_pid_visible(task, tid))
-+ goto out_drop_task;
-
-+ inode = proc_pid_make_inode(dir->i_sb, task, PROC_TID_INO);
- if (!inode)
- goto out_drop_task;
-+
- inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
- inode->i_op = &proc_tid_base_inode_operations;
- inode->i_fop = &proc_tid_base_operations;
-@@ -2174,7 +2248,7 @@ static int get_tgid_list(int index, unsi
- read_lock(&tasklist_lock);
- p = NULL;
- if (version) {
-- p = find_task_by_pid(version);
-+ p = find_task_by_real_pid(version);
- if (p && !thread_group_leader(p))
- p = NULL;
- }
-@@ -2186,11 +2260,15 @@ static int get_tgid_list(int index, unsi
-
- for ( ; p != &init_task; p = next_task(p)) {
- int tgid = p->pid;
-+
- if (!pid_alive(p))
- continue;
-+ /* check for context visibility */
-+ if (!proc_pid_visible(p, tgid))
+@@ -2234,7 +2303,10 @@ int proc_pid_readdir(struct file * filp,
+ task = next_tgid(task), filp->f_pos++) {
+ int len;
+ ino_t ino;
+- tgid = task->pid;
++ tgid = vx_map_tgid(task->pid);
++ if (!proc_pid_visible(task, tgid))
+ continue;
- if (--index >= 0)
- continue;
-- tgids[nr_tgids] = tgid;
-+ tgids[nr_tgids] = vx_map_tgid(tgid);
- nr_tgids++;
- if (nr_tgids >= PROC_MAXPIDS)
- break;
-@@ -2220,10 +2298,13 @@ static int get_tid_list(int index, unsig
- if (pid_alive(task)) do {
- int tid = task->pid;
-
-+ /* check for context visibility */
++
+ len = snprintf(buf, sizeof(buf), "%d", tgid);
+ ino = fake_ino(tgid, PROC_TGID_INO);
+ if (filldir(dirent, buf, len, filp->f_pos, ino, DT_DIR) < 0) {
+@@ -2358,7 +2430,10 @@ static int proc_task_readdir(struct file
+ task;
+ task = next_tid(task), pos++) {
+ int len;
+- tid = task->pid;
++ tid = vx_map_pid(task->pid);
+ if (!proc_pid_visible(task, tid))
+ continue;
- if (--index >= 0)
- continue;
- if (tids != NULL)
-- tids[nr_tids] = tid;
-+ tids[nr_tids] = vx_map_pid(tid);
- nr_tids++;
- if (nr_tids >= PROC_MAXPIDS)
- break;
-@@ -2299,11 +2380,14 @@ static int proc_task_readdir(struct file
- unsigned int nr_tids, i;
- struct dentry *dentry = filp->f_dentry;
- struct inode *inode = dentry->d_inode;
-+ struct task_struct *task = proc_task(inode);
- int retval = -ENOENT;
- ino_t ino;
- unsigned long pos = filp->f_pos; /* avoiding "long long" filp->f_pos */
-
-- if (!pid_alive(proc_task(inode)))
-+ if (!vx_check(vx_task_xid(task), VX_WATCH|VX_IDENT))
-+ goto out;
-+ if (!pid_alive(task))
- goto out;
- retval = 0;
-
-diff -NurpP --minimal linux-2.6.17.11/fs/proc/generic.c linux-2.6.17.11-vs2.0.2/fs/proc/generic.c
---- linux-2.6.17.11/fs/proc/generic.c 2006-06-18 04:54:45 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/proc/generic.c 2006-08-17 00:28:21 +0200
++
+ len = snprintf(buf, sizeof(buf), "%d", tid);
+ ino = fake_ino(tid, PROC_TID_INO);
+ if (filldir(dirent, buf, len, pos, ino, DT_DIR < 0)) {
+diff -NurpP --minimal linux-2.6.18/fs/proc/generic.c linux-2.6.18-vs2.0.2.1-t6/fs/proc/generic.c
+--- linux-2.6.18/fs/proc/generic.c 2006-06-18 04:54:45 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/proc/generic.c 2006-09-20 17:01:44 +0200
@@ -20,6 +20,7 @@
#include <linux/namei.h>
#include <linux/bitops.h>
@@ -6565,10 +6534,10 @@
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-2.6.17.11/fs/proc/inode.c linux-2.6.17.11-vs2.0.2/fs/proc/inode.c
---- linux-2.6.17.11/fs/proc/inode.c 2006-06-18 04:54:46 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/proc/inode.c 2006-08-17 00:28:21 +0200
-@@ -171,6 +171,8 @@ struct inode *proc_get_inode(struct supe
+diff -NurpP --minimal linux-2.6.18/fs/proc/inode.c linux-2.6.18-vs2.0.2.1-t6/fs/proc/inode.c
+--- linux-2.6.18/fs/proc/inode.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/proc/inode.c 2006-09-20 17:01:44 +0200
+@@ -168,6 +168,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
}
@@ -6577,10 +6546,10 @@
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-2.6.17.11/fs/proc/proc_misc.c linux-2.6.17.11-vs2.0.2/fs/proc/proc_misc.c
---- linux-2.6.17.11/fs/proc/proc_misc.c 2006-06-18 04:54:47 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/proc/proc_misc.c 2006-08-17 00:28:21 +0200
-@@ -53,6 +53,8 @@
+diff -NurpP --minimal linux-2.6.18/fs/proc/proc_misc.c linux-2.6.18-vs2.0.2.1-t6/fs/proc/proc_misc.c
+--- linux-2.6.18/fs/proc/proc_misc.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/proc/proc_misc.c 2006-09-20 18:36:46 +0200
+@@ -52,6 +52,8 @@
#include <asm/div64.h>
#include "internal.h"
@@ -6589,7 +6558,7 @@
#define LOAD_INT(x) ((x) >> FSHIFT)
#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
/*
-@@ -82,17 +84,32 @@ static int proc_calc_metrics(char *page,
+@@ -81,17 +83,32 @@ static int proc_calc_metrics(char *page,
static int loadavg_read_proc(char *page, char **start, off_t off,
int count, int *eof, void *data)
{
@@ -6627,7 +6596,7 @@
return proc_calc_metrics(page, start, off, count, eof, len);
}
-@@ -106,6 +123,9 @@ static int uptime_read_proc(char *page,
+@@ -105,6 +122,9 @@ static int uptime_read_proc(char *page,
do_posix_clock_monotonic_gettime(&uptime);
cputime_to_timespec(idletime, &idle);
@@ -6637,16 +6606,16 @@
len = sprintf(page,"%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-@@ -143,7 +163,7 @@ static int meminfo_read_proc(char *page,
- * sysctl_overcommit_ratio / 100) + total_swap_pages;
+@@ -141,7 +161,7 @@ static int meminfo_read_proc(char *page,
- cached = get_page_cache_size() - total_swapcache_pages - i.bufferram;
+ cached = global_page_state(NR_FILE_PAGES) -
+ total_swapcache_pages - i.bufferram;
- if (cached < 0)
+ if (cached < 0 || vx_flags(VXF_VIRT_MEM, 0))
cached = 0;
get_vmalloc_info(&vmi);
-@@ -238,8 +258,9 @@ static int version_read_proc(char *page,
+@@ -242,8 +262,9 @@ static int version_read_proc(char *page,
{
int len;
@@ -6658,10 +6627,10 @@
return proc_calc_metrics(page, start, off, count, eof, len);
}
-diff -NurpP --minimal linux-2.6.17.11/fs/proc/root.c linux-2.6.17.11-vs2.0.2/fs/proc/root.c
---- linux-2.6.17.11/fs/proc/root.c 2006-04-09 13:49:54 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/proc/root.c 2006-08-17 00:28:21 +0200
-@@ -25,6 +25,9 @@ struct proc_dir_entry *proc_net, *proc_n
+diff -NurpP --minimal linux-2.6.18/fs/proc/root.c linux-2.6.18-vs2.0.2.1-t6/fs/proc/root.c
+--- linux-2.6.18/fs/proc/root.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/proc/root.c 2006-09-20 17:01:44 +0200
+@@ -24,6 +24,9 @@ struct proc_dir_entry *proc_net, *proc_n
#ifdef CONFIG_SYSCTL
struct proc_dir_entry *proc_sys_root;
#endif
@@ -6669,9 +6638,9 @@
+
+extern void proc_vx_init(void);
- static struct super_block *proc_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data)
-@@ -78,6 +81,7 @@ void __init proc_root_init(void)
+ static int proc_get_sb(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data, struct vfsmount *mnt)
+@@ -77,6 +80,7 @@ void __init proc_root_init(void)
proc_device_tree_init();
#endif
proc_bus = proc_mkdir("bus", NULL);
@@ -6679,9 +6648,9 @@
}
static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
-diff -NurpP --minimal linux-2.6.17.11/fs/quota.c linux-2.6.17.11-vs2.0.2/fs/quota.c
---- linux-2.6.17.11/fs/quota.c 2006-06-18 04:54:47 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/quota.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/quota.c linux-2.6.18-vs2.0.2.1-t6/fs/quota.c
+--- linux-2.6.18/fs/quota.c 2006-06-18 04:54:47 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/quota.c 2006-09-20 17:01:44 +0200
@@ -17,6 +17,9 @@
#include <linux/buffer_head.h>
#include <linux/capability.h>
@@ -6787,10 +6756,10 @@
sb = get_super(bdev);
bdput(bdev);
if (!sb)
-diff -NurpP --minimal linux-2.6.17.11/fs/reiserfs/bitmap.c linux-2.6.17.11-vs2.0.2/fs/reiserfs/bitmap.c
---- linux-2.6.17.11/fs/reiserfs/bitmap.c 2005-08-29 22:25:33 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/reiserfs/bitmap.c 2006-08-17 00:28:21 +0200
-@@ -13,6 +13,7 @@
+diff -NurpP --minimal linux-2.6.18/fs/reiserfs/bitmap.c linux-2.6.18-vs2.0.2.1-t6/fs/reiserfs/bitmap.c
+--- linux-2.6.18/fs/reiserfs/bitmap.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/reiserfs/bitmap.c 2006-09-20 17:01:44 +0200
+@@ -12,6 +12,7 @@
#include <linux/reiserfs_fs_sb.h>
#include <linux/reiserfs_fs_i.h>
#include <linux/quotaops.h>
@@ -6798,7 +6767,7 @@
#define PREALLOCATION_SIZE 9
-@@ -411,8 +412,10 @@ static void _reiserfs_free_block(struct
+@@ -410,8 +411,10 @@ static void _reiserfs_free_block(struct
set_sb_free_blocks(rs, sb_free_blocks(rs) + 1);
journal_mark_dirty(th, s, sbh);
@@ -6810,7 +6779,7 @@
}
void reiserfs_free_block(struct reiserfs_transaction_handle *th,
-@@ -1021,6 +1024,7 @@ static inline int blocknrs_and_prealloc_
+@@ -1020,6 +1023,7 @@ static inline int blocknrs_and_prealloc_
int passno = 0;
int nr_allocated = 0;
int bigalloc = 0;
@@ -6818,7 +6787,7 @@
determine_prealloc_size(hint);
if (!hint->formatted_node) {
-@@ -1030,19 +1034,30 @@ static inline int blocknrs_and_prealloc_
+@@ -1029,19 +1033,30 @@ static inline int blocknrs_and_prealloc_
"reiserquota: allocating %d blocks id=%u",
amount_needed, hint->inode->i_uid);
#endif
@@ -6855,7 +6824,7 @@
if (quota_ret)
hint->preallocate = hint->prealloc_size = 0;
}
-@@ -1093,7 +1108,10 @@ static inline int blocknrs_and_prealloc_
+@@ -1092,7 +1107,10 @@ static inline int blocknrs_and_prealloc_
nr_allocated,
hint->inode->i_uid);
#endif
@@ -6867,7 +6836,7 @@
}
while (nr_allocated--)
reiserfs_free_block(hint->th, hint->inode,
-@@ -1125,10 +1143,10 @@ static inline int blocknrs_and_prealloc_
+@@ -1124,10 +1142,10 @@ static inline int blocknrs_and_prealloc_
REISERFS_I(hint->inode)->i_prealloc_count,
hint->inode->i_uid);
#endif
@@ -6882,19 +6851,19 @@
}
return CARRY_ON;
-diff -NurpP --minimal linux-2.6.17.11/fs/reiserfs/file.c linux-2.6.17.11-vs2.0.2/fs/reiserfs/file.c
---- linux-2.6.17.11/fs/reiserfs/file.c 2006-06-18 04:54:47 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/reiserfs/file.c 2006-08-17 00:28:21 +0200
-@@ -1588,4 +1588,5 @@ struct inode_operations reiserfs_file_in
+diff -NurpP --minimal linux-2.6.18/fs/reiserfs/file.c linux-2.6.18-vs2.0.2.1-t6/fs/reiserfs/file.c
+--- linux-2.6.18/fs/reiserfs/file.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/reiserfs/file.c 2006-09-20 17:01:44 +0200
+@@ -1586,4 +1586,5 @@ struct inode_operations reiserfs_file_in
.listxattr = reiserfs_listxattr,
.removexattr = reiserfs_removexattr,
.permission = reiserfs_permission,
+ .sync_flags = reiserfs_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.11/fs/reiserfs/inode.c linux-2.6.17.11-vs2.0.2/fs/reiserfs/inode.c
---- linux-2.6.17.11/fs/reiserfs/inode.c 2006-06-18 04:54:47 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/reiserfs/inode.c 2006-08-17 00:28:21 +0200
-@@ -17,6 +17,8 @@
+diff -NurpP --minimal linux-2.6.18/fs/reiserfs/inode.c linux-2.6.18-vs2.0.2.1-t6/fs/reiserfs/inode.c
+--- linux-2.6.18/fs/reiserfs/inode.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/reiserfs/inode.c 2006-09-20 17:01:44 +0200
+@@ -16,6 +16,8 @@
#include <linux/mpage.h>
#include <linux/writeback.h>
#include <linux/quotaops.h>
@@ -6903,15 +6872,15 @@
extern int reiserfs_default_io_size; /* default io size devuned in super.c */
-@@ -57,6 +59,7 @@ void reiserfs_delete_inode(struct inode
+@@ -52,6 +54,7 @@ void reiserfs_delete_inode(struct inode
* stat data deletion */
if (!err)
DQUOT_FREE_INODE(inode);
+ DLIMIT_FREE_INODE(inode);
- if (journal_end(&th, inode->i_sb, jbegin_count)) {
- mutex_unlock(&inode->i_mutex);
-@@ -1125,6 +1128,8 @@ static void init_inode(struct inode *ino
+ if (journal_end(&th, inode->i_sb, jbegin_count))
+ goto out;
+@@ -1116,6 +1119,8 @@ static void init_inode(struct inode *ino
struct buffer_head *bh;
struct item_head *ih;
__u32 rdev;
@@ -6920,7 +6889,7 @@
//int version = ITEM_VERSION_1;
bh = PATH_PLAST_BUFFER(path);
-@@ -1148,12 +1153,13 @@ static void init_inode(struct inode *ino
+@@ -1139,12 +1144,13 @@ static void init_inode(struct inode *ino
(struct stat_data_v1 *)B_I_PITEM(bh, ih);
unsigned long blocks;
@@ -6936,7 +6905,7 @@
inode->i_size = sd_v1_size(sd);
inode->i_atime.tv_sec = sd_v1_atime(sd);
inode->i_mtime.tv_sec = sd_v1_mtime(sd);
-@@ -1195,11 +1201,12 @@ static void init_inode(struct inode *ino
+@@ -1186,11 +1192,12 @@ static void init_inode(struct inode *ino
// (directories and symlinks)
struct stat_data *sd = (struct stat_data *)B_I_PITEM(bh, ih);
@@ -6951,7 +6920,7 @@
inode->i_mtime.tv_sec = sd_v2_mtime(sd);
inode->i_atime.tv_sec = sd_v2_atime(sd);
inode->i_ctime.tv_sec = sd_v2_ctime(sd);
-@@ -1229,6 +1236,10 @@ static void init_inode(struct inode *ino
+@@ -1220,6 +1227,10 @@ static void init_inode(struct inode *ino
sd_attrs_to_i_attrs(sd_v2_attrs(sd), inode);
}
@@ -6962,7 +6931,7 @@
pathrelse(path);
if (S_ISREG(inode->i_mode)) {
inode->i_op = &reiserfs_file_inode_operations;
-@@ -1251,13 +1262,15 @@ static void init_inode(struct inode *ino
+@@ -1242,13 +1253,15 @@ static void init_inode(struct inode *ino
static void inode2sd(void *sd, struct inode *inode, loff_t size)
{
struct stat_data *sd_v2 = (struct stat_data *)sd;
@@ -6980,7 +6949,7 @@
set_sd_v2_mtime(sd_v2, inode->i_mtime.tv_sec);
set_sd_v2_atime(sd_v2, inode->i_atime.tv_sec);
set_sd_v2_ctime(sd_v2, inode->i_ctime.tv_sec);
-@@ -1788,6 +1801,10 @@ int reiserfs_new_inode(struct reiserfs_t
+@@ -1779,6 +1792,10 @@ int reiserfs_new_inode(struct reiserfs_t
BUG_ON(!th->t_trans_id);
@@ -6991,7 +6960,7 @@
if (DQUOT_ALLOC_INODE(inode)) {
err = -EDQUOT;
goto out_end_trans;
-@@ -1973,6 +1990,9 @@ int reiserfs_new_inode(struct reiserfs_t
+@@ -1964,6 +1981,9 @@ int reiserfs_new_inode(struct reiserfs_t
DQUOT_FREE_INODE(inode);
out_end_trans:
@@ -7001,7 +6970,7 @@
journal_end(th, th->t_super, th->t_blocks_allocated);
/* Drop can be outside and it needs more credits so it's better to have it outside */
DQUOT_DROP(inode);
-@@ -2700,6 +2720,14 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs,
+@@ -2701,6 +2721,14 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs,
inode->i_flags |= S_IMMUTABLE;
else
inode->i_flags &= ~S_IMMUTABLE;
@@ -7016,7 +6985,7 @@
if (sd_attrs & REISERFS_APPEND_FL)
inode->i_flags |= S_APPEND;
else
-@@ -2722,6 +2750,14 @@ void i_attrs_to_sd_attrs(struct inode *i
+@@ -2723,6 +2751,14 @@ void i_attrs_to_sd_attrs(struct inode *i
*sd_attrs |= REISERFS_IMMUTABLE_FL;
else
*sd_attrs &= ~REISERFS_IMMUTABLE_FL;
@@ -7031,7 +7000,7 @@
if (inode->i_flags & S_SYNC)
*sd_attrs |= REISERFS_SYNC_FL;
else
-@@ -2901,6 +2937,22 @@ static ssize_t reiserfs_direct_IO(int rw
+@@ -2902,6 +2938,22 @@ static ssize_t reiserfs_direct_IO(int rw
reiserfs_get_blocks_direct_io, NULL);
}
@@ -7054,7 +7023,7 @@
int reiserfs_setattr(struct dentry *dentry, struct iattr *attr)
{
struct inode *inode = dentry->d_inode;
-@@ -2945,9 +2997,11 @@ int reiserfs_setattr(struct dentry *dent
+@@ -2951,9 +3003,11 @@ int reiserfs_setattr(struct dentry *dent
}
error = inode_change_ok(inode, attr);
@@ -7067,7 +7036,7 @@
error = reiserfs_chown_xattrs(inode, attr);
if (!error) {
-@@ -2977,6 +3031,9 @@ int reiserfs_setattr(struct dentry *dent
+@@ -2983,6 +3037,9 @@ int reiserfs_setattr(struct dentry *dent
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
@@ -7077,9 +7046,9 @@
mark_inode_dirty(inode);
error =
journal_end(&th, inode->i_sb, jbegin_count);
-diff -NurpP --minimal linux-2.6.17.11/fs/reiserfs/ioctl.c linux-2.6.17.11-vs2.0.2/fs/reiserfs/ioctl.c
---- linux-2.6.17.11/fs/reiserfs/ioctl.c 2006-04-09 13:49:55 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/reiserfs/ioctl.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/reiserfs/ioctl.c linux-2.6.18-vs2.0.2.1-t6/fs/reiserfs/ioctl.c
+--- linux-2.6.18/fs/reiserfs/ioctl.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/reiserfs/ioctl.c 2006-09-20 17:01:44 +0200
@@ -4,6 +4,7 @@
#include <linux/capability.h>
@@ -7150,10 +7119,10 @@
return -EROFS;
if (get_user(inode->i_generation, (int __user *)arg))
return -EFAULT;
-diff -NurpP --minimal linux-2.6.17.11/fs/reiserfs/namei.c linux-2.6.17.11-vs2.0.2/fs/reiserfs/namei.c
---- linux-2.6.17.11/fs/reiserfs/namei.c 2006-04-09 13:49:55 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/reiserfs/namei.c 2006-08-17 00:28:21 +0200
-@@ -19,6 +19,7 @@
+diff -NurpP --minimal linux-2.6.18/fs/reiserfs/namei.c linux-2.6.18-vs2.0.2.1-t6/fs/reiserfs/namei.c
+--- linux-2.6.18/fs/reiserfs/namei.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/reiserfs/namei.c 2006-09-20 17:01:44 +0200
+@@ -18,6 +18,7 @@
#include <linux/reiserfs_xattr.h>
#include <linux/smp_lock.h>
#include <linux/quotaops.h>
@@ -7161,7 +7130,7 @@
#define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { i->i_nlink++; if (i->i_nlink >= REISERFS_LINK_MAX) i->i_nlink=1; }
#define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) i->i_nlink--;
-@@ -365,6 +366,7 @@ static struct dentry *reiserfs_lookup(st
+@@ -364,6 +365,7 @@ static struct dentry *reiserfs_lookup(st
reiserfs_write_unlock(dir->i_sb);
return ERR_PTR(-EACCES);
}
@@ -7169,7 +7138,7 @@
/* Propogate the priv_object flag so we know we're in the priv tree */
if (is_reiserfs_priv_object(dir))
-@@ -600,6 +602,7 @@ static int new_inode_init(struct inode *
+@@ -599,6 +601,7 @@ static int new_inode_init(struct inode *
} else {
inode->i_gid = current->fsgid;
}
@@ -7177,7 +7146,7 @@
DQUOT_INIT(inode);
return 0;
}
-@@ -1546,6 +1549,7 @@ struct inode_operations reiserfs_dir_ino
+@@ -1545,6 +1548,7 @@ struct inode_operations reiserfs_dir_ino
.listxattr = reiserfs_listxattr,
.removexattr = reiserfs_removexattr,
.permission = reiserfs_permission,
@@ -7185,7 +7154,7 @@
};
/*
-@@ -1562,6 +1566,7 @@ struct inode_operations reiserfs_symlink
+@@ -1561,6 +1565,7 @@ struct inode_operations reiserfs_symlink
.listxattr = reiserfs_listxattr,
.removexattr = reiserfs_removexattr,
.permission = reiserfs_permission,
@@ -7193,17 +7162,17 @@
};
-@@ -1575,5 +1580,6 @@ struct inode_operations reiserfs_special
+@@ -1574,5 +1579,6 @@ struct inode_operations reiserfs_special
.listxattr = reiserfs_listxattr,
.removexattr = reiserfs_removexattr,
.permission = reiserfs_permission,
+ .sync_flags = reiserfs_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.11/fs/reiserfs/stree.c linux-2.6.17.11-vs2.0.2/fs/reiserfs/stree.c
---- linux-2.6.17.11/fs/reiserfs/stree.c 2006-06-18 04:54:48 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/reiserfs/stree.c 2006-08-17 00:28:21 +0200
-@@ -57,6 +57,7 @@
+diff -NurpP --minimal linux-2.6.18/fs/reiserfs/stree.c linux-2.6.18-vs2.0.2.1-t6/fs/reiserfs/stree.c
+--- linux-2.6.18/fs/reiserfs/stree.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/reiserfs/stree.c 2006-09-20 17:01:44 +0200
+@@ -56,6 +56,7 @@
#include <linux/smp_lock.h>
#include <linux/buffer_head.h>
#include <linux/quotaops.h>
@@ -7211,7 +7180,7 @@
/* Does the buffer contain a disk block which is in the tree. */
inline int B_IS_IN_TREE(const struct buffer_head *p_s_bh)
-@@ -1298,6 +1299,7 @@ int reiserfs_delete_item(struct reiserfs
+@@ -1297,6 +1298,7 @@ int reiserfs_delete_item(struct reiserfs
"reiserquota delete_item(): freeing %u, id=%u type=%c",
quota_cut_bytes, p_s_inode->i_uid, head2type(&s_ih));
#endif
@@ -7219,7 +7188,7 @@
DQUOT_FREE_SPACE_NODIRTY(p_s_inode, quota_cut_bytes);
/* Return deleted body length */
-@@ -1384,6 +1386,7 @@ void reiserfs_delete_solid_item(struct r
+@@ -1383,6 +1385,7 @@ void reiserfs_delete_solid_item(struct r
quota_cut_bytes, inode->i_uid,
key2type(key));
#endif
@@ -7227,7 +7196,7 @@
DQUOT_FREE_SPACE_NODIRTY(inode,
quota_cut_bytes);
}
-@@ -1741,6 +1744,7 @@ int reiserfs_cut_from_item(struct reiser
+@@ -1740,6 +1743,7 @@ int reiserfs_cut_from_item(struct reiser
"reiserquota cut_from_item(): freeing %u id=%u type=%c",
quota_cut_bytes, p_s_inode->i_uid, '?');
#endif
@@ -7235,7 +7204,7 @@
DQUOT_FREE_SPACE_NODIRTY(p_s_inode, quota_cut_bytes);
return n_ret_value;
}
-@@ -1982,6 +1986,11 @@ int reiserfs_paste_into_item(struct reis
+@@ -1981,6 +1985,11 @@ int reiserfs_paste_into_item(struct reis
pathrelse(p_s_search_path);
return -EDQUOT;
}
@@ -7247,7 +7216,7 @@
init_tb_struct(th, &s_paste_balance, th->t_super, p_s_search_path,
n_pasted_size);
#ifdef DISPLACE_NEW_PACKING_LOCALITIES
-@@ -2034,6 +2043,7 @@ int reiserfs_paste_into_item(struct reis
+@@ -2033,6 +2042,7 @@ int reiserfs_paste_into_item(struct reis
n_pasted_size, inode->i_uid,
key2type(&(p_s_key->on_disk_key)));
#endif
@@ -7255,7 +7224,7 @@
DQUOT_FREE_SPACE_NODIRTY(inode, n_pasted_size);
return retval;
}
-@@ -2071,6 +2081,11 @@ int reiserfs_insert_item(struct reiserfs
+@@ -2070,6 +2080,11 @@ int reiserfs_insert_item(struct reiserfs
pathrelse(p_s_path);
return -EDQUOT;
}
@@ -7267,7 +7236,7 @@
}
init_tb_struct(th, &s_ins_balance, th->t_super, p_s_path,
IH_SIZE + ih_item_len(p_s_ih));
-@@ -2118,7 +2133,9 @@ int reiserfs_insert_item(struct reiserfs
+@@ -2117,7 +2132,9 @@ int reiserfs_insert_item(struct reiserfs
"reiserquota insert_item(): freeing %u id=%u type=%c",
quota_bytes, inode->i_uid, head2type(p_s_ih));
#endif
@@ -7278,10 +7247,10 @@
+ }
return retval;
}
-diff -NurpP --minimal linux-2.6.17.11/fs/reiserfs/super.c linux-2.6.17.11-vs2.0.2/fs/reiserfs/super.c
---- linux-2.6.17.11/fs/reiserfs/super.c 2006-06-18 04:54:48 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/reiserfs/super.c 2006-08-17 00:28:21 +0200
-@@ -883,6 +883,9 @@ static int reiserfs_parse_options(struct
+diff -NurpP --minimal linux-2.6.18/fs/reiserfs/super.c linux-2.6.18-vs2.0.2.1-t6/fs/reiserfs/super.c
+--- linux-2.6.18/fs/reiserfs/super.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/reiserfs/super.c 2006-09-20 17:01:44 +0200
+@@ -882,6 +882,9 @@ static int reiserfs_parse_options(struct
{"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
{"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
#endif
@@ -7291,7 +7260,7 @@
#ifdef CONFIG_REISERFS_FS_POSIX_ACL
{"acl",.setmask = 1 << REISERFS_POSIXACL},
{"noacl",.clrmask = 1 << REISERFS_POSIXACL},
-@@ -1155,6 +1158,12 @@ static int reiserfs_remount(struct super
+@@ -1154,6 +1157,12 @@ static int reiserfs_remount(struct super
return -EINVAL;
}
@@ -7304,7 +7273,7 @@
handle_attrs(s);
/* Add options that are safe here */
-@@ -1730,6 +1739,10 @@ static int reiserfs_fill_super(struct su
+@@ -1729,6 +1738,10 @@ static int reiserfs_fill_super(struct su
goto error;
}
@@ -7315,9 +7284,9 @@
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.17.11/fs/reiserfs/xattr.c linux-2.6.17.11-vs2.0.2/fs/reiserfs/xattr.c
---- linux-2.6.17.11/fs/reiserfs/xattr.c 2006-02-18 14:40:26 +0100
-+++ linux-2.6.17.11-vs2.0.2/fs/reiserfs/xattr.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/reiserfs/xattr.c linux-2.6.18-vs2.0.2.1-t6/fs/reiserfs/xattr.c
+--- linux-2.6.18/fs/reiserfs/xattr.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/reiserfs/xattr.c 2006-09-20 17:01:44 +0200
@@ -35,6 +35,7 @@
#include <linux/namei.h>
#include <linux/errno.h>
@@ -7326,7 +7295,7 @@
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/xattr.h>
-@@ -824,7 +825,7 @@ int reiserfs_delete_xattrs(struct inode
+@@ -823,7 +824,7 @@ int reiserfs_delete_xattrs(struct inode
if (dir->d_inode->i_nlink <= 2) {
root = get_xa_root(inode->i_sb);
reiserfs_write_lock_xattrs(inode->i_sb);
@@ -7335,10 +7304,10 @@
reiserfs_write_unlock_xattrs(inode->i_sb);
dput(root);
} else {
-diff -NurpP --minimal linux-2.6.17.11/fs/stat.c linux-2.6.17.11-vs2.0.2/fs/stat.c
---- linux-2.6.17.11/fs/stat.c 2006-06-18 04:54:48 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/stat.c 2006-08-17 00:28:21 +0200
-@@ -27,6 +27,7 @@ void generic_fillattr(struct inode *inod
+diff -NurpP --minimal linux-2.6.18/fs/stat.c linux-2.6.18-vs2.0.2.1-t6/fs/stat.c
+--- linux-2.6.18/fs/stat.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/stat.c 2006-09-20 17:01:44 +0200
+@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
stat->gid = inode->i_gid;
@@ -7346,10 +7315,10 @@
stat->rdev = inode->i_rdev;
stat->atime = inode->i_atime;
stat->mtime = inode->i_mtime;
-diff -NurpP --minimal linux-2.6.17.11/fs/super.c linux-2.6.17.11-vs2.0.2/fs/super.c
---- linux-2.6.17.11/fs/super.c 2006-06-18 04:54:48 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/super.c 2006-08-17 00:28:21 +0200
-@@ -38,6 +38,8 @@
+diff -NurpP --minimal linux-2.6.18/fs/super.c linux-2.6.18-vs2.0.2.1-t6/fs/super.c
+--- linux-2.6.18/fs/super.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/super.c 2006-09-20 17:59:47 +0200
+@@ -37,6 +37,8 @@
#include <linux/idr.h>
#include <linux/kobject.h>
#include <linux/mutex.h>
@@ -7358,45 +7327,51 @@
#include <asm/uaccess.h>
-@@ -803,7 +805,7 @@ struct vfsmount *
- do_kern_mount(const char *fstype, int flags, const char *name, void *data)
+@@ -818,6 +820,7 @@ struct vfsmount *
+ vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void *data)
{
- struct file_system_type *type = get_fs_type(fstype);
-- struct super_block *sb = ERR_PTR(-ENOMEM);
-+ struct super_block *sb;
struct vfsmount *mnt;
- int error;
++ struct super_block *sb;
char *secdata = NULL;
-@@ -811,6 +813,12 @@ do_kern_mount(const char *fstype, int fl
- if (!type)
- return ERR_PTR(-ENODEV);
+ int error;
-+ sb = ERR_PTR(-EPERM);
-+ if ((type->fs_flags & FS_BINARY_MOUNTDATA) &&
-+ !vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT))
-+ goto out;
-+
-+ sb = ERR_PTR(-ENOMEM);
- mnt = alloc_vfsmnt(name);
- if (!mnt)
- goto out;
-@@ -832,6 +840,13 @@ do_kern_mount(const char *fstype, int fl
- sb = type->get_sb(type, flags, name, data);
- if (IS_ERR(sb))
+@@ -843,7 +846,14 @@ vfs_kern_mount(struct file_system_type *
+ if (error < 0)
goto out_free_secdata;
-+
+
+- error = security_sb_kern_mount(mnt->mnt_sb, secdata);
++ sb = mnt->mnt_sb;
+ error = -EPERM;
+ if (!capable(CAP_SYS_ADMIN) && !sb->s_bdev &&
+ (sb->s_magic != PROC_SUPER_MAGIC) &&
+ (sb->s_magic != DEVPTS_SUPER_MAGIC))
+ goto out_sb;
+
- error = security_sb_kern_mount(sb, secdata);
++ error = security_sb_kern_mount(sb, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-2.6.17.11/fs/sysfs/mount.c linux-2.6.17.11-vs2.0.2/fs/sysfs/mount.c
---- linux-2.6.17.11/fs/sysfs/mount.c 2005-08-29 22:25:33 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/sysfs/mount.c 2006-08-17 00:28:21 +0200
+
+@@ -871,9 +881,17 @@ do_kern_mount(const char *fstype, int fl
+ {
+ struct file_system_type *type = get_fs_type(fstype);
+ struct vfsmount *mnt;
++
+ if (!type)
+ return ERR_PTR(-ENODEV);
++
++ mnt = ERR_PTR(-EPERM);
++ if ((type->fs_flags & FS_BINARY_MOUNTDATA) &&
++ !vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT))
++ goto out_put;
++
+ mnt = vfs_kern_mount(type, flags, name, data);
++out_put:
+ put_filesystem(type);
+ return mnt;
+ }
+diff -NurpP --minimal linux-2.6.18/fs/sysfs/mount.c linux-2.6.18-vs2.0.2.1-t6/fs/sysfs/mount.c
+--- linux-2.6.18/fs/sysfs/mount.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/sysfs/mount.c 2006-09-20 17:01:44 +0200
@@ -11,8 +11,6 @@
#include "sysfs.h"
@@ -7415,9 +7390,9 @@
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
sysfs_sb = sb;
-diff -NurpP --minimal linux-2.6.17.11/fs/xattr.c linux-2.6.17.11-vs2.0.2/fs/xattr.c
---- linux-2.6.17.11/fs/xattr.c 2006-06-18 04:54:49 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/xattr.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/xattr.c linux-2.6.18-vs2.0.2.1-t6/fs/xattr.c
+--- linux-2.6.18/fs/xattr.c 2006-09-20 16:58:37 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/xattr.c 2006-09-20 21:08:52 +0200
@@ -18,6 +18,7 @@
#include <linux/module.h>
#include <linux/fsnotify.h>
@@ -7466,7 +7441,7 @@
@@ -243,7 +247,7 @@ sys_fsetxattr(int fd, char __user *name,
return error;
dentry = f->f_dentry;
- audit_inode(NULL, dentry->d_inode, 0);
+ audit_inode(NULL, dentry->d_inode);
- error = setxattr(dentry, name, value, size, flags);
+ error = setxattr(dentry, name, value, size, flags, f->f_vfsmnt);
fput(f);
@@ -7512,16 +7487,16 @@
@@ -470,7 +477,7 @@ sys_fremovexattr(int fd, char __user *na
return error;
dentry = f->f_dentry;
- audit_inode(NULL, dentry->d_inode, 0);
+ audit_inode(NULL, dentry->d_inode);
- error = removexattr(dentry, name);
+ error = removexattr(dentry, name, f->f_vfsmnt);
fput(f);
return error;
}
-diff -NurpP --minimal linux-2.6.17.11/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.17.11-vs2.0.2/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.17.11/fs/xfs/linux-2.6/xfs_ioctl.c 2006-06-18 04:54:49 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/xfs/linux-2.6/xfs_ioctl.c 2006-08-17 00:28:21 +0200
-@@ -1100,6 +1100,8 @@ xfs_ioc_fsgeometry(
+diff -NurpP --minimal linux-2.6.18/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.18-vs2.0.2.1-t6/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.18/fs/xfs/linux-2.6/xfs_ioctl.c 2006-09-20 16:58:39 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/xfs/linux-2.6/xfs_ioctl.c 2006-09-20 17:01:44 +0200
+@@ -1095,6 +1095,8 @@ xfs_ioc_fsgeometry(
#define LINUX_XFLAG_APPEND 0x00000020 /* writes to file may only append */
#define LINUX_XFLAG_NODUMP 0x00000040 /* do not dump file */
#define LINUX_XFLAG_NOATIME 0x00000080 /* do not update atime */
@@ -7530,7 +7505,7 @@
STATIC unsigned int
xfs_merge_ioc_xflags(
-@@ -1140,6 +1142,10 @@ xfs_di2lxflags(
+@@ -1135,6 +1137,10 @@ xfs_di2lxflags(
if (di_flags & XFS_DIFLAG_IMMUTABLE)
flags |= LINUX_XFLAG_IMMUTABLE;
@@ -7541,10 +7516,10 @@
if (di_flags & XFS_DIFLAG_APPEND)
flags |= LINUX_XFLAG_APPEND;
if (di_flags & XFS_DIFLAG_SYNC)
-diff -NurpP --minimal linux-2.6.17.11/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.17.11-vs2.0.2/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.17.11/fs/xfs/linux-2.6/xfs_iops.c 2006-06-18 04:54:49 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/xfs/linux-2.6/xfs_iops.c 2006-08-17 00:28:21 +0200
-@@ -55,6 +55,7 @@
+diff -NurpP --minimal linux-2.6.18/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.18-vs2.0.2.1-t6/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.18/fs/xfs/linux-2.6/xfs_iops.c 2006-09-20 16:58:39 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/xfs/linux-2.6/xfs_iops.c 2006-09-21 16:42:52 +0200
+@@ -53,6 +53,7 @@
#include <linux/xattr.h>
#include <linux/namei.h>
#include <linux/security.h>
@@ -7552,7 +7527,7 @@
/*
* Get a XFS inode from a given vnode.
-@@ -409,6 +410,7 @@ xfs_vn_lookup(
+@@ -402,6 +403,7 @@ xfs_vn_lookup(
d_add(dentry, NULL);
return NULL;
}
@@ -7560,7 +7535,7 @@
return d_splice_alias(vn_to_inode(cvp), dentry);
}
-@@ -658,6 +660,10 @@ xfs_vn_setattr(
+@@ -644,6 +646,10 @@ xfs_vn_setattr(
int flags = 0;
int error;
@@ -7571,7 +7546,7 @@
if (ia_valid & ATTR_UID) {
vattr.va_mask |= XFS_AT_UID;
vattr.va_uid = attr->ia_uid;
-@@ -666,6 +672,10 @@ xfs_vn_setattr(
+@@ -652,6 +658,10 @@ xfs_vn_setattr(
vattr.va_mask |= XFS_AT_GID;
vattr.va_gid = attr->ia_gid;
}
@@ -7582,22 +7557,23 @@
if (ia_valid & ATTR_SIZE) {
vattr.va_mask |= XFS_AT_SIZE;
vattr.va_size = attr->ia_size;
-@@ -711,6 +721,41 @@ xfs_vn_truncate(
+@@ -697,6 +707,42 @@ xfs_vn_truncate(
}
STATIC int
+xfs_vn_sync_flags(struct inode *inode)
+{
+ unsigned int oldflags, newflags;
-+ vattr_t vattr;
+ int flags = 0;
+ int error;
-+ vnode_t *vp = vn_from_inode(inode);
++ bhv_vattr_t vattr;
++ bhv_vnode_t *vp = vn_from_inode(inode);
+
-+ memset(&vattr, 0, sizeof(vattr_t));
++ memset(&vattr, 0, sizeof vattr);
+
+ vattr.va_mask = XFS_AT_XFLAGS;
-+ VOP_GETATTR(vp, &vattr, 0, NULL, error);
++ error = bhv_vop_getattr(vp, &vattr, 0, NULL);
++
+ if (error)
+ return error;
+ oldflags = vattr.va_xflags;
@@ -7614,7 +7590,7 @@
+ if (oldflags ^ newflags) {
+ vattr.va_xflags = newflags;
+ vattr.va_mask |= XFS_AT_XFLAGS;
-+ VOP_SETATTR(vp, &vattr, flags, NULL, error);
++ error = bhv_vop_setattr(vp, &vattr, flags, NULL);
+ }
+ vn_revalidate(vp);
+ return error;
@@ -7624,7 +7600,7 @@
xfs_vn_setxattr(
struct dentry *dentry,
const char *name,
-@@ -823,6 +868,7 @@ struct inode_operations xfs_inode_operat
+@@ -809,6 +855,7 @@ struct inode_operations xfs_inode_operat
.getxattr = xfs_vn_getxattr,
.listxattr = xfs_vn_listxattr,
.removexattr = xfs_vn_removexattr,
@@ -7632,7 +7608,7 @@
};
struct inode_operations xfs_dir_inode_operations = {
-@@ -842,6 +888,7 @@ struct inode_operations xfs_dir_inode_op
+@@ -828,6 +875,7 @@ struct inode_operations xfs_dir_inode_op
.getxattr = xfs_vn_getxattr,
.listxattr = xfs_vn_listxattr,
.removexattr = xfs_vn_removexattr,
@@ -7640,27 +7616,27 @@
};
struct inode_operations xfs_symlink_inode_operations = {
-@@ -855,4 +902,5 @@ struct inode_operations xfs_symlink_inod
+@@ -841,4 +889,5 @@ struct inode_operations xfs_symlink_inod
.getxattr = xfs_vn_getxattr,
.listxattr = xfs_vn_listxattr,
.removexattr = xfs_vn_removexattr,
+ .sync_flags = xfs_vn_sync_flags,
};
-diff -NurpP --minimal linux-2.6.17.11/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.17.11-vs2.0.2/fs/xfs/linux-2.6/xfs_linux.h
---- linux-2.6.17.11/fs/xfs/linux-2.6/xfs_linux.h 2006-06-18 04:54:49 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/xfs/linux-2.6/xfs_linux.h 2006-08-17 00:28:21 +0200
-@@ -142,6 +142,7 @@ BUFFER_FNS(PrivateStart, unwritten);
+diff -NurpP --minimal linux-2.6.18/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.18-vs2.0.2.1-t6/fs/xfs/linux-2.6/xfs_linux.h
+--- linux-2.6.18/fs/xfs/linux-2.6/xfs_linux.h 2006-09-20 16:58:39 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/xfs/linux-2.6/xfs_linux.h 2006-09-20 18:35:45 +0200
+@@ -139,6 +139,7 @@ BUFFER_FNS(PrivateStart, unwritten);
#define current_pid() (current->pid)
#define current_fsuid(cred) (current->fsuid)
#define current_fsgid(cred) (current->fsgid)
+#define current_fsxid(cred,vp) (vx_current_fsxid(vn_to_inode(vp)->i_sb))
-
- #define NBPP PAGE_SIZE
- #define DPPSHFT (PAGE_SHIFT - 9)
-diff -NurpP --minimal linux-2.6.17.11/fs/xfs/linux-2.6/xfs_super.c linux-2.6.17.11-vs2.0.2/fs/xfs/linux-2.6/xfs_super.c
---- linux-2.6.17.11/fs/xfs/linux-2.6/xfs_super.c 2006-06-18 04:54:49 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/xfs/linux-2.6/xfs_super.c 2006-08-17 00:28:21 +0200
-@@ -160,6 +160,7 @@ xfs_revalidate_inode(
+ #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.18/fs/xfs/linux-2.6/xfs_super.c linux-2.6.18-vs2.0.2.1-t6/fs/xfs/linux-2.6/xfs_super.c
+--- linux-2.6.18/fs/xfs/linux-2.6/xfs_super.c 2006-09-20 16:58:39 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/xfs/linux-2.6/xfs_super.c 2006-09-20 18:34:48 +0200
+@@ -158,6 +158,7 @@ xfs_revalidate_inode(
inode->i_nlink = ip->i_d.di_nlink;
inode->i_uid = ip->i_d.di_uid;
inode->i_gid = ip->i_d.di_gid;
@@ -7668,7 +7644,7 @@
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-@@ -188,6 +189,14 @@ xfs_revalidate_inode(
+@@ -186,6 +187,14 @@ xfs_revalidate_inode(
inode->i_flags |= S_IMMUTABLE;
else
inode->i_flags &= ~S_IMMUTABLE;
@@ -7683,10 +7659,10 @@
if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
inode->i_flags |= S_APPEND;
else
-@@ -724,6 +733,12 @@ xfs_fs_remount(
+@@ -709,6 +718,12 @@ xfs_fs_remount(
int error;
- VFS_PARSEARGS(vfsp, options, args, 1, error);
+ error = bhv_vfs_parseargs(vfsp, options, args, 1);
+ if ((args->flags2 & XFSMNT2_TAGXID) &&
+ !(sb->s_flags & MS_TAGXID)) {
+ printk("XFS: %s: tagxid not permitted on remount.\n",
@@ -7694,12 +7670,12 @@
+ error = EINVAL;
+ }
if (!error)
- VFS_MNTUPDATE(vfsp, flags, args, error);
+ error = bhv_vfs_mntupdate(vfsp, flags, args);
kmem_free(args, sizeof(*args));
-diff -NurpP --minimal linux-2.6.17.11/fs/xfs/linux-2.6/xfs_sysctl.c linux-2.6.17.11-vs2.0.2/fs/xfs/linux-2.6/xfs_sysctl.c
---- linux-2.6.17.11/fs/xfs/linux-2.6/xfs_sysctl.c 2006-06-18 04:54:49 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/xfs/linux-2.6/xfs_sysctl.c 2006-08-17 00:28:21 +0200
-@@ -57,74 +57,74 @@ xfs_stats_clear_proc_handler(
+diff -NurpP --minimal linux-2.6.18/fs/xfs/linux-2.6/xfs_sysctl.c linux-2.6.18-vs2.0.2.1-t6/fs/xfs/linux-2.6/xfs_sysctl.c
+--- linux-2.6.18/fs/xfs/linux-2.6/xfs_sysctl.c 2006-09-20 16:58:39 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/xfs/linux-2.6/xfs_sysctl.c 2006-09-20 18:32:51 +0200
+@@ -57,79 +57,79 @@ xfs_stats_clear_proc_handler(
STATIC ctl_table xfs_table[] = {
{XFS_RESTRICT_CHOWN, "restrict_chown", &xfs_params.restrict_chown.val,
sizeof(int), 0644, NULL, &proc_dointvec_minmax,
@@ -7779,6 +7755,12 @@
+ NULL, &sysctl_intvec, NULL,
&xfs_params.rotorstep.min, &xfs_params.rotorstep.max},
+ {XFS_INHERIT_NODFRG, "inherit_nodefrag", &xfs_params.inherit_nodfrg.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.inherit_nodfrg.min, &xfs_params.inherit_nodfrg.max},
+
/* please keep this the last entry */
#ifdef CONFIG_PROC_FS
{XFS_STATS_CLEAR, "stats_clear", &xfs_params.stats_clear.val,
@@ -7788,10 +7770,10 @@
&xfs_params.stats_clear.min, &xfs_params.stats_clear.max},
#endif /* CONFIG_PROC_FS */
-diff -NurpP --minimal linux-2.6.17.11/fs/xfs/linux-2.6/xfs_vnode.c linux-2.6.17.11-vs2.0.2/fs/xfs/linux-2.6/xfs_vnode.c
---- linux-2.6.17.11/fs/xfs/linux-2.6/xfs_vnode.c 2006-06-18 04:54:50 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/xfs/linux-2.6/xfs_vnode.c 2006-08-17 00:28:21 +0200
-@@ -103,6 +103,7 @@ vn_revalidate_core(
+diff -NurpP --minimal linux-2.6.18/fs/xfs/linux-2.6/xfs_vnode.c linux-2.6.18-vs2.0.2.1-t6/fs/xfs/linux-2.6/xfs_vnode.c
+--- linux-2.6.18/fs/xfs/linux-2.6/xfs_vnode.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/xfs/linux-2.6/xfs_vnode.c 2006-09-20 17:01:44 +0200
+@@ -119,6 +119,7 @@ vn_revalidate_core(
inode->i_nlink = vap->va_nlink;
inode->i_uid = vap->va_uid;
inode->i_gid = vap->va_gid;
@@ -7799,7 +7781,7 @@
inode->i_blocks = vap->va_nblocks;
inode->i_mtime = vap->va_mtime;
inode->i_ctime = vap->va_ctime;
-@@ -111,6 +112,14 @@ vn_revalidate_core(
+@@ -127,6 +128,14 @@ vn_revalidate_core(
inode->i_flags |= S_IMMUTABLE;
else
inode->i_flags &= ~S_IMMUTABLE;
@@ -7814,10 +7796,10 @@
if (vap->va_xflags & XFS_XFLAG_APPEND)
inode->i_flags |= S_APPEND;
else
-diff -NurpP --minimal linux-2.6.17.11/fs/xfs/linux-2.6/xfs_vnode.h linux-2.6.17.11-vs2.0.2/fs/xfs/linux-2.6/xfs_vnode.h
---- linux-2.6.17.11/fs/xfs/linux-2.6/xfs_vnode.h 2006-06-18 04:54:50 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/xfs/linux-2.6/xfs_vnode.h 2006-08-17 00:28:21 +0200
-@@ -404,6 +404,7 @@ typedef struct vattr {
+diff -NurpP --minimal linux-2.6.18/fs/xfs/linux-2.6/xfs_vnode.h linux-2.6.18-vs2.0.2.1-t6/fs/xfs/linux-2.6/xfs_vnode.h
+--- linux-2.6.18/fs/xfs/linux-2.6/xfs_vnode.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/xfs/linux-2.6/xfs_vnode.h 2006-09-20 17:01:44 +0200
+@@ -352,6 +352,7 @@ typedef struct bhv_vattr {
xfs_nlink_t va_nlink; /* number of references to file */
uid_t va_uid; /* owner user id */
gid_t va_gid; /* owner group id */
@@ -7825,7 +7807,7 @@
xfs_ino_t va_nodeid; /* file id */
xfs_off_t va_size; /* file size in bytes */
u_long va_blocksize; /* blocksize preferred for i/o */
-@@ -452,13 +453,15 @@ typedef struct vattr {
+@@ -400,13 +401,15 @@ typedef struct bhv_vattr {
#define XFS_AT_PROJID 0x04000000
#define XFS_AT_SIZE_NOPERM 0x08000000
#define XFS_AT_GENCOUNT 0x10000000
@@ -7842,10 +7824,10 @@
#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.17.11/fs/xfs/quota/xfs_qm_syscalls.c linux-2.6.17.11-vs2.0.2/fs/xfs/quota/xfs_qm_syscalls.c
---- linux-2.6.17.11/fs/xfs/quota/xfs_qm_syscalls.c 2006-06-18 04:54:50 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/xfs/quota/xfs_qm_syscalls.c 2006-08-17 00:28:21 +0200
-@@ -215,7 +215,7 @@ xfs_qm_scall_quotaoff(
+diff -NurpP --minimal linux-2.6.18/fs/xfs/quota/xfs_qm_syscalls.c linux-2.6.18-vs2.0.2.1-t6/fs/xfs/quota/xfs_qm_syscalls.c
+--- linux-2.6.18/fs/xfs/quota/xfs_qm_syscalls.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/xfs/quota/xfs_qm_syscalls.c 2006-09-20 17:01:44 +0200
+@@ -213,7 +213,7 @@ xfs_qm_scall_quotaoff(
xfs_qoff_logitem_t *qoffstart;
int nculprits;
@@ -7854,7 +7836,7 @@
return XFS_ERROR(EPERM);
/*
* No file system can have quotas enabled on disk but not in core.
-@@ -384,7 +384,7 @@ xfs_qm_scall_trunc_qfiles(
+@@ -382,7 +382,7 @@ xfs_qm_scall_trunc_qfiles(
int error;
xfs_inode_t *qip;
@@ -7863,7 +7845,7 @@
return XFS_ERROR(EPERM);
error = 0;
if (!XFS_SB_VERSION_HASQUOTA(&mp->m_sb) || flags == 0) {
-@@ -429,7 +429,7 @@ xfs_qm_scall_quotaon(
+@@ -427,7 +427,7 @@ xfs_qm_scall_quotaon(
uint accflags;
__int64_t sbflags;
@@ -7872,7 +7854,7 @@
return XFS_ERROR(EPERM);
flags &= (XFS_ALL_QUOTA_ACCT | XFS_ALL_QUOTA_ENFD);
-@@ -600,7 +600,7 @@ xfs_qm_scall_setqlim(
+@@ -598,7 +598,7 @@ xfs_qm_scall_setqlim(
int error;
xfs_qcnt_t hard, soft;
@@ -7881,9 +7863,9 @@
return XFS_ERROR(EPERM);
if ((newlim->d_fieldmask &
-diff -NurpP --minimal linux-2.6.17.11/fs/xfs/xfs_clnt.h linux-2.6.17.11-vs2.0.2/fs/xfs/xfs_clnt.h
---- linux-2.6.17.11/fs/xfs/xfs_clnt.h 2006-06-18 04:54:50 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/xfs/xfs_clnt.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/xfs/xfs_clnt.h linux-2.6.18-vs2.0.2.1-t6/fs/xfs/xfs_clnt.h
+--- linux-2.6.18/fs/xfs/xfs_clnt.h 2006-06-18 04:54:50 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/xfs/xfs_clnt.h 2006-09-20 17:01:44 +0200
@@ -99,5 +99,7 @@ struct xfs_mount_args {
*/
#define XFSMNT2_COMPAT_IOSIZE 0x00000001 /* don't report large preferred
@@ -7892,9 +7874,9 @@
+
#endif /* __XFS_CLNT_H__ */
-diff -NurpP --minimal linux-2.6.17.11/fs/xfs/xfs_dinode.h linux-2.6.17.11-vs2.0.2/fs/xfs/xfs_dinode.h
---- linux-2.6.17.11/fs/xfs/xfs_dinode.h 2006-04-09 13:49:55 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/xfs/xfs_dinode.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/fs/xfs/xfs_dinode.h linux-2.6.18-vs2.0.2.1-t6/fs/xfs/xfs_dinode.h
+--- linux-2.6.18/fs/xfs/xfs_dinode.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/xfs/xfs_dinode.h 2006-09-20 18:30:41 +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 */
@@ -7906,19 +7888,19 @@
xfs_timestamp_t di_atime; /* time last accessed */
xfs_timestamp_t di_mtime; /* time last modified */
@@ -257,6 +258,9 @@ typedef enum xfs_dinode_fmt
- #define XFS_DIFLAG_NOSYMLINKS_BIT 10 /* disallow symlink creation */
#define XFS_DIFLAG_EXTSIZE_BIT 11 /* inode extent size allocator hint */
#define XFS_DIFLAG_EXTSZINHERIT_BIT 12 /* inherit inode extent size */
-+#define XFS_DIFLAG_BARRIER_BIT 13 /* chroot() barrier */
-+#define XFS_DIFLAG_IUNLINK_BIT 14 /* immutable unlink */
+ #define XFS_DIFLAG_NODEFRAG_BIT 13 /* do not reorganize/defragment */
++#define XFS_DIFLAG_BARRIER_BIT 14 /* chroot() barrier */
++#define XFS_DIFLAG_IUNLINK_BIT 15 /* immutable unlink */
+
#define XFS_DIFLAG_REALTIME (1 << XFS_DIFLAG_REALTIME_BIT)
#define XFS_DIFLAG_PREALLOC (1 << XFS_DIFLAG_PREALLOC_BIT)
#define XFS_DIFLAG_NEWRTBM (1 << XFS_DIFLAG_NEWRTBM_BIT)
-@@ -270,12 +274,14 @@ typedef enum xfs_dinode_fmt
- #define XFS_DIFLAG_NOSYMLINKS (1 << XFS_DIFLAG_NOSYMLINKS_BIT)
+@@ -271,12 +275,15 @@ typedef enum xfs_dinode_fmt
#define XFS_DIFLAG_EXTSIZE (1 << XFS_DIFLAG_EXTSIZE_BIT)
#define XFS_DIFLAG_EXTSZINHERIT (1 << XFS_DIFLAG_EXTSZINHERIT_BIT)
+ #define XFS_DIFLAG_NODEFRAG (1 << XFS_DIFLAG_NODEFRAG_BIT)
+#define XFS_DIFLAG_BARRIER (1 << XFS_DIFLAG_BARRIER_BIT)
+#define XFS_DIFLAG_IUNLINK (1 << XFS_DIFLAG_IUNLINK_BIT)
@@ -7927,23 +7909,24 @@
XFS_DIFLAG_IMMUTABLE | XFS_DIFLAG_APPEND | XFS_DIFLAG_SYNC | \
XFS_DIFLAG_NOATIME | XFS_DIFLAG_NODUMP | XFS_DIFLAG_RTINHERIT | \
XFS_DIFLAG_PROJINHERIT | XFS_DIFLAG_NOSYMLINKS | XFS_DIFLAG_EXTSIZE | \
-- XFS_DIFLAG_EXTSZINHERIT)
-+ XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_BARRIER | XFS_DIFLAG_IUNLINK)
+- XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG)
++ XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_BARRIER | \
++ XFS_DIFLAG_IUNLINK)
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-2.6.17.11/fs/xfs/xfs_fs.h linux-2.6.17.11-vs2.0.2/fs/xfs/xfs_fs.h
---- linux-2.6.17.11/fs/xfs/xfs_fs.h 2006-04-09 13:49:55 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/xfs/xfs_fs.h 2006-08-17 00:28:21 +0200
-@@ -67,6 +67,8 @@ struct fsxattr {
- #define XFS_XFLAG_NOSYMLINKS 0x00000400 /* disallow symlink creation */
+diff -NurpP --minimal linux-2.6.18/fs/xfs/xfs_fs.h linux-2.6.18-vs2.0.2.1-t6/fs/xfs/xfs_fs.h
+--- linux-2.6.18/fs/xfs/xfs_fs.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/xfs/xfs_fs.h 2006-09-20 18:29:07 +0200
+@@ -68,6 +68,8 @@ struct fsxattr {
#define XFS_XFLAG_EXTSIZE 0x00000800 /* extent size allocator hint */
#define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
+ #define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
+#define XFS_XFLAG_BARRIER 0x00004000 /* chroot() barrier */
+#define XFS_XFLAG_IUNLINK 0x00008000 /* immutable unlink */
#define XFS_XFLAG_HASATTR 0x80000000 /* no DIFLAG for this */
/*
-@@ -295,7 +297,8 @@ typedef struct xfs_bstat {
+@@ -296,7 +298,8 @@ typedef struct xfs_bstat {
__s32 bs_extents; /* number of extents */
__u32 bs_gen; /* generation count */
__u16 bs_projid; /* project id */
@@ -7953,10 +7936,10 @@
__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.17.11/fs/xfs/xfs_inode.c linux-2.6.17.11-vs2.0.2/fs/xfs/xfs_inode.c
---- linux-2.6.17.11/fs/xfs/xfs_inode.c 2006-06-18 04:54:53 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/xfs/xfs_inode.c 2006-08-17 00:28:21 +0200
-@@ -52,6 +52,7 @@
+diff -NurpP --minimal linux-2.6.18/fs/xfs/xfs_inode.c linux-2.6.18-vs2.0.2.1-t6/fs/xfs/xfs_inode.c
+--- linux-2.6.18/fs/xfs/xfs_inode.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/xfs/xfs_inode.c 2006-09-20 17:01:44 +0200
+@@ -50,6 +50,7 @@
#include "xfs_mac.h"
#include "xfs_acl.h"
@@ -7964,7 +7947,7 @@
kmem_zone_t *xfs_ifork_zone;
kmem_zone_t *xfs_inode_zone;
-@@ -732,20 +733,35 @@ xfs_xlate_dinode_core(
+@@ -736,20 +737,35 @@ xfs_xlate_dinode_core(
xfs_dinode_core_t *buf_core = (xfs_dinode_core_t *)buf;
xfs_dinode_core_t *mem_core = (xfs_dinode_core_t *)dip;
xfs_arch_t arch = ARCH_CONVERT;
@@ -8002,7 +7985,7 @@
memcpy(mem_core->di_pad, buf_core->di_pad,
sizeof(buf_core->di_pad));
} else {
-@@ -794,6 +810,10 @@ _xfs_dic2xflags(
+@@ -797,6 +813,10 @@ _xfs_dic2xflags(
flags |= XFS_XFLAG_PREALLOC;
if (di_flags & XFS_DIFLAG_IMMUTABLE)
flags |= XFS_XFLAG_IMMUTABLE;
@@ -8013,7 +7996,7 @@
if (di_flags & XFS_DIFLAG_APPEND)
flags |= XFS_XFLAG_APPEND;
if (di_flags & XFS_DIFLAG_SYNC)
-@@ -1121,6 +1141,7 @@ xfs_ialloc(
+@@ -1126,6 +1146,7 @@ xfs_ialloc(
ASSERT(ip->i_d.di_nlink == nlink);
ip->i_d.di_uid = current_fsuid(cr);
ip->i_d.di_gid = current_fsgid(cr);
@@ -8021,10 +8004,10 @@
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.17.11/fs/xfs/xfs_itable.c linux-2.6.17.11-vs2.0.2/fs/xfs/xfs_itable.c
---- linux-2.6.17.11/fs/xfs/xfs_itable.c 2006-06-18 04:54:53 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/xfs/xfs_itable.c 2006-08-17 00:28:21 +0200
-@@ -85,6 +85,7 @@ xfs_bulkstat_one_iget(
+diff -NurpP --minimal linux-2.6.18/fs/xfs/xfs_itable.c linux-2.6.18-vs2.0.2.1-t6/fs/xfs/xfs_itable.c
+--- linux-2.6.18/fs/xfs/xfs_itable.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/xfs/xfs_itable.c 2006-09-20 17:01:44 +0200
+@@ -78,6 +78,7 @@ xfs_bulkstat_one_iget(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
buf->bs_gid = dic->di_gid;
@@ -8032,7 +8015,7 @@
buf->bs_size = dic->di_size;
vn_atime_to_bstime(vp, &buf->bs_atime);
buf->bs_mtime.tv_sec = dic->di_mtime.t_sec;
-@@ -159,6 +160,7 @@ xfs_bulkstat_one_dinode(
+@@ -152,6 +153,7 @@ xfs_bulkstat_one_dinode(
buf->bs_mode = INT_GET(dic->di_mode, ARCH_CONVERT);
buf->bs_uid = INT_GET(dic->di_uid, ARCH_CONVERT);
buf->bs_gid = INT_GET(dic->di_gid, ARCH_CONVERT);
@@ -8040,10 +8023,10 @@
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.17.11/fs/xfs/xfs_mount.h linux-2.6.17.11-vs2.0.2/fs/xfs/xfs_mount.h
---- linux-2.6.17.11/fs/xfs/xfs_mount.h 2006-06-18 04:54:53 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/xfs/xfs_mount.h 2006-08-17 00:28:21 +0200
-@@ -445,6 +445,7 @@ typedef struct xfs_mount {
+diff -NurpP --minimal linux-2.6.18/fs/xfs/xfs_mount.h linux-2.6.18-vs2.0.2.1-t6/fs/xfs/xfs_mount.h
+--- linux-2.6.18/fs/xfs/xfs_mount.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/xfs/xfs_mount.h 2006-09-20 17:01:44 +0200
+@@ -460,6 +460,7 @@ typedef struct xfs_mount {
#define XFS_MOUNT_NO_PERCPU_SB (1ULL << 23) /* don't use per-cpu superblock
counters */
@@ -8051,10 +8034,10 @@
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-2.6.17.11/fs/xfs/xfs_vfsops.c linux-2.6.17.11-vs2.0.2/fs/xfs/xfs_vfsops.c
---- linux-2.6.17.11/fs/xfs/xfs_vfsops.c 2006-06-18 04:54:54 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/xfs/xfs_vfsops.c 2006-08-17 00:28:21 +0200
-@@ -308,6 +308,8 @@ xfs_start_flags(
+diff -NurpP --minimal linux-2.6.18/fs/xfs/xfs_vfsops.c linux-2.6.18-vs2.0.2.1-t6/fs/xfs/xfs_vfsops.c
+--- linux-2.6.18/fs/xfs/xfs_vfsops.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/xfs/xfs_vfsops.c 2006-09-20 17:01:44 +0200
+@@ -300,6 +300,8 @@ xfs_start_flags(
if (ap->flags2 & XFSMNT2_COMPAT_IOSIZE)
mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE;
@@ -8063,7 +8046,7 @@
/*
* no recovery flag requires a read-only mount
-@@ -402,6 +404,8 @@ xfs_finish_flags(
+@@ -394,6 +396,8 @@ xfs_finish_flags(
return XFS_ERROR(EINVAL);
}
@@ -8072,15 +8055,15 @@
return 0;
}
-@@ -1655,6 +1659,7 @@ xfs_vget(
+@@ -1645,6 +1649,7 @@ xfs_vget(
* in stat(). */
#define MNTOPT_ATTR2 "attr2" /* do use attr2 attribute format */
#define MNTOPT_NOATTR2 "noattr2" /* do not use attr2 attribute format */
+#define MNTOPT_TAGXID "tagxid" /* context xid tagging for inodes */
STATIC unsigned long
- suffix_strtoul(const char *cp, char **endp, unsigned int base)
-@@ -1829,6 +1834,10 @@ xfs_parseargs(
+ suffix_strtoul(char *s, char **endp, unsigned int base)
+@@ -1831,6 +1836,10 @@ xfs_parseargs(
args->flags |= XFSMNT_ATTR2;
} else if (!strcmp(this_char, MNTOPT_NOATTR2)) {
args->flags &= ~XFSMNT_ATTR2;
@@ -8090,11 +8073,11 @@
+#endif
} else if (!strcmp(this_char, "osyncisdsync")) {
/* no-op, this is now the default */
- printk("XFS: osyncisdsync is now the default, option is deprecated.\n");
-diff -NurpP --minimal linux-2.6.17.11/fs/xfs/xfs_vnodeops.c linux-2.6.17.11-vs2.0.2/fs/xfs/xfs_vnodeops.c
---- linux-2.6.17.11/fs/xfs/xfs_vnodeops.c 2006-06-18 04:54:54 +0200
-+++ linux-2.6.17.11-vs2.0.2/fs/xfs/xfs_vnodeops.c 2006-08-17 00:28:21 +0200
-@@ -154,6 +154,7 @@ xfs_getattr(
+ cmn_err(CE_WARN,
+diff -NurpP --minimal linux-2.6.18/fs/xfs/xfs_vnodeops.c linux-2.6.18-vs2.0.2.1-t6/fs/xfs/xfs_vnodeops.c
+--- linux-2.6.18/fs/xfs/xfs_vnodeops.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/fs/xfs/xfs_vnodeops.c 2006-09-20 17:01:44 +0200
+@@ -160,6 +160,7 @@ xfs_getattr(
vap->va_mode = ip->i_d.di_mode;
vap->va_uid = ip->i_d.di_uid;
vap->va_gid = ip->i_d.di_gid;
@@ -8102,15 +8085,15 @@
vap->va_projid = ip->i_d.di_projid;
/*
-@@ -254,6 +255,7 @@ xfs_setattr(
+@@ -260,6 +261,7 @@ xfs_setattr(
uint commit_flags=0;
uid_t uid=0, iuid=0;
gid_t gid=0, igid=0;
+ xid_t xid=0, ixid=0;
int timeflags = 0;
- vnode_t *vp;
+ bhv_vnode_t *vp;
xfs_prid_t projid=0, iprojid=0;
-@@ -310,6 +312,7 @@ xfs_setattr(
+@@ -316,6 +318,7 @@ xfs_setattr(
(mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_PROJID))) {
uint qflags = 0;
@@ -8118,7 +8101,7 @@
if ((mask & XFS_AT_UID) && XFS_IS_UQUOTA_ON(mp)) {
uid = vap->va_uid;
qflags |= XFS_QMOPT_UQUOTA;
-@@ -390,6 +393,8 @@ xfs_setattr(
+@@ -395,6 +398,8 @@ xfs_setattr(
if (mask &
(XFS_AT_MODE|XFS_AT_XFLAGS|XFS_AT_EXTSIZE|XFS_AT_UID|
XFS_AT_GID|XFS_AT_PROJID)) {
@@ -8127,7 +8110,7 @@
/*
* CAP_FOWNER overrides the following restrictions:
*
-@@ -438,7 +443,7 @@ xfs_setattr(
+@@ -443,7 +448,7 @@ xfs_setattr(
* and can change the group id only to a group of which he
* or she is a member.
*/
@@ -8136,7 +8119,7 @@
/*
* These IDs could have changed since we last looked at them.
* But, we're assured that if the ownership did change
-@@ -446,10 +451,12 @@ xfs_setattr(
+@@ -451,10 +456,12 @@ xfs_setattr(
* would have changed also.
*/
iuid = ip->i_d.di_uid;
@@ -8151,7 +8134,7 @@
projid = (mask & XFS_AT_PROJID) ? (xfs_prid_t)vap->va_projid :
iprojid;
-@@ -477,6 +484,7 @@ xfs_setattr(
+@@ -482,6 +489,7 @@ xfs_setattr(
if ((XFS_IS_UQUOTA_ON(mp) && iuid != uid) ||
(XFS_IS_PQUOTA_ON(mp) && iprojid != projid) ||
(XFS_IS_GQUOTA_ON(mp) && igid != gid)) {
@@ -8159,7 +8142,7 @@
ASSERT(tp);
code = XFS_QM_DQVOPCHOWNRESV(mp, tp, ip, udqp, gdqp,
capable(CAP_FOWNER) ?
-@@ -694,7 +702,7 @@ xfs_setattr(
+@@ -707,7 +715,7 @@ xfs_setattr(
* and can change the group id only to a group of which he
* or she is a member.
*/
@@ -8168,7 +8151,7 @@
/*
* CAP_FSETID overrides the following restrictions:
*
-@@ -710,6 +718,12 @@ xfs_setattr(
+@@ -723,6 +731,12 @@ xfs_setattr(
* Change the ownerships and register quota modifications
* in the transaction.
*/
@@ -8181,7 +8164,7 @@
if (iuid != uid) {
if (XFS_IS_UQUOTA_ON(mp)) {
ASSERT(mask & XFS_AT_UID);
-@@ -790,6 +804,10 @@ xfs_setattr(
+@@ -803,6 +817,10 @@ xfs_setattr(
di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC);
if (vap->va_xflags & XFS_XFLAG_IMMUTABLE)
di_flags |= XFS_DIFLAG_IMMUTABLE;
@@ -8192,9 +8175,9 @@
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.17.11/include/asm-arm/tlb.h linux-2.6.17.11-vs2.0.2/include/asm-arm/tlb.h
---- linux-2.6.17.11/include/asm-arm/tlb.h 2006-06-18 04:54:58 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/asm-arm/tlb.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/asm-arm/tlb.h linux-2.6.18-vs2.0.2.1-t6/include/asm-arm/tlb.h
+--- linux-2.6.18/include/asm-arm/tlb.h 2006-06-18 04:54:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/asm-arm/tlb.h 2006-09-20 17:01:44 +0200
@@ -28,6 +28,7 @@
#else /* !CONFIG_MMU */
@@ -8203,9 +8186,9 @@
/*
* TLB handling. This allows us to remove pages from the page
-diff -NurpP --minimal linux-2.6.17.11/include/asm-arm26/tlb.h linux-2.6.17.11-vs2.0.2/include/asm-arm26/tlb.h
---- linux-2.6.17.11/include/asm-arm26/tlb.h 2006-01-03 17:30:02 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/asm-arm26/tlb.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/asm-arm26/tlb.h linux-2.6.18-vs2.0.2.1-t6/include/asm-arm26/tlb.h
+--- linux-2.6.18/include/asm-arm26/tlb.h 2006-01-03 17:30:02 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/asm-arm26/tlb.h 2006-09-20 17:01:44 +0200
@@ -3,6 +3,7 @@
#include <asm/pgalloc.h>
@@ -8214,10 +8197,10 @@
/*
* TLB handling. This allows us to remove pages from the page
-diff -NurpP --minimal linux-2.6.17.11/include/asm-arm26/unistd.h linux-2.6.17.11-vs2.0.2/include/asm-arm26/unistd.h
---- linux-2.6.17.11/include/asm-arm26/unistd.h 2006-01-03 17:30:02 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/asm-arm26/unistd.h 2006-08-17 00:28:21 +0200
-@@ -304,6 +304,8 @@
+diff -NurpP --minimal linux-2.6.18/include/asm-arm26/unistd.h linux-2.6.18-vs2.0.2.1-t6/include/asm-arm26/unistd.h
+--- linux-2.6.18/include/asm-arm26/unistd.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/asm-arm26/unistd.h 2006-09-20 17:01:44 +0200
+@@ -302,6 +302,8 @@
#define __NR_mq_getsetattr (__NR_SYSCALL_BASE+279)
#define __NR_waitid (__NR_SYSCALL_BASE+280)
@@ -8226,33 +8209,33 @@
/*
* The following SWIs are ARM private. FIXME - make appropriate for arm26
*/
-diff -NurpP --minimal linux-2.6.17.11/include/asm-generic/tlb.h linux-2.6.17.11-vs2.0.2/include/asm-generic/tlb.h
---- linux-2.6.17.11/include/asm-generic/tlb.h 2006-01-03 17:30:02 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/asm-generic/tlb.h 2006-08-17 00:28:21 +0200
-@@ -15,6 +15,7 @@
+diff -NurpP --minimal linux-2.6.18/include/asm-generic/tlb.h linux-2.6.18-vs2.0.2.1-t6/include/asm-generic/tlb.h
+--- linux-2.6.18/include/asm-generic/tlb.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/asm-generic/tlb.h 2006-09-20 17:01:44 +0200
+@@ -14,6 +14,7 @@
+ #define _ASM_GENERIC__TLB_H
- #include <linux/config.h>
#include <linux/swap.h>
+#include <linux/vs_memory.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.17.11/include/asm-i386/elf.h linux-2.6.17.11-vs2.0.2/include/asm-i386/elf.h
---- linux-2.6.17.11/include/asm-i386/elf.h 2006-01-03 17:30:04 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/asm-i386/elf.h 2006-08-17 00:28:21 +0200
-@@ -108,7 +108,7 @@ typedef struct user_fxsr_struct elf_fpxr
+diff -NurpP --minimal linux-2.6.18/include/asm-i386/elf.h linux-2.6.18-vs2.0.2.1-t6/include/asm-i386/elf.h
+--- linux-2.6.18/include/asm-i386/elf.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/asm-i386/elf.h 2006-09-20 17:01:44 +0200
+@@ -112,7 +112,7 @@ typedef struct user_fxsr_struct elf_fpxr
For the moment, we have only optimizations for the Intel generations,
but that could change... */
-#define ELF_PLATFORM (system_utsname.machine)
+#define ELF_PLATFORM (vx_new_uts(machine))
- #ifdef __KERNEL__
#define SET_PERSONALITY(ex, ibcs2) do { } while (0)
-diff -NurpP --minimal linux-2.6.17.11/include/asm-ia64/tlb.h linux-2.6.17.11-vs2.0.2/include/asm-ia64/tlb.h
---- linux-2.6.17.11/include/asm-ia64/tlb.h 2006-01-03 17:30:05 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/asm-ia64/tlb.h 2006-08-17 00:28:21 +0200
-@@ -41,6 +41,7 @@
+
+diff -NurpP --minimal linux-2.6.18/include/asm-ia64/tlb.h linux-2.6.18-vs2.0.2.1-t6/include/asm-ia64/tlb.h
+--- linux-2.6.18/include/asm-ia64/tlb.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/asm-ia64/tlb.h 2006-09-20 17:01:44 +0200
+@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <linux/swap.h>
@@ -8260,9 +8243,21 @@
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.17.11/include/asm-powerpc/unistd.h linux-2.6.17.11-vs2.0.2/include/asm-powerpc/unistd.h
---- linux-2.6.17.11/include/asm-powerpc/unistd.h 2006-06-18 04:55:08 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/asm-powerpc/unistd.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/asm-powerpc/systbl.h linux-2.6.18-vs2.0.2.1-t6/include/asm-powerpc/systbl.h
+--- linux-2.6.18/include/asm-powerpc/systbl.h 2006-09-20 16:58:41 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/asm-powerpc/systbl.h 2006-09-20 20:01:36 +0200
+@@ -260,7 +260,7 @@ COMPAT_SYS_SPU(fstatfs64)
+ SYSX(sys_ni_syscall, ppc_fadvise64_64, ppc_fadvise64_64)
+ PPC_SYS_SPU(rtas)
+ OLDSYS(debug_setcontext)
+-SYSCALL(ni_syscall)
++SYSX(sys_vserver, sys32_vserver, sys_vserver)
+ SYSCALL(ni_syscall)
+ COMPAT_SYS(mbind)
+ COMPAT_SYS(get_mempolicy)
+diff -NurpP --minimal linux-2.6.18/include/asm-powerpc/unistd.h linux-2.6.18-vs2.0.2.1-t6/include/asm-powerpc/unistd.h
+--- linux-2.6.18/include/asm-powerpc/unistd.h 2006-09-20 16:58:41 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/asm-powerpc/unistd.h 2006-09-20 17:01:44 +0200
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -8272,9 +8267,9 @@
/* 258 currently unused */
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-2.6.17.11/include/asm-s390/unistd.h linux-2.6.17.11-vs2.0.2/include/asm-s390/unistd.h
---- linux-2.6.17.11/include/asm-s390/unistd.h 2006-06-18 04:55:09 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/asm-s390/unistd.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/asm-s390/unistd.h linux-2.6.18-vs2.0.2.1-t6/include/asm-s390/unistd.h
+--- linux-2.6.18/include/asm-s390/unistd.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/asm-s390/unistd.h 2006-09-20 17:01:44 +0200
@@ -255,7 +255,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
@@ -8284,9 +8279,9 @@
#define __NR_fadvise64_64 264
#define __NR_statfs64 265
#define __NR_fstatfs64 266
-diff -NurpP --minimal linux-2.6.17.11/include/asm-sparc/unistd.h linux-2.6.17.11-vs2.0.2/include/asm-sparc/unistd.h
---- linux-2.6.17.11/include/asm-sparc/unistd.h 2006-06-18 04:55:10 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/asm-sparc/unistd.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/asm-sparc/unistd.h linux-2.6.18-vs2.0.2.1-t6/include/asm-sparc/unistd.h
+--- linux-2.6.18/include/asm-sparc/unistd.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/asm-sparc/unistd.h 2006-09-20 17:01:44 +0200
@@ -283,7 +283,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -8296,20 +8291,20 @@
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-2.6.17.11/include/asm-sparc64/tlb.h linux-2.6.17.11-vs2.0.2/include/asm-sparc64/tlb.h
---- linux-2.6.17.11/include/asm-sparc64/tlb.h 2006-01-03 17:30:08 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/asm-sparc64/tlb.h 2006-08-17 00:28:21 +0200
-@@ -3,6 +3,7 @@
+diff -NurpP --minimal linux-2.6.18/include/asm-sparc64/tlb.h linux-2.6.18-vs2.0.2.1-t6/include/asm-sparc64/tlb.h
+--- linux-2.6.18/include/asm-sparc64/tlb.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/asm-sparc64/tlb.h 2006-09-20 17:01:44 +0200
+@@ -2,6 +2,7 @@
+ #define _SPARC64_TLB_H
- #include <linux/config.h>
#include <linux/swap.h>
+#include <linux/vs_memory.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
-diff -NurpP --minimal linux-2.6.17.11/include/asm-sparc64/unistd.h linux-2.6.17.11-vs2.0.2/include/asm-sparc64/unistd.h
---- linux-2.6.17.11/include/asm-sparc64/unistd.h 2006-06-18 04:55:11 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/asm-sparc64/unistd.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/asm-sparc64/unistd.h linux-2.6.18-vs2.0.2.1-t6/include/asm-sparc64/unistd.h
+--- linux-2.6.18/include/asm-sparc64/unistd.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/asm-sparc64/unistd.h 2006-09-20 17:01:44 +0200
@@ -285,7 +285,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -8319,9 +8314,9 @@
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-2.6.17.11/include/asm-x86_64/unistd.h linux-2.6.17.11-vs2.0.2/include/asm-x86_64/unistd.h
---- linux-2.6.17.11/include/asm-x86_64/unistd.h 2006-06-18 04:55:15 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/asm-x86_64/unistd.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/asm-x86_64/unistd.h linux-2.6.18-vs2.0.2.1-t6/include/asm-x86_64/unistd.h
+--- linux-2.6.18/include/asm-x86_64/unistd.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/asm-x86_64/unistd.h 2006-09-20 17:01:44 +0200
@@ -532,7 +532,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
#define __NR_utimes 235
__SYSCALL(__NR_utimes, sys_utimes)
@@ -8331,9 +8326,9 @@
#define __NR_mbind 237
__SYSCALL(__NR_mbind, sys_mbind)
#define __NR_set_mempolicy 238
-diff -NurpP --minimal linux-2.6.17.11/include/linux/capability.h linux-2.6.17.11-vs2.0.2/include/linux/capability.h
---- linux-2.6.17.11/include/linux/capability.h 2006-06-18 04:55:15 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/capability.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/capability.h linux-2.6.18-vs2.0.2.1-t6/include/linux/capability.h
+--- linux-2.6.18/include/linux/capability.h 2006-06-18 04:55:15 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/capability.h 2006-09-20 17:01:45 +0200
@@ -235,6 +235,7 @@ typedef __u32 kernel_cap_t;
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
@@ -8354,9 +8349,9 @@
#ifdef __KERNEL__
/*
* Bounding set
-diff -NurpP --minimal linux-2.6.17.11/include/linux/devpts_fs.h linux-2.6.17.11-vs2.0.2/include/linux/devpts_fs.h
---- linux-2.6.17.11/include/linux/devpts_fs.h 2004-08-14 12:55:59 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/devpts_fs.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/devpts_fs.h linux-2.6.18-vs2.0.2.1-t6/include/linux/devpts_fs.h
+--- linux-2.6.18/include/linux/devpts_fs.h 2004-08-14 12:55:59 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/devpts_fs.h 2006-09-20 17:01:45 +0200
@@ -30,5 +30,7 @@ static inline void devpts_pty_kill(int n
#endif
@@ -8365,9 +8360,9 @@
+
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/ext2_fs.h linux-2.6.17.11-vs2.0.2/include/linux/ext2_fs.h
---- linux-2.6.17.11/include/linux/ext2_fs.h 2005-10-28 20:49:54 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/ext2_fs.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/ext2_fs.h linux-2.6.18-vs2.0.2.1-t6/include/linux/ext2_fs.h
+--- linux-2.6.18/include/linux/ext2_fs.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/ext2_fs.h 2006-09-20 17:01:45 +0200
@@ -192,10 +192,17 @@ struct ext2_group_desc
#define EXT2_NOTAIL_FL 0x00008000 /* file tail should not be merged */
#define EXT2_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
@@ -8415,10 +8410,10 @@
#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-2.6.17.11/include/linux/ext3_fs.h linux-2.6.17.11-vs2.0.2/include/linux/ext3_fs.h
---- linux-2.6.17.11/include/linux/ext3_fs.h 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/ext3_fs.h 2006-08-17 00:28:21 +0200
-@@ -186,10 +186,20 @@ struct ext3_group_desc
+diff -NurpP --minimal linux-2.6.18/include/linux/ext3_fs.h linux-2.6.18-vs2.0.2.1-t6/include/linux/ext3_fs.h
+--- linux-2.6.18/include/linux/ext3_fs.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/ext3_fs.h 2006-09-20 17:01:45 +0200
+@@ -181,10 +181,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) */
#define EXT3_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
@@ -8439,7 +8434,7 @@
/*
* Inode dynamic state flags
-@@ -288,7 +298,7 @@ struct ext3_inode {
+@@ -283,7 +293,7 @@ struct ext3_inode {
struct {
__u8 l_i_frag; /* Fragment number */
__u8 l_i_fsize; /* Fragment size */
@@ -8448,7 +8443,7 @@
__le16 l_i_uid_high; /* these 2 fields */
__le16 l_i_gid_high; /* were reserved2[0] */
__u32 l_i_reserved2;
-@@ -322,6 +332,7 @@ struct ext3_inode {
+@@ -317,6 +327,7 @@ struct ext3_inode {
#define i_gid_low i_gid
#define i_uid_high osd2.linux2.l_i_uid_high
#define i_gid_high osd2.linux2.l_i_gid_high
@@ -8456,7 +8451,7 @@
#define i_reserved2 osd2.linux2.l_i_reserved2
#elif defined(__GNU__)
-@@ -376,6 +387,7 @@ struct ext3_inode {
+@@ -371,6 +382,7 @@ struct ext3_inode {
#define EXT3_MOUNT_QUOTA 0x80000 /* Some quota option set */
#define EXT3_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
#define EXT3_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
@@ -8464,7 +8459,7 @@
/* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
#ifndef _LINUX_EXT2_FS_H
-@@ -790,6 +802,7 @@ struct buffer_head * ext3_bread (handle_
+@@ -799,6 +811,7 @@ struct buffer_head * ext3_bread (handle_
int ext3_get_blocks_handle(handle_t *handle, struct inode *inode,
sector_t iblock, unsigned long maxblocks, struct buffer_head *bh_result,
int create, int extend_disksize);
@@ -8472,10 +8467,10 @@
extern void ext3_read_inode (struct inode *);
extern int ext3_write_inode (struct inode *, int);
-diff -NurpP --minimal linux-2.6.17.11/include/linux/fs.h linux-2.6.17.11-vs2.0.2/include/linux/fs.h
---- linux-2.6.17.11/include/linux/fs.h 2006-06-18 04:55:17 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/fs.h 2006-08-17 00:28:21 +0200
-@@ -116,6 +116,8 @@ extern int dir_notify_enable;
+diff -NurpP --minimal linux-2.6.18/include/linux/fs.h linux-2.6.18-vs2.0.2.1-t6/include/linux/fs.h
+--- linux-2.6.18/include/linux/fs.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/fs.h 2006-09-20 17:01:45 +0200
+@@ -119,6 +119,8 @@ extern int dir_notify_enable;
#define MS_PRIVATE (1<<18) /* change to private */
#define MS_SLAVE (1<<19) /* change to slave */
#define MS_SHARED (1<<20) /* change to shared */
@@ -8484,7 +8479,7 @@
#define MS_ACTIVE (1<<30)
#define MS_NOUSER (1<<31)
-@@ -142,6 +144,8 @@ extern int dir_notify_enable;
+@@ -145,6 +147,8 @@ extern int dir_notify_enable;
#define S_NOCMTIME 128 /* Do not update file c/mtime */
#define S_SWAPFILE 256 /* Do not truncate: swapon got its bmaps */
#define S_PRIVATE 512 /* Inode is fs-internal */
@@ -8493,7 +8488,7 @@
/*
* Note that nosuid etc flags are inode-specific: setting some file-system
-@@ -158,18 +162,22 @@ extern int dir_notify_enable;
+@@ -161,18 +165,22 @@ extern int dir_notify_enable;
*/
#define __IS_FLG(inode,flg) ((inode)->i_sb->s_flags & (flg))
@@ -8517,7 +8512,7 @@
#define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
#define IS_NOCMTIME(inode) ((inode)->i_flags & S_NOCMTIME)
#define IS_SWAPFILE(inode) ((inode)->i_flags & S_SWAPFILE)
-@@ -277,6 +285,7 @@ typedef void (dio_iodone_t)(struct kiocb
+@@ -280,6 +288,7 @@ typedef void (dio_iodone_t)(struct kiocb
#define ATTR_KILL_SUID 2048
#define ATTR_KILL_SGID 4096
#define ATTR_FILE 8192
@@ -8525,7 +8520,7 @@
/*
* This is the Inode Attributes structure, used for notify_change(). It
-@@ -292,6 +301,7 @@ struct iattr {
+@@ -295,6 +304,7 @@ struct iattr {
umode_t ia_mode;
uid_t ia_uid;
gid_t ia_gid;
@@ -8533,7 +8528,7 @@
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-@@ -305,6 +315,9 @@ struct iattr {
+@@ -308,6 +318,9 @@ struct iattr {
struct file *ia_file;
};
@@ -8543,7 +8538,7 @@
/*
* Includes for diskquotas.
*/
-@@ -486,6 +499,7 @@ struct inode {
+@@ -505,6 +518,7 @@ struct inode {
unsigned int i_nlink;
uid_t i_uid;
gid_t i_gid;
@@ -8551,7 +8546,7 @@
dev_t i_rdev;
loff_t i_size;
struct timespec i_atime;
-@@ -648,6 +662,7 @@ struct file {
+@@ -687,6 +701,7 @@ struct file {
struct fown_struct f_owner;
unsigned int f_uid, f_gid;
struct file_ra_state f_ra;
@@ -8559,7 +8554,7 @@
unsigned long f_version;
void *f_security;
-@@ -726,6 +741,7 @@ struct file_lock {
+@@ -767,6 +782,7 @@ struct file_lock {
unsigned char fl_type;
loff_t fl_start;
loff_t fl_end;
@@ -8567,7 +8562,7 @@
struct fasync_struct * fl_fasync; /* for lease break notifications */
unsigned long fl_break_time; /* for nonblocking lease breaks */
-@@ -920,12 +936,12 @@ static inline void unlock_super(struct s
+@@ -959,12 +975,12 @@ static inline void unlock_super(struct s
*/
extern int vfs_permission(struct nameidata *, int);
extern int vfs_create(struct inode *, struct dentry *, int, struct nameidata *);
@@ -8586,7 +8581,7 @@
extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
/*
-@@ -1067,6 +1083,7 @@ struct inode_operations {
+@@ -1106,6 +1122,7 @@ struct inode_operations {
ssize_t (*listxattr) (struct dentry *, char *, size_t);
int (*removexattr) (struct dentry *, const char *);
void (*truncate_range)(struct inode *, loff_t, loff_t);
@@ -8594,21 +8589,21 @@
};
struct seq_file;
-@@ -1742,6 +1759,7 @@ extern int dcache_dir_open(struct inode
+@@ -1790,6 +1807,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);
+extern int dcache_readdir_filter(struct file *, void *, filldir_t, int (*)(struct dentry *));
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
- extern int simple_statfs(struct super_block *, struct kstatfs *);
+ extern int simple_statfs(struct dentry *, struct kstatfs *);
extern int simple_link(struct dentry *, struct inode *, struct dentry *);
-diff -NurpP --minimal linux-2.6.17.11/include/linux/init_task.h linux-2.6.17.11-vs2.0.2/include/linux/init_task.h
---- linux-2.6.17.11/include/linux/init_task.h 2006-06-18 04:55:18 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/init_task.h 2006-08-17 00:28:21 +0200
-@@ -123,6 +123,10 @@ extern struct group_info init_groups;
- .journal_info = NULL, \
- .cpu_timers = INIT_CPU_TIMERS(tsk.cpu_timers), \
- .fs_excl = ATOMIC_INIT(0), \
+diff -NurpP --minimal linux-2.6.18/include/linux/init_task.h linux-2.6.18-vs2.0.2.1-t6/include/linux/init_task.h
+--- linux-2.6.18/include/linux/init_task.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/init_task.h 2006-09-20 17:51:11 +0200
+@@ -128,6 +128,10 @@ extern struct group_info init_groups;
+ .pi_lock = SPIN_LOCK_UNLOCKED, \
+ INIT_TRACE_IRQFLAGS \
+ INIT_LOCKDEP \
+ .xid = 0, \
+ .vx_info = NULL, \
+ .nid = 0, \
@@ -8616,9 +8611,9 @@
}
-diff -NurpP --minimal linux-2.6.17.11/include/linux/ipc.h linux-2.6.17.11-vs2.0.2/include/linux/ipc.h
---- linux-2.6.17.11/include/linux/ipc.h 2004-08-14 12:54:46 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/ipc.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/ipc.h linux-2.6.18-vs2.0.2.1-t6/include/linux/ipc.h
+--- linux-2.6.18/include/linux/ipc.h 2004-08-14 12:54:46 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/ipc.h 2006-09-20 17:01:45 +0200
@@ -66,6 +66,7 @@ struct kern_ipc_perm
mode_t mode;
unsigned long seq;
@@ -8627,9 +8622,9 @@
};
#endif /* __KERNEL__ */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/kernel.h linux-2.6.17.11-vs2.0.2/include/linux/kernel.h
---- linux-2.6.17.11/include/linux/kernel.h 2006-06-18 04:55:18 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/kernel.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/kernel.h linux-2.6.18-vs2.0.2.1-t6/include/linux/kernel.h
+--- linux-2.6.18/include/linux/kernel.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/kernel.h 2006-09-20 17:01:45 +0200
@@ -17,6 +17,7 @@
#include <asm/bug.h>
@@ -8638,9 +8633,9 @@
#define INT_MAX ((int)(~0U>>1))
#define INT_MIN (-INT_MAX - 1)
-diff -NurpP --minimal linux-2.6.17.11/include/linux/major.h linux-2.6.17.11-vs2.0.2/include/linux/major.h
---- linux-2.6.17.11/include/linux/major.h 2006-06-18 04:55:19 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/major.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/major.h linux-2.6.18-vs2.0.2.1-t6/include/linux/major.h
+--- linux-2.6.18/include/linux/major.h 2006-06-18 04:55:19 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/major.h 2006-09-20 17:01:45 +0200
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
@@ -8649,10 +8644,10 @@
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-2.6.17.11/include/linux/mount.h linux-2.6.17.11-vs2.0.2/include/linux/mount.h
---- linux-2.6.17.11/include/linux/mount.h 2006-04-09 13:49:57 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/mount.h 2006-08-17 00:28:21 +0200
-@@ -22,10 +22,14 @@
+diff -NurpP --minimal linux-2.6.18/include/linux/mount.h linux-2.6.18-vs2.0.2.1-t6/include/linux/mount.h
+--- linux-2.6.18/include/linux/mount.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/mount.h 2006-09-20 17:50:23 +0200
+@@ -27,12 +27,16 @@ struct namespace;
#define MNT_NOEXEC 0x04
#define MNT_NOATIME 0x08
#define MNT_NODIRATIME 0x10
@@ -8660,6 +8655,8 @@
+
+#define MNT_IS_RDONLY(m) ((m) && ((m)->mnt_flags & MNT_RDONLY))
+ #define MNT_SHRINKABLE 0x100
+
#define MNT_SHARED 0x1000 /* if the vfsmount is a shared mount */
#define MNT_UNBINDABLE 0x2000 /* if the vfsmount is a unbindable mount */
#define MNT_PNODE_MASK 0x3000 /* propogation flag mask */
@@ -8667,7 +8664,7 @@
struct vfsmount {
struct list_head mnt_hash;
-@@ -47,6 +51,7 @@ struct vfsmount {
+@@ -54,6 +58,7 @@ struct vfsmount {
struct vfsmount *mnt_master; /* slave is on master->mnt_slave_list */
struct namespace *mnt_namespace; /* containing namespace */
int mnt_pinned;
@@ -8675,20 +8672,20 @@
};
static inline struct vfsmount *mntget(struct vfsmount *mnt)
-diff -NurpP --minimal linux-2.6.17.11/include/linux/net.h linux-2.6.17.11-vs2.0.2/include/linux/net.h
---- linux-2.6.17.11/include/linux/net.h 2006-06-18 04:55:19 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/net.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/net.h linux-2.6.18-vs2.0.2.1-t6/include/linux/net.h
+--- linux-2.6.18/include/linux/net.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/net.h 2006-09-20 17:47:13 +0200
@@ -62,6 +62,7 @@ typedef enum {
- #define SOCK_ASYNC_WAITDATA 1
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
-+#define SOCK_USER_SOCKET 4
+ #define SOCK_PASSSEC 4
++#define SOCK_USER_SOCKET 5
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-2.6.17.11/include/linux/nfs_mount.h linux-2.6.17.11-vs2.0.2/include/linux/nfs_mount.h
---- linux-2.6.17.11/include/linux/nfs_mount.h 2005-08-29 22:25:42 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/nfs_mount.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/nfs_mount.h linux-2.6.18-vs2.0.2.1-t6/include/linux/nfs_mount.h
+--- linux-2.6.18/include/linux/nfs_mount.h 2005-08-29 22:25:42 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/nfs_mount.h 2006-09-20 17:01:45 +0200
@@ -61,6 +61,7 @@ struct nfs_mount_data {
#define NFS_MOUNT_NOACL 0x0800 /* 4 */
#define NFS_MOUNT_STRICTLOCK 0x1000 /* reserved for NFSv4 */
@@ -8697,9 +8694,9 @@
#define NFS_MOUNT_FLAGMASK 0xFFFF
#endif
-diff -NurpP --minimal linux-2.6.17.11/include/linux/percpu.h linux-2.6.17.11-vs2.0.2/include/linux/percpu.h
---- linux-2.6.17.11/include/linux/percpu.h 2006-04-09 13:49:57 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/percpu.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/percpu.h linux-2.6.18-vs2.0.2.1-t6/include/linux/percpu.h
+--- linux-2.6.18/include/linux/percpu.h 2006-04-09 13:49:57 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/percpu.h 2006-09-20 17:01:45 +0200
@@ -8,7 +8,7 @@
/* Enough to cover all DEFINE_PER_CPUs in kernel, including modules. */
@@ -8709,10 +8706,10 @@
#endif
/* Must be an lvalue. */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/proc_fs.h linux-2.6.17.11-vs2.0.2/include/linux/proc_fs.h
---- linux-2.6.17.11/include/linux/proc_fs.h 2006-06-18 04:55:21 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/proc_fs.h 2006-08-17 00:28:21 +0200
-@@ -56,6 +56,7 @@ struct proc_dir_entry {
+diff -NurpP --minimal linux-2.6.18/include/linux/proc_fs.h linux-2.6.18-vs2.0.2.1-t6/include/linux/proc_fs.h
+--- linux-2.6.18/include/linux/proc_fs.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/proc_fs.h 2006-09-20 17:46:14 +0200
+@@ -55,6 +55,7 @@ struct proc_dir_entry {
nlink_t nlink;
uid_t uid;
gid_t gid;
@@ -8720,11 +8717,12 @@
loff_t size;
struct inode_operations * proc_iops;
const struct file_operations * proc_fops;
-@@ -251,9 +252,11 @@ extern void kclist_add(struct kcore_list
+@@ -247,10 +248,12 @@ extern void kclist_add(struct kcore_list
+
struct proc_inode {
- struct task_struct *task;
- int type;
+ struct pid *pid;
+ int vx_flags;
+ int fd;
union {
int (*proc_get_link)(struct inode *, struct dentry **, struct vfsmount **);
int (*proc_read)(struct task_struct *task, char *page);
@@ -8732,9 +8730,9 @@
} op;
struct proc_dir_entry *pde;
struct inode vfs_inode;
-diff -NurpP --minimal linux-2.6.17.11/include/linux/reiserfs_fs.h linux-2.6.17.11-vs2.0.2/include/linux/reiserfs_fs.h
---- linux-2.6.17.11/include/linux/reiserfs_fs.h 2006-06-18 04:55:21 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/reiserfs_fs.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/reiserfs_fs.h linux-2.6.18-vs2.0.2.1-t6/include/linux/reiserfs_fs.h
+--- linux-2.6.18/include/linux/reiserfs_fs.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/reiserfs_fs.h 2006-09-20 17:01:45 +0200
@@ -829,6 +829,18 @@ struct stat_data_v1 {
#define REISERFS_COMPR_FL EXT2_COMPR_FL
#define REISERFS_NOTAIL_FL EXT2_NOTAIL_FL
@@ -8762,9 +8760,9 @@
/* namei.c */
void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
-diff -NurpP --minimal linux-2.6.17.11/include/linux/reiserfs_fs_sb.h linux-2.6.17.11-vs2.0.2/include/linux/reiserfs_fs_sb.h
---- linux-2.6.17.11/include/linux/reiserfs_fs_sb.h 2006-02-18 14:40:35 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/reiserfs_fs_sb.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/reiserfs_fs_sb.h linux-2.6.18-vs2.0.2.1-t6/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.18/include/linux/reiserfs_fs_sb.h 2006-02-18 14:40:35 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/reiserfs_fs_sb.h 2006-09-20 17:01:45 +0200
@@ -456,6 +456,7 @@ enum reiserfs_mount_options {
REISERFS_POSIXACL,
REISERFS_BARRIER_NONE,
@@ -8773,10 +8771,10 @@
/* Actions on error */
REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-2.6.17.11/include/linux/sched.h linux-2.6.17.11-vs2.0.2/include/linux/sched.h
---- linux-2.6.17.11/include/linux/sched.h 2006-06-18 04:55:21 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/sched.h 2006-08-17 00:28:21 +0200
-@@ -15,6 +15,7 @@
+diff -NurpP --minimal linux-2.6.18/include/linux/sched.h linux-2.6.18-vs2.0.2.1-t6/include/linux/sched.h
+--- linux-2.6.18/include/linux/sched.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/sched.h 2006-09-20 17:01:45 +0200
+@@ -52,6 +52,7 @@ struct sched_param {
#include <linux/cpumask.h>
#include <linux/errno.h>
#include <linux/nodemask.h>
@@ -8784,7 +8782,7 @@
#include <asm/system.h>
#include <asm/semaphore.h>
-@@ -131,6 +132,7 @@ extern unsigned long nr_iowait(void);
+@@ -148,6 +149,7 @@ extern unsigned long weighted_cpuload(co
#define EXIT_DEAD 32
/* in tsk->state again */
#define TASK_NONINTERACTIVE 64
@@ -8792,7 +8790,7 @@
#define __set_task_state(tsk, state_value) \
do { (tsk)->state = (state_value); } while (0)
-@@ -259,27 +261,30 @@ extern void arch_unmap_area_topdown(stru
+@@ -262,27 +264,30 @@ extern void arch_unmap_area_topdown(stru
* The mm counters are not protected by its page_table_lock,
* so must be incremented atomically.
*/
@@ -8833,7 +8831,7 @@
#define get_mm_rss(mm) \
(get_mm_counter(mm, file_rss) + get_mm_counter(mm, anon_rss))
#define update_hiwater_rss(mm) do { \
-@@ -338,6 +343,7 @@ struct mm_struct {
+@@ -341,6 +346,7 @@ struct mm_struct {
/* Architecture-specific MM context */
mm_context_t context;
@@ -8841,7 +8839,7 @@
/* Token based thrashing protection. */
unsigned long swap_token_time;
-@@ -510,9 +516,10 @@ struct user_struct {
+@@ -531,9 +537,10 @@ struct user_struct {
/* Hash table maintenance information */
struct list_head uidhash_list;
uid_t uid;
@@ -8853,7 +8851,7 @@
extern struct user_struct root_user;
#define INIT_USER (&root_user)
-@@ -824,6 +831,14 @@ struct task_struct {
+@@ -898,6 +905,14 @@ struct task_struct {
void *security;
struct audit_context *audit_context;
@@ -8868,7 +8866,7 @@
seccomp_t seccomp;
/* Thread group tracking */
-@@ -1040,13 +1055,19 @@ extern struct task_struct init_task;
+@@ -1162,13 +1177,19 @@ extern struct task_struct init_task;
extern struct mm_struct init_mm;
@@ -8890,9 +8888,9 @@
static inline struct user_struct *get_uid(struct user_struct *u)
{
atomic_inc(&u->__count);
-diff -NurpP --minimal linux-2.6.17.11/include/linux/shmem_fs.h linux-2.6.17.11-vs2.0.2/include/linux/shmem_fs.h
---- linux-2.6.17.11/include/linux/shmem_fs.h 2006-04-09 13:49:57 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/shmem_fs.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/shmem_fs.h linux-2.6.18-vs2.0.2.1-t6/include/linux/shmem_fs.h
+--- linux-2.6.18/include/linux/shmem_fs.h 2006-04-09 13:49:57 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/shmem_fs.h 2006-09-20 17:01:45 +0200
@@ -8,6 +8,9 @@
#define SHMEM_NR_DIRECT 16
@@ -8903,9 +8901,9 @@
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-2.6.17.11/include/linux/stat.h linux-2.6.17.11-vs2.0.2/include/linux/stat.h
---- linux-2.6.17.11/include/linux/stat.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/stat.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/stat.h linux-2.6.18-vs2.0.2.1-t6/include/linux/stat.h
+--- linux-2.6.18/include/linux/stat.h 2006-06-18 04:55:25 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/stat.h 2006-09-20 17:01:45 +0200
@@ -63,6 +63,7 @@ struct kstat {
unsigned int nlink;
uid_t uid;
@@ -8914,10 +8912,10 @@
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-2.6.17.11/include/linux/sunrpc/auth.h linux-2.6.17.11-vs2.0.2/include/linux/sunrpc/auth.h
---- linux-2.6.17.11/include/linux/sunrpc/auth.h 2006-02-18 14:40:35 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/sunrpc/auth.h 2006-08-17 00:28:21 +0200
-@@ -28,6 +28,7 @@
+diff -NurpP --minimal linux-2.6.18/include/linux/sunrpc/auth.h linux-2.6.18-vs2.0.2.1-t6/include/linux/sunrpc/auth.h
+--- linux-2.6.18/include/linux/sunrpc/auth.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/sunrpc/auth.h 2006-09-20 17:01:45 +0200
+@@ -27,6 +27,7 @@
struct auth_cred {
uid_t uid;
gid_t gid;
@@ -8925,9 +8923,9 @@
struct group_info *group_info;
};
-diff -NurpP --minimal linux-2.6.17.11/include/linux/sunrpc/clnt.h linux-2.6.17.11-vs2.0.2/include/linux/sunrpc/clnt.h
---- linux-2.6.17.11/include/linux/sunrpc/clnt.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/sunrpc/clnt.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/sunrpc/clnt.h linux-2.6.18-vs2.0.2.1-t6/include/linux/sunrpc/clnt.h
+--- linux-2.6.18/include/linux/sunrpc/clnt.h 2006-06-18 04:55:25 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/sunrpc/clnt.h 2006-09-20 17:01:45 +0200
@@ -52,7 +52,8 @@ struct rpc_clnt {
cl_intr : 1,/* interruptible */
cl_autobind : 1,/* use getport() */
@@ -8938,9 +8936,9 @@
struct rpc_rtt * cl_rtt; /* RTO estimator data */
struct rpc_portmap * cl_pmap; /* port mapping */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/sysctl.h linux-2.6.17.11-vs2.0.2/include/linux/sysctl.h
---- linux-2.6.17.11/include/linux/sysctl.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/sysctl.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/sysctl.h linux-2.6.18-vs2.0.2.1-t6/include/linux/sysctl.h
+--- linux-2.6.18/include/linux/sysctl.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/sysctl.h 2006-09-20 17:01:45 +0200
@@ -93,6 +93,7 @@ enum
KERN_CAP_BSET=14, /* int: capability bounding set */
KERN_PANIC=15, /* int: panic timeout */
@@ -8949,7 +8947,7 @@
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-@@ -909,6 +910,9 @@ typedef int ctl_handler (ctl_table *tabl
+@@ -916,6 +917,9 @@ typedef int ctl_handler (ctl_table *tabl
typedef int proc_handler (ctl_table *ctl, int write, struct file * filp,
void __user *buffer, size_t *lenp, loff_t *ppos);
@@ -8959,7 +8957,7 @@
extern int proc_dostring(ctl_table *, int, struct file *,
void __user *, size_t *, loff_t *);
extern int proc_dointvec(ctl_table *, int, struct file *,
-@@ -990,6 +994,7 @@ struct ctl_table
+@@ -997,6 +1001,7 @@ struct ctl_table
mode_t mode;
ctl_table *child;
proc_handler *proc_handler; /* Callback for text formatting */
@@ -8967,9 +8965,9 @@
ctl_handler *strategy; /* Callback function for all r/w */
struct proc_dir_entry *de; /* /proc control block */
void *extra1;
-diff -NurpP --minimal linux-2.6.17.11/include/linux/sysfs.h linux-2.6.17.11-vs2.0.2/include/linux/sysfs.h
---- linux-2.6.17.11/include/linux/sysfs.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/sysfs.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/sysfs.h linux-2.6.18-vs2.0.2.1-t6/include/linux/sysfs.h
+--- linux-2.6.18/include/linux/sysfs.h 2006-06-18 04:55:25 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/sysfs.h 2006-09-20 17:01:45 +0200
@@ -12,6 +12,8 @@
#include <asm/atomic.h>
@@ -8979,10 +8977,10 @@
struct kobject;
struct module;
-diff -NurpP --minimal linux-2.6.17.11/include/linux/types.h linux-2.6.17.11-vs2.0.2/include/linux/types.h
---- linux-2.6.17.11/include/linux/types.h 2006-06-18 04:55:26 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/linux/types.h 2006-08-17 00:28:21 +0200
-@@ -38,6 +38,8 @@ typedef __kernel_uid32_t uid_t;
+diff -NurpP --minimal linux-2.6.18/include/linux/types.h linux-2.6.18-vs2.0.2.1-t6/include/linux/types.h
+--- linux-2.6.18/include/linux/types.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/types.h 2006-09-20 17:01:45 +0200
+@@ -37,6 +37,8 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
typedef __kernel_gid16_t gid16_t;
@@ -8991,9 +8989,9 @@
#ifdef CONFIG_UID16
/* This is defined by include/asm-{arch}/posix_types.h */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vroot.h linux-2.6.17.11-vs2.0.2/include/linux/vroot.h
---- linux-2.6.17.11/include/linux/vroot.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vroot.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vroot.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vroot.h
+--- linux-2.6.18/include/linux/vroot.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vroot.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,51 @@
+
+/*
@@ -9046,9 +9044,9 @@
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vs_base.h linux-2.6.17.11-vs2.0.2/include/linux/vs_base.h
---- linux-2.6.17.11/include/linux/vs_base.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vs_base.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vs_base.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_base.h
+--- linux-2.6.18/include/linux/vs_base.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_base.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,106 @@
+#ifndef _VX_VS_BASE_H
+#define _VX_VS_BASE_H
@@ -9156,9 +9154,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vs_context.h linux-2.6.17.11-vs2.0.2/include/linux/vs_context.h
---- linux-2.6.17.11/include/linux/vs_context.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vs_context.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vs_context.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_context.h
+--- linux-2.6.18/include/linux/vs_context.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_context.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,198 @@
+#ifndef _VX_VS_CONTEXT_H
+#define _VX_VS_CONTEXT_H
@@ -9358,9 +9356,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vs_cvirt.h linux-2.6.17.11-vs2.0.2/include/linux/vs_cvirt.h
---- linux-2.6.17.11/include/linux/vs_cvirt.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vs_cvirt.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vs_cvirt.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_cvirt.h
+--- linux-2.6.18/include/linux/vs_cvirt.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_cvirt.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,108 @@
+#ifndef _VX_VS_CVIRT_H
+#define _VX_VS_CVIRT_H
@@ -9470,9 +9468,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vs_dlimit.h linux-2.6.17.11-vs2.0.2/include/linux/vs_dlimit.h
---- linux-2.6.17.11/include/linux/vs_dlimit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vs_dlimit.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vs_dlimit.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_dlimit.h
+--- linux-2.6.18/include/linux/vs_dlimit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_dlimit.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,213 @@
+#ifndef _VX_VS_DLIMIT_H
+#define _VX_VS_DLIMIT_H
@@ -9687,9 +9685,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vs_limit.h linux-2.6.17.11-vs2.0.2/include/linux/vs_limit.h
---- linux-2.6.17.11/include/linux/vs_limit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vs_limit.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vs_limit.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_limit.h
+--- linux-2.6.18/include/linux/vs_limit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_limit.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,107 @@
+#ifndef _VX_VS_LIMIT_H
+#define _VX_VS_LIMIT_H
@@ -9798,9 +9796,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vs_memory.h linux-2.6.17.11-vs2.0.2/include/linux/vs_memory.h
---- linux-2.6.17.11/include/linux/vs_memory.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vs_memory.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vs_memory.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_memory.h
+--- linux-2.6.18/include/linux/vs_memory.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_memory.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,107 @@
+#ifndef _VX_VS_MEMORY_H
+#define _VX_VS_MEMORY_H
@@ -9909,9 +9907,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vs_network.h linux-2.6.17.11-vs2.0.2/include/linux/vs_network.h
---- linux-2.6.17.11/include/linux/vs_network.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vs_network.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vs_network.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_network.h
+--- linux-2.6.18/include/linux/vs_network.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_network.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,215 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
@@ -10128,9 +10126,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vs_sched.h linux-2.6.17.11-vs2.0.2/include/linux/vs_sched.h
---- linux-2.6.17.11/include/linux/vs_sched.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vs_sched.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vs_sched.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_sched.h
+--- linux-2.6.18/include/linux/vs_sched.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_sched.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,92 @@
+#ifndef _VX_VS_SCHED_H
+#define _VX_VS_SCHED_H
@@ -10224,9 +10222,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vs_socket.h linux-2.6.17.11-vs2.0.2/include/linux/vs_socket.h
---- linux-2.6.17.11/include/linux/vs_socket.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vs_socket.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vs_socket.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_socket.h
+--- linux-2.6.18/include/linux/vs_socket.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vs_socket.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,57 @@
+#ifndef _VX_VS_SOCKET_H
+#define _VX_VS_SOCKET_H
@@ -10285,9 +10283,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/context.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/context.h
---- linux-2.6.17.11/include/linux/vserver/context.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/context.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/context.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/context.h
+--- linux-2.6.18/include/linux/vserver/context.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/context.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,172 @@
+#ifndef _VX_CONTEXT_H
+#define _VX_CONTEXT_H
@@ -10461,9 +10459,9 @@
+#else /* _VX_CONTEXT_H */
+#warning duplicate inclusion
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/context_cmd.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/context_cmd.h
---- linux-2.6.17.11/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/context_cmd.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/context_cmd.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/context_cmd.h
+--- linux-2.6.18/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/context_cmd.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,84 @@
+#ifndef _VX_CONTEXT_CMD_H
+#define _VX_CONTEXT_CMD_H
@@ -10549,9 +10547,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/cvirt.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/cvirt.h
---- linux-2.6.17.11/include/linux/vserver/cvirt.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/cvirt.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/cvirt.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/cvirt.h
+--- linux-2.6.18/include/linux/vserver/cvirt.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/cvirt.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,26 @@
+#ifndef _VX_CVIRT_H
+#define _VX_CVIRT_H
@@ -10579,9 +10577,9 @@
+#else /* _VX_CVIRT_H */
+#warning duplicate inclusion
+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/cvirt_cmd.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/cvirt_cmd.h
---- linux-2.6.17.11/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/cvirt_cmd.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/cvirt_cmd.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/cvirt_cmd.h
+--- linux-2.6.18/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/cvirt_cmd.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,35 @@
+#ifndef _VX_CVIRT_CMD_H
+#define _VX_CVIRT_CMD_H
@@ -10618,9 +10616,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/cvirt_def.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/cvirt_def.h
---- linux-2.6.17.11/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/cvirt_def.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/cvirt_def.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/cvirt_def.h
+--- linux-2.6.18/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/cvirt_def.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,77 @@
+#ifndef _VX_CVIRT_DEF_H
+#define _VX_CVIRT_DEF_H
@@ -10699,9 +10697,9 @@
+};
+
+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/debug.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/debug.h
---- linux-2.6.17.11/include/linux/vserver/debug.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/debug.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/debug.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/debug.h
+--- linux-2.6.18/include/linux/vserver/debug.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/debug.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,298 @@
+#ifndef _VX_DEBUG_H
+#define _VX_DEBUG_H
@@ -11001,9 +10999,9 @@
+
+
+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/debug_cmd.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/debug_cmd.h
---- linux-2.6.17.11/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/debug_cmd.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/debug_cmd.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/debug_cmd.h
+--- linux-2.6.18/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/debug_cmd.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,14 @@
+#ifndef _VX_DEBUG_CMD_H
+#define _VX_DEBUG_CMD_H
@@ -11019,9 +11017,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/dlimit.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/dlimit.h
---- linux-2.6.17.11/include/linux/vserver/dlimit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/dlimit.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/dlimit.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/dlimit.h
+--- linux-2.6.18/include/linux/vserver/dlimit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/dlimit.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,53 @@
+#ifndef _VX_DLIMIT_H
+#define _VX_DLIMIT_H
@@ -11076,9 +11074,9 @@
+#else /* _VX_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/dlimit_cmd.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/dlimit_cmd.h
---- linux-2.6.17.11/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/dlimit_cmd.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/dlimit_cmd.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/dlimit_cmd.h
+--- linux-2.6.18/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/dlimit_cmd.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,69 @@
+#ifndef _VX_DLIMIT_CMD_H
+#define _VX_DLIMIT_CMD_H
@@ -11149,9 +11147,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/inode.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/inode.h
---- linux-2.6.17.11/include/linux/vserver/inode.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/inode.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/inode.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/inode.h
+--- linux-2.6.18/include/linux/vserver/inode.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/inode.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,38 @@
+#ifndef _VX_INODE_H
+#define _VX_INODE_H
@@ -11191,9 +11189,9 @@
+#else /* _VX_INODE_H */
+#warning duplicate inclusion
+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/inode_cmd.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/inode_cmd.h
---- linux-2.6.17.11/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/inode_cmd.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/inode_cmd.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/inode_cmd.h
+--- linux-2.6.18/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/inode_cmd.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,59 @@
+#ifndef _VX_INODE_CMD_H
+#define _VX_INODE_CMD_H
@@ -11254,9 +11252,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/legacy.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/legacy.h
---- linux-2.6.17.11/include/linux/vserver/legacy.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/legacy.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/legacy.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/legacy.h
+--- linux-2.6.18/include/linux/vserver/legacy.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/legacy.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,49 @@
+#ifndef _VX_LEGACY_H
+#define _VX_LEGACY_H
@@ -11307,9 +11305,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LEGACY_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/limit.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/limit.h
---- linux-2.6.17.11/include/linux/vserver/limit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/limit.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/limit.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/limit.h
+--- linux-2.6.18/include/linux/vserver/limit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/limit.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,20 @@
+#ifndef _VX_LIMIT_H
+#define _VX_LIMIT_H
@@ -11331,9 +11329,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/limit_cmd.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/limit_cmd.h
---- linux-2.6.17.11/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/limit_cmd.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/limit_cmd.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/limit_cmd.h
+--- linux-2.6.18/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/limit_cmd.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,55 @@
+#ifndef _VX_LIMIT_CMD_H
+#define _VX_LIMIT_CMD_H
@@ -11390,9 +11388,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/limit_def.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/limit_def.h
---- linux-2.6.17.11/include/linux/vserver/limit_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/limit_def.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/limit_def.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/limit_def.h
+--- linux-2.6.18/include/linux/vserver/limit_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/limit_def.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,22 @@
+#ifndef _VX_LIMIT_DEF_H
+#define _VX_LIMIT_DEF_H
@@ -11416,9 +11414,9 @@
+
+
+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/limit_int.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/limit_int.h
---- linux-2.6.17.11/include/linux/vserver/limit_int.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/limit_int.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/limit_int.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/limit_int.h
+--- linux-2.6.18/include/linux/vserver/limit_int.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/limit_int.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,76 @@
+#ifndef _VX_LIMIT_INT_H
+#define _VX_LIMIT_INT_H
@@ -11496,9 +11494,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/namespace.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/namespace.h
---- linux-2.6.17.11/include/linux/vserver/namespace.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/namespace.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/namespace.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/namespace.h
+--- linux-2.6.18/include/linux/vserver/namespace.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/namespace.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,15 @@
+#ifndef _VX_NAMESPACE_H
+#define _VX_NAMESPACE_H
@@ -11515,9 +11513,9 @@
+#else /* _VX_NAMESPACE_H */
+#warning duplicate inclusion
+#endif /* _VX_NAMESPACE_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/namespace_cmd.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/namespace_cmd.h
---- linux-2.6.17.11/include/linux/vserver/namespace_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/namespace_cmd.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/namespace_cmd.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/namespace_cmd.h
+--- linux-2.6.18/include/linux/vserver/namespace_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/namespace_cmd.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,17 @@
+#ifndef _VX_NAMESPACE_CMD_H
+#define _VX_NAMESPACE_CMD_H
@@ -11536,9 +11534,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_NAMESPACE_CMD_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/network.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/network.h
---- linux-2.6.17.11/include/linux/vserver/network.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/network.h 2006-08-25 04:33:07 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/network.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/network.h
+--- linux-2.6.18/include/linux/vserver/network.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/network.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,119 @@
+#ifndef _VX_NETWORK_H
+#define _VX_NETWORK_H
@@ -11659,9 +11657,9 @@
+#else /* _VX_NETWORK_H */
+#warning duplicate inclusion
+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/network_cmd.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/network_cmd.h
---- linux-2.6.17.11/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/network_cmd.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/network_cmd.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/network_cmd.h
+--- linux-2.6.18/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/network_cmd.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,89 @@
+#ifndef _VX_NETWORK_CMD_H
+#define _VX_NETWORK_CMD_H
@@ -11752,9 +11750,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/sched.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/sched.h
---- linux-2.6.17.11/include/linux/vserver/sched.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/sched.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/sched.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/sched.h
+--- linux-2.6.18/include/linux/vserver/sched.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/sched.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,26 @@
+#ifndef _VX_SCHED_H
+#define _VX_SCHED_H
@@ -11782,9 +11780,9 @@
+#else /* _VX_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VX_SCHED_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/sched_cmd.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/sched_cmd.h
---- linux-2.6.17.11/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/sched_cmd.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/sched_cmd.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/sched_cmd.h
+--- linux-2.6.18/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/sched_cmd.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,48 @@
+#ifndef _VX_SCHED_CMD_H
+#define _VX_SCHED_CMD_H
@@ -11834,9 +11832,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/sched_def.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/sched_def.h
---- linux-2.6.17.11/include/linux/vserver/sched_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/sched_def.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/sched_def.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/sched_def.h
+--- linux-2.6.18/include/linux/vserver/sched_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/sched_def.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,38 @@
+#ifndef _VX_SCHED_DEF_H
+#define _VX_SCHED_DEF_H
@@ -11876,9 +11874,9 @@
+};
+
+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/signal.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/signal.h
---- linux-2.6.17.11/include/linux/vserver/signal.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/signal.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/signal.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/signal.h
+--- linux-2.6.18/include/linux/vserver/signal.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/signal.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,14 @@
+#ifndef _VX_SIGNAL_H
+#define _VX_SIGNAL_H
@@ -11894,9 +11892,9 @@
+#else /* _VX_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/signal_cmd.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/signal_cmd.h
---- linux-2.6.17.11/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/signal_cmd.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/signal_cmd.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/signal_cmd.h
+--- linux-2.6.18/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/signal_cmd.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,26 @@
+#ifndef _VX_SIGNAL_CMD_H
+#define _VX_SIGNAL_CMD_H
@@ -11924,9 +11922,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/switch.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/switch.h
---- linux-2.6.17.11/include/linux/vserver/switch.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/switch.h 2006-08-25 05:12:39 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/switch.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/switch.h
+--- linux-2.6.18/include/linux/vserver/switch.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/switch.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,98 @@
+#ifndef _VX_SWITCH_H
+#define _VX_SWITCH_H
@@ -12026,9 +12024,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _VX_SWITCH_H */
-diff -NurpP --minimal linux-2.6.17.11/include/linux/vserver/xid.h linux-2.6.17.11-vs2.0.2/include/linux/vserver/xid.h
---- linux-2.6.17.11/include/linux/vserver/xid.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/include/linux/vserver/xid.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/include/linux/vserver/xid.h linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/xid.h
+--- linux-2.6.18/include/linux/vserver/xid.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/include/linux/vserver/xid.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,146 @@
+#ifndef _VX_XID_H
+#define _VX_XID_H
@@ -12176,10 +12174,10 @@
+void vx_propagate_xid(struct nameidata *nd, struct inode *inode);
+
+#endif /* _VX_XID_H */
-diff -NurpP --minimal linux-2.6.17.11/include/net/af_unix.h linux-2.6.17.11-vs2.0.2/include/net/af_unix.h
---- linux-2.6.17.11/include/net/af_unix.h 2006-06-18 04:55:27 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/net/af_unix.h 2006-08-17 00:28:21 +0200
-@@ -18,9 +18,9 @@ extern spinlock_t unix_table_lock;
+diff -NurpP --minimal linux-2.6.18/include/net/af_unix.h linux-2.6.18-vs2.0.2.1-t6/include/net/af_unix.h
+--- linux-2.6.18/include/net/af_unix.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/net/af_unix.h 2006-09-20 17:01:45 +0200
+@@ -17,9 +17,9 @@ extern spinlock_t unix_table_lock;
extern atomic_t unix_tot_inflight;
@@ -12191,7 +12189,7 @@
if (!hlist_empty(&unix_socket_table[*i]))
return __sk_head(&unix_socket_table[*i]);
}
-@@ -29,16 +29,19 @@ static inline struct sock *first_unix_so
+@@ -28,16 +28,19 @@ static inline struct sock *first_unix_so
static inline struct sock *next_unix_socket(int *i, struct sock *s)
{
@@ -12221,10 +12219,10 @@
}
#define forall_unix_sockets(i, s) \
-diff -NurpP --minimal linux-2.6.17.11/include/net/inet_hashtables.h linux-2.6.17.11-vs2.0.2/include/net/inet_hashtables.h
---- linux-2.6.17.11/include/net/inet_hashtables.h 2006-04-09 13:49:58 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/net/inet_hashtables.h 2006-08-17 00:28:21 +0200
-@@ -272,6 +272,25 @@ static inline int inet_iif(const struct
+diff -NurpP --minimal linux-2.6.18/include/net/inet_hashtables.h linux-2.6.18-vs2.0.2.1-t6/include/net/inet_hashtables.h
+--- linux-2.6.18/include/net/inet_hashtables.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/net/inet_hashtables.h 2006-09-20 17:01:45 +0200
+@@ -271,6 +271,25 @@ static inline int inet_iif(const struct
return ((struct rtable *)skb->dst)->rt_iif;
}
@@ -12250,7 +12248,7 @@
extern struct sock *__inet_lookup_listener(const struct hlist_head *head,
const u32 daddr,
const unsigned short hnum,
-@@ -292,7 +311,7 @@ static inline struct sock *
+@@ -291,7 +310,7 @@ static inline struct sock *
const struct inet_sock *inet = inet_sk((sk = __sk_head(head)));
if (inet->num == hnum && !sk->sk_node.next &&
@@ -12259,10 +12257,10 @@
(sk->sk_family == PF_INET || !ipv6_only_sock(sk)) &&
!sk->sk_bound_dev_if)
goto sherry_cache;
-diff -NurpP --minimal linux-2.6.17.11/include/net/inet_sock.h linux-2.6.17.11-vs2.0.2/include/net/inet_sock.h
---- linux-2.6.17.11/include/net/inet_sock.h 2006-04-09 13:49:58 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/net/inet_sock.h 2006-08-17 00:28:21 +0200
-@@ -115,6 +115,7 @@ struct inet_sock {
+diff -NurpP --minimal linux-2.6.18/include/net/inet_sock.h linux-2.6.18-vs2.0.2.1-t6/include/net/inet_sock.h
+--- linux-2.6.18/include/net/inet_sock.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/net/inet_sock.h 2006-09-20 17:01:45 +0200
+@@ -114,6 +114,7 @@ struct inet_sock {
/* Socket demultiplex comparisons on incoming packets. */
__u32 daddr;
__u32 rcv_saddr;
@@ -12270,10 +12268,10 @@
__u16 dport;
__u16 num;
__u32 saddr;
-diff -NurpP --minimal linux-2.6.17.11/include/net/inet_timewait_sock.h linux-2.6.17.11-vs2.0.2/include/net/inet_timewait_sock.h
---- linux-2.6.17.11/include/net/inet_timewait_sock.h 2006-06-18 04:55:27 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/net/inet_timewait_sock.h 2006-08-17 00:28:21 +0200
-@@ -116,6 +116,10 @@ struct inet_timewait_sock {
+diff -NurpP --minimal linux-2.6.18/include/net/inet_timewait_sock.h linux-2.6.18-vs2.0.2.1-t6/include/net/inet_timewait_sock.h
+--- linux-2.6.18/include/net/inet_timewait_sock.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/net/inet_timewait_sock.h 2006-09-20 17:01:45 +0200
+@@ -115,6 +115,10 @@ struct inet_timewait_sock {
#define tw_refcnt __tw_common.skc_refcnt
#define tw_hash __tw_common.skc_hash
#define tw_prot __tw_common.skc_prot
@@ -12284,10 +12282,10 @@
volatile unsigned char tw_substate;
/* 3 bits hole, try to pack */
unsigned char tw_rcv_wscale;
-diff -NurpP --minimal linux-2.6.17.11/include/net/route.h linux-2.6.17.11-vs2.0.2/include/net/route.h
---- linux-2.6.17.11/include/net/route.h 2006-06-18 04:55:28 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/net/route.h 2006-08-17 00:28:21 +0200
-@@ -28,11 +28,14 @@
+diff -NurpP --minimal linux-2.6.18/include/net/route.h linux-2.6.18-vs2.0.2.1-t6/include/net/route.h
+--- linux-2.6.18/include/net/route.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/net/route.h 2006-09-20 17:01:45 +0200
+@@ -27,11 +27,14 @@
#include <net/dst.h>
#include <net/inetpeer.h>
#include <net/flow.h>
@@ -12302,7 +12300,7 @@
#ifndef __KERNEL__
#warning This file is not supposed to be used outside of kernel.
-@@ -144,6 +147,59 @@ static inline char rt_tos2priority(u8 to
+@@ -143,6 +146,59 @@ static inline char rt_tos2priority(u8 to
return ip_tos2prio[IPTOS_TOS(tos)>>1];
}
@@ -12362,7 +12360,7 @@
static inline int ip_route_connect(struct rtable **rp, u32 dst,
u32 src, u32 tos, int oif, u8 protocol,
u16 sport, u16 dport, struct sock *sk)
-@@ -158,7 +214,27 @@ static inline int ip_route_connect(struc
+@@ -157,7 +213,27 @@ static inline int ip_route_connect(struc
.dport = dport } } };
int err;
@@ -12391,10 +12389,10 @@
err = __ip_route_output_key(rp, &fl);
if (err)
return err;
-diff -NurpP --minimal linux-2.6.17.11/include/net/sock.h linux-2.6.17.11-vs2.0.2/include/net/sock.h
---- linux-2.6.17.11/include/net/sock.h 2006-06-18 04:55:28 +0200
-+++ linux-2.6.17.11-vs2.0.2/include/net/sock.h 2006-08-17 00:28:21 +0200
-@@ -115,6 +115,10 @@ struct sock_common {
+diff -NurpP --minimal linux-2.6.18/include/net/sock.h linux-2.6.18-vs2.0.2.1-t6/include/net/sock.h
+--- linux-2.6.18/include/net/sock.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/include/net/sock.h 2006-09-20 17:01:45 +0200
+@@ -118,6 +118,10 @@ struct sock_common {
atomic_t skc_refcnt;
unsigned int skc_hash;
struct proto *skc_prot;
@@ -12405,7 +12403,7 @@
};
/**
-@@ -189,6 +193,10 @@ struct sock {
+@@ -194,6 +198,10 @@ struct sock {
#define sk_refcnt __sk_common.skc_refcnt
#define sk_hash __sk_common.skc_hash
#define sk_prot __sk_common.skc_prot
@@ -12416,11 +12414,11 @@
unsigned char sk_shutdown : 2,
sk_no_check : 2,
sk_userlocks : 4;
-diff -NurpP --minimal linux-2.6.17.11/ipc/mqueue.c linux-2.6.17.11-vs2.0.2/ipc/mqueue.c
---- linux-2.6.17.11/ipc/mqueue.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.11-vs2.0.2/ipc/mqueue.c 2006-08-17 00:28:21 +0200
-@@ -26,6 +26,8 @@
- #include <linux/syscalls.h>
+diff -NurpP --minimal linux-2.6.18/ipc/mqueue.c linux-2.6.18-vs2.0.2.1-t6/ipc/mqueue.c
+--- linux-2.6.18/ipc/mqueue.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/ipc/mqueue.c 2006-09-20 17:01:45 +0200
+@@ -29,6 +29,8 @@
+ #include <linux/audit.h>
#include <linux/signal.h>
#include <linux/mutex.h>
+#include <linux/vs_context.h>
@@ -12428,7 +12426,7 @@
#include <net/sock.h>
#include "util.h"
-@@ -149,17 +151,20 @@ static struct inode *mqueue_get_inode(st
+@@ -152,17 +154,20 @@ static struct inode *mqueue_get_inode(st
spin_lock(&mq_lock);
if (u->mq_bytes + mq_bytes < u->mq_bytes ||
u->mq_bytes + mq_bytes >
@@ -12450,7 +12448,7 @@
spin_unlock(&mq_lock);
goto out_inode;
}
-@@ -257,10 +262,14 @@ static void mqueue_delete_inode(struct i
+@@ -260,10 +265,14 @@ static void mqueue_delete_inode(struct i
(info->attr.mq_maxmsg * info->attr.mq_msgsize));
user = info->user;
if (user) {
@@ -12465,7 +12463,7 @@
free_uid(user);
}
}
-@@ -739,7 +748,7 @@ asmlinkage long sys_mq_unlink(const char
+@@ -746,7 +755,7 @@ asmlinkage long sys_mq_unlink(const char
if (inode)
atomic_inc(&inode->i_count);
@@ -12474,18 +12472,18 @@
out_err:
dput(dentry);
-diff -NurpP --minimal linux-2.6.17.11/ipc/msg.c linux-2.6.17.11-vs2.0.2/ipc/msg.c
---- linux-2.6.17.11/ipc/msg.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.11-vs2.0.2/ipc/msg.c 2006-08-17 00:28:21 +0200
-@@ -105,6 +105,7 @@ static int newque (key_t key, int msgflg
+diff -NurpP --minimal linux-2.6.18/ipc/msg.c linux-2.6.18-vs2.0.2.1-t6/ipc/msg.c
+--- linux-2.6.18/ipc/msg.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/ipc/msg.c 2006-09-20 17:01:45 +0200
+@@ -103,6 +103,7 @@ static int newque(key_t key, int msgflg)
- msq->q_perm.mode = (msgflg & S_IRWXUGO);
+ msq->q_perm.mode = msgflg & S_IRWXUGO;
msq->q_perm.key = key;
+ msq->q_perm.xid = vx_current_xid();
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-@@ -826,6 +827,9 @@ static int sysvipc_msg_proc_show(struct
+@@ -847,6 +848,9 @@ static int sysvipc_msg_proc_show(struct
{
struct msg_queue *msq = it;
@@ -12493,12 +12491,12 @@
+ return 0;
+
return seq_printf(s,
- "%10d %10d %4o %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n",
- msq->q_perm.key,
-diff -NurpP --minimal linux-2.6.17.11/ipc/sem.c linux-2.6.17.11-vs2.0.2/ipc/sem.c
---- linux-2.6.17.11/ipc/sem.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.11-vs2.0.2/ipc/sem.c 2006-08-17 00:28:21 +0200
-@@ -184,6 +184,7 @@ static int newary (key_t key, int nsems,
+ "%10d %10d %4o %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n",
+ msq->q_perm.key,
+diff -NurpP --minimal linux-2.6.18/ipc/sem.c linux-2.6.18-vs2.0.2.1-t6/ipc/sem.c
+--- linux-2.6.18/ipc/sem.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/ipc/sem.c 2006-09-20 17:01:45 +0200
+@@ -183,6 +183,7 @@ static int newary (key_t key, int nsems,
sma->sem_perm.mode = (semflg & S_IRWXUGO);
sma->sem_perm.key = key;
@@ -12506,7 +12504,7 @@
sma->sem_perm.security = NULL;
retval = security_sem_alloc(sma);
-@@ -1345,6 +1346,9 @@ static int sysvipc_sem_proc_show(struct
+@@ -1346,6 +1347,9 @@ static int sysvipc_sem_proc_show(struct
{
struct sem_array *sma = it;
@@ -12516,10 +12514,10 @@
return seq_printf(s,
"%10d %10d %4o %10lu %5u %5u %5u %5u %10lu %10lu\n",
sma->sem_perm.key,
-diff -NurpP --minimal linux-2.6.17.11/ipc/shm.c linux-2.6.17.11-vs2.0.2/ipc/shm.c
---- linux-2.6.17.11/ipc/shm.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.11-vs2.0.2/ipc/shm.c 2006-08-17 00:28:21 +0200
-@@ -33,6 +33,8 @@
+diff -NurpP --minimal linux-2.6.18/ipc/shm.c linux-2.6.18-vs2.0.2.1-t6/ipc/shm.c
+--- linux-2.6.18/ipc/shm.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/ipc/shm.c 2006-09-20 17:01:45 +0200
+@@ -32,6 +32,8 @@
#include <linux/ptrace.h>
#include <linux/seq_file.h>
#include <linux/mutex.h>
@@ -12528,7 +12526,7 @@
#include <asm/uaccess.h>
-@@ -117,7 +119,12 @@ static void shm_open (struct vm_area_str
+@@ -116,7 +118,12 @@ static void shm_open (struct vm_area_str
*/
static void shm_destroy (struct shmid_kernel *shp)
{
@@ -12542,7 +12540,7 @@
shm_rmid (shp->id);
shm_unlock(shp);
if (!is_file_hugepages(shp->shm_file))
-@@ -127,6 +134,7 @@ static void shm_destroy (struct shmid_ke
+@@ -126,6 +133,7 @@ static void shm_destroy (struct shmid_ke
shp->mlock_user);
fput (shp->shm_file);
security_shm_free(shp);
@@ -12550,7 +12548,7 @@
ipc_rcu_putref(shp);
}
-@@ -203,12 +211,15 @@ static int newseg (key_t key, int shmflg
+@@ -202,12 +210,15 @@ static int newseg (key_t key, int shmflg
if (shm_tot + numpages >= shm_ctlall)
return -ENOSPC;
@@ -12566,7 +12564,7 @@
shp->shm_perm.mode = (shmflg & S_IRWXUGO);
shp->mlock_user = NULL;
-@@ -259,6 +270,7 @@ static int newseg (key_t key, int shmflg
+@@ -258,6 +269,7 @@ static int newseg (key_t key, int shmflg
file->f_op = &shm_file_operations;
shm_tot += numpages;
@@ -12574,7 +12572,7 @@
shm_unlock(shp);
return shp->id;
-@@ -914,6 +926,9 @@ static int sysvipc_shm_proc_show(struct
+@@ -910,6 +922,9 @@ static int sysvipc_shm_proc_show(struct
#define SMALL_STRING "%10d %10d %4o %10u %5u %5u %5d %5u %5u %5u %5u %10lu %10lu %10lu\n"
#define BIG_STRING "%10d %10d %4o %21u %5u %5u %5d %5u %5u %5u %5u %10lu %10lu %10lu\n"
@@ -12584,10 +12582,10 @@
if (sizeof(size_t) <= sizeof(int))
format = SMALL_STRING;
else
-diff -NurpP --minimal linux-2.6.17.11/ipc/util.c linux-2.6.17.11-vs2.0.2/ipc/util.c
---- linux-2.6.17.11/ipc/util.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.11-vs2.0.2/ipc/util.c 2006-08-17 00:28:21 +0200
-@@ -158,7 +158,9 @@ int ipc_findkey(struct ipc_ids* ids, key
+diff -NurpP --minimal linux-2.6.18/ipc/util.c linux-2.6.18-vs2.0.2.1-t6/ipc/util.c
+--- linux-2.6.18/ipc/util.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/ipc/util.c 2006-09-20 17:01:45 +0200
+@@ -157,7 +157,9 @@ int ipc_findkey(struct ipc_ids* ids, key
*/
for (id = 0; id <= max_id; id++) {
p = ids->entries->p[id];
@@ -12598,7 +12596,7 @@
continue;
if (key == p->key)
return id;
-@@ -471,6 +473,9 @@ int ipcperms (struct kern_ipc_perm *ipcp
+@@ -470,6 +472,9 @@ int ipcperms (struct kern_ipc_perm *ipcp
if (unlikely((err = audit_ipc_obj(ipcp))))
return err;
@@ -12608,21 +12606,21 @@
requested_mode = (flag >> 6) | (flag >> 3) | flag;
granted_mode = ipcp->mode;
if (current->euid == ipcp->cuid || current->euid == ipcp->uid)
-diff -NurpP --minimal linux-2.6.17.11/kernel/Makefile linux-2.6.17.11-vs2.0.2/kernel/Makefile
---- linux-2.6.17.11/kernel/Makefile 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/Makefile 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/Makefile linux-2.6.18-vs2.0.2.1-t6/kernel/Makefile
+--- linux-2.6.18/kernel/Makefile 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/Makefile 2006-09-20 17:38:59 +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
+ hrtimer.o rwsem.o
+obj-y += vserver/
+
+ obj-$(CONFIG_STACKTRACE) += stacktrace.o
+ obj-y += time/
obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
- obj-$(CONFIG_FUTEX) += futex.o
- ifeq ($(CONFIG_COMPAT),y)
-diff -NurpP --minimal linux-2.6.17.11/kernel/capability.c linux-2.6.17.11-vs2.0.2/kernel/capability.c
---- linux-2.6.17.11/kernel/capability.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/capability.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/capability.c linux-2.6.18-vs2.0.2.1-t6/kernel/capability.c
+--- linux-2.6.18/kernel/capability.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/capability.c 2006-09-20 17:01:45 +0200
@@ -12,6 +12,7 @@
#include <linux/module.h>
#include <linux/security.h>
@@ -12641,9 +12639,9 @@
return __capable(current, cap);
}
EXPORT_SYMBOL(capable);
-diff -NurpP --minimal linux-2.6.17.11/kernel/cpuset.c linux-2.6.17.11-vs2.0.2/kernel/cpuset.c
---- linux-2.6.17.11/kernel/cpuset.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/cpuset.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/cpuset.c linux-2.6.18-vs2.0.2.1-t6/kernel/cpuset.c
+--- linux-2.6.18/kernel/cpuset.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/cpuset.c 2006-09-20 17:01:45 +0200
@@ -49,6 +49,7 @@
#include <linux/time.h>
#include <linux/backing-dev.h>
@@ -12652,13 +12650,13 @@
#include <asm/uaccess.h>
#include <asm/atomic.h>
-diff -NurpP --minimal linux-2.6.17.11/kernel/exit.c linux-2.6.17.11-vs2.0.2/kernel/exit.c
---- linux-2.6.17.11/kernel/exit.c 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/exit.c 2006-08-17 00:28:21 +0200
-@@ -36,6 +36,10 @@
- #include <linux/compat.h>
+diff -NurpP --minimal linux-2.6.18/kernel/exit.c linux-2.6.18-vs2.0.2.1-t6/kernel/exit.c
+--- linux-2.6.18/kernel/exit.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/exit.c 2006-09-20 17:38:33 +0200
+@@ -38,6 +38,10 @@
#include <linux/pipe_fs_i.h>
#include <linux/audit.h> /* for audit_free() */
+ #include <linux/resource.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
@@ -12666,7 +12664,7 @@
#include <asm/uaccess.h>
#include <asm/unistd.h>
-@@ -449,6 +453,7 @@ static void close_files(struct files_str
+@@ -444,9 +448,11 @@ static void close_files(struct files_str
struct file * file = xchg(&fdt->fd[i], NULL);
if (file)
filp_close(file, files);
@@ -12674,9 +12672,13 @@
}
i++;
set >>= 1;
-@@ -591,6 +596,11 @@ static void exit_mm(struct task_struct *
-
- static inline void choose_new_parent(task_t *p, task_t *reaper)
++ cond_resched();
+ }
+ }
+ }
+@@ -587,6 +593,11 @@ static void exit_mm(struct task_struct *
+ static inline void
+ choose_new_parent(struct task_struct *p, struct task_struct *reaper)
{
+ /* check for reaper context */
+ vxwprintk((p->xid != reaper->xid) && (reaper != child_reaper),
@@ -12686,7 +12688,7 @@
/*
* Make sure we're not reparenting to ourselves and that
* the parent is not a zombie.
-@@ -672,7 +682,7 @@ static void forget_original_parent(struc
+@@ -669,7 +680,7 @@ forget_original_parent(struct task_struc
do {
reaper = next_thread(reaper);
if (reaper == father) {
@@ -12695,7 +12697,7 @@
break;
}
} while (reaper->exit_state);
-@@ -696,7 +706,7 @@ static void forget_original_parent(struc
+@@ -693,7 +704,7 @@ forget_original_parent(struct task_struc
if (father == p->real_parent) {
/* reparent with a reaper, real father it's us */
@@ -12704,7 +12706,7 @@
reparent_thread(p, father, 0);
} else {
/* reparent ptraced task to its real parent */
-@@ -911,6 +921,8 @@ fastcall NORET_TYPE void do_exit(long co
+@@ -917,6 +928,8 @@ fastcall NORET_TYPE void do_exit(long co
__exit_files(tsk);
__exit_fs(tsk);
exit_namespace(tsk);
@@ -12713,13 +12715,13 @@
exit_thread();
cpuset_exit(tsk);
exit_keys(tsk);
-diff -NurpP --minimal linux-2.6.17.11/kernel/fork.c linux-2.6.17.11-vs2.0.2/kernel/fork.c
---- linux-2.6.17.11/kernel/fork.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/fork.c 2006-08-17 00:28:21 +0200
-@@ -44,6 +44,10 @@
- #include <linux/rmap.h>
- #include <linux/acct.h>
+diff -NurpP --minimal linux-2.6.18/kernel/fork.c linux-2.6.18-vs2.0.2.1-t6/kernel/fork.c
+--- linux-2.6.18/kernel/fork.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/fork.c 2006-09-20 17:35:08 +0200
+@@ -45,6 +45,10 @@
#include <linux/cn_proc.h>
+ #include <linux/delayacct.h>
+ #include <linux/taskstats_kern.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
@@ -12727,16 +12729,16 @@
#include <asm/pgtable.h>
#include <asm/pgalloc.h>
-@@ -104,6 +108,8 @@ static kmem_cache_t *mm_cachep;
- void free_task(struct task_struct *tsk)
+@@ -104,6 +108,8 @@ void free_task(struct task_struct *tsk)
{
free_thread_info(tsk->thread_info);
+ rt_mutex_debug_task_free(tsk);
+ clr_vx_info(&tsk->vx_info);
+ clr_nx_info(&tsk->nx_info);
free_task_struct(tsk);
}
EXPORT_SYMBOL(free_task);
-@@ -201,6 +207,8 @@ static inline int dup_mmap(struct mm_str
+@@ -205,6 +211,8 @@ static inline int dup_mmap(struct mm_str
mm->free_area_cache = oldmm->mmap_base;
mm->cached_hole_size = ~0UL;
mm->map_count = 0;
@@ -12745,7 +12747,7 @@
cpus_clear(mm->cpu_vm_mask);
mm->mm_rb = RB_ROOT;
rb_link = &mm->mm_rb.rb_node;
-@@ -212,7 +220,7 @@ static inline int dup_mmap(struct mm_str
+@@ -216,7 +224,7 @@ static inline int dup_mmap(struct mm_str
if (mpnt->vm_flags & VM_DONTCOPY) {
long pages = vma_pages(mpnt);
@@ -12754,7 +12756,7 @@
vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
-pages);
continue;
-@@ -319,8 +327,6 @@ static struct mm_struct * mm_init(struct
+@@ -323,8 +331,6 @@ static struct mm_struct * mm_init(struct
INIT_LIST_HEAD(&mm->mmlist);
mm->core_waiters = 0;
mm->nr_ptes = 0;
@@ -12763,7 +12765,7 @@
spin_lock_init(&mm->page_table_lock);
rwlock_init(&mm->ioctx_list_lock);
mm->ioctx_list = NULL;
-@@ -329,6 +335,7 @@ static struct mm_struct * mm_init(struct
+@@ -333,6 +339,7 @@ static struct mm_struct * mm_init(struct
if (likely(!mm_alloc_pgd(mm))) {
mm->def_flags = 0;
@@ -12771,7 +12773,7 @@
return mm;
}
free_mm(mm);
-@@ -360,6 +367,7 @@ void fastcall __mmdrop(struct mm_struct
+@@ -364,6 +371,7 @@ void fastcall __mmdrop(struct mm_struct
BUG_ON(mm == &init_mm);
mm_free_pgd(mm);
destroy_context(mm);
@@ -12779,7 +12781,7 @@
free_mm(mm);
}
-@@ -463,6 +471,7 @@ static struct mm_struct *dup_mm(struct t
+@@ -469,6 +477,7 @@ static struct mm_struct *dup_mm(struct t
goto fail_nomem;
memcpy(mm, oldmm, sizeof(*mm));
@@ -12787,7 +12789,7 @@
if (!mm_init(mm))
goto fail_nomem;
-@@ -490,6 +499,7 @@ fail_nocontext:
+@@ -496,6 +505,7 @@ fail_nocontext:
* If init_new_context() failed, we cannot use mmput() to free the mm
* because it calls destroy_context()
*/
@@ -12795,7 +12797,7 @@
mm_free_pgd(mm);
free_mm(mm);
return NULL;
-@@ -683,6 +693,8 @@ static struct files_struct *dup_fd(struc
+@@ -691,6 +701,8 @@ static struct files_struct *dup_fd(struc
struct file *f = *old_fds++;
if (f) {
get_file(f);
@@ -12804,7 +12806,7 @@
} else {
/*
* The fd may be claimed in the fd bitmap but not yet
-@@ -927,6 +939,8 @@ static task_t *copy_process(unsigned lon
+@@ -947,6 +959,8 @@ static struct task_struct *copy_process(
{
int retval;
struct task_struct *p = NULL;
@@ -12813,10 +12815,10 @@
if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
return ERR_PTR(-EINVAL);
-@@ -955,12 +969,30 @@ static task_t *copy_process(unsigned lon
- if (!p)
- goto fork_out;
-
+@@ -979,12 +993,30 @@ static struct task_struct *copy_process(
+ DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
+ DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
+ #endif
+ init_vx_info(&p->vx_info, current->vx_info);
+ init_nx_info(&p->nx_info, current->nx_info);
+
@@ -12845,7 +12847,7 @@
}
atomic_inc(&p->user->__count);
-@@ -1212,6 +1244,18 @@ static task_t *copy_process(unsigned lon
+@@ -1247,6 +1279,18 @@ static struct task_struct *copy_process(
total_forks++;
spin_unlock(¤t->sighand->siglock);
@@ -12864,7 +12866,7 @@
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
return p;
-@@ -1252,6 +1296,9 @@ bad_fork_cleanup_count:
+@@ -1288,6 +1332,9 @@ bad_fork_cleanup_count:
put_group_info(p->group_info);
atomic_dec(&p->user->processes);
free_uid(p->user);
@@ -12874,20 +12876,20 @@
bad_fork_free:
free_task(p);
fork_out:
-diff -NurpP --minimal linux-2.6.17.11/kernel/futex.c linux-2.6.17.11-vs2.0.2/kernel/futex.c
---- linux-2.6.17.11/kernel/futex.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/futex.c 2006-08-17 00:28:21 +0200
-@@ -44,6 +44,7 @@
+diff -NurpP --minimal linux-2.6.18/kernel/futex.c linux-2.6.18-vs2.0.2.1-t6/kernel/futex.c
+--- linux-2.6.18/kernel/futex.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/futex.c 2006-09-20 17:01:45 +0200
+@@ -48,6 +48,7 @@
#include <linux/pagemap.h>
#include <linux/syscalls.h>
#include <linux/signal.h>
+#include <linux/vs_cvirt.h>
#include <asm/futex.h>
- #define FUTEX_HASHBITS (CONFIG_BASE_SMALL ? 4 : 8)
-diff -NurpP --minimal linux-2.6.17.11/kernel/futex_compat.c linux-2.6.17.11-vs2.0.2/kernel/futex_compat.c
---- linux-2.6.17.11/kernel/futex_compat.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/futex_compat.c 2006-08-17 00:28:21 +0200
+ #include "rtmutex_common.h"
+diff -NurpP --minimal linux-2.6.18/kernel/futex_compat.c linux-2.6.18-vs2.0.2.1-t6/kernel/futex_compat.c
+--- linux-2.6.18/kernel/futex_compat.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/futex_compat.c 2006-09-20 17:01:45 +0200
@@ -9,6 +9,7 @@
#include <linux/linkage.h>
#include <linux/compat.h>
@@ -12896,10 +12898,10 @@
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.17.11/kernel/kthread.c linux-2.6.17.11-vs2.0.2/kernel/kthread.c
---- linux-2.6.17.11/kernel/kthread.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/kthread.c 2006-08-17 00:28:21 +0200
-@@ -116,7 +116,7 @@ static void keventd_create_kthread(void
+diff -NurpP --minimal linux-2.6.18/kernel/kthread.c linux-2.6.18-vs2.0.2.1-t6/kernel/kthread.c
+--- linux-2.6.18/kernel/kthread.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/kthread.c 2006-09-20 17:01:45 +0200
+@@ -123,7 +123,7 @@ static void keventd_create_kthread(void
} else {
wait_for_completion(&create->started);
read_lock(&tasklist_lock);
@@ -12908,9 +12910,21 @@
read_unlock(&tasklist_lock);
}
complete(&create->done);
-diff -NurpP --minimal linux-2.6.17.11/kernel/posix-cpu-timers.c linux-2.6.17.11-vs2.0.2/kernel/posix-cpu-timers.c
---- linux-2.6.17.11/kernel/posix-cpu-timers.c 2006-06-18 04:55:30 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/posix-cpu-timers.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/pid.c linux-2.6.18-vs2.0.2.1-t6/kernel/pid.c
+--- linux-2.6.18/kernel/pid.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/pid.c 2006-09-20 19:28:41 +0200
+@@ -260,6 +260,8 @@ struct task_struct * fastcall pid_task(s
+ first = rcu_dereference(pid->tasks[type].first);
+ if (first)
+ result = hlist_entry(first, struct task_struct, pids[(type)].node);
++ if (result && !vx_check(vx_task_xid(result), VX_WATCH|VX_IDENT))
++ result = NULL;
+ }
+ return result;
+ }
+diff -NurpP --minimal linux-2.6.18/kernel/posix-cpu-timers.c linux-2.6.18-vs2.0.2.1-t6/kernel/posix-cpu-timers.c
+--- linux-2.6.18/kernel/posix-cpu-timers.c 2006-06-18 04:55:30 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/posix-cpu-timers.c 2006-09-20 17:01:45 +0200
@@ -6,6 +6,7 @@
#include <linux/posix-timers.h>
#include <asm/uaccess.h>
@@ -12919,9 +12933,9 @@
static int check_clock(const clockid_t which_clock)
{
-diff -NurpP --minimal linux-2.6.17.11/kernel/posix-timers.c linux-2.6.17.11-vs2.0.2/kernel/posix-timers.c
---- linux-2.6.17.11/kernel/posix-timers.c 2006-06-18 04:55:31 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/posix-timers.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/posix-timers.c linux-2.6.18-vs2.0.2.1-t6/kernel/posix-timers.c
+--- linux-2.6.18/kernel/posix-timers.c 2006-06-18 04:55:31 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/posix-timers.c 2006-09-20 17:01:45 +0200
@@ -372,7 +372,7 @@ static struct task_struct * good_sigeven
struct task_struct *rtn = current->group_leader;
@@ -12931,9 +12945,9 @@
rtn->tgid != current->tgid ||
(event->sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_SIGNAL))
return NULL;
-diff -NurpP --minimal linux-2.6.17.11/kernel/printk.c linux-2.6.17.11-vs2.0.2/kernel/printk.c
---- linux-2.6.17.11/kernel/printk.c 2006-06-18 04:55:31 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/printk.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/printk.c linux-2.6.18-vs2.0.2.1-t6/kernel/printk.c
+--- linux-2.6.18/kernel/printk.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/printk.c 2006-09-20 17:01:45 +0200
@@ -31,6 +31,7 @@
#include <linux/security.h>
#include <linux/bootmem.h>
@@ -12942,7 +12956,7 @@
#include <asm/uaccess.h>
-@@ -183,18 +184,13 @@ int do_syslog(int type, char __user *buf
+@@ -184,18 +185,13 @@ int do_syslog(int type, char __user *buf
unsigned long i, j, limit, count;
int do_clear = 0;
char c;
@@ -12963,7 +12977,7 @@
error = -EINVAL;
if (!buf || len < 0)
goto out;
-@@ -205,6 +201,16 @@ int do_syslog(int type, char __user *buf
+@@ -206,6 +202,16 @@ int do_syslog(int type, char __user *buf
error = -EFAULT;
goto out;
}
@@ -12980,7 +12994,7 @@
error = wait_event_interruptible(log_wait,
(log_start - log_end));
if (error)
-@@ -229,16 +235,6 @@ int do_syslog(int type, char __user *buf
+@@ -230,16 +236,6 @@ int do_syslog(int type, char __user *buf
do_clear = 1;
/* FALL THRU */
case 3: /* Read last kernel messages */
@@ -12997,9 +13011,9 @@
count = len;
if (count > log_buf_len)
count = log_buf_len;
-diff -NurpP --minimal linux-2.6.17.11/kernel/ptrace.c linux-2.6.17.11-vs2.0.2/kernel/ptrace.c
---- linux-2.6.17.11/kernel/ptrace.c 2006-06-18 04:55:31 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/ptrace.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/ptrace.c linux-2.6.18-vs2.0.2.1-t6/kernel/ptrace.c
+--- linux-2.6.18/kernel/ptrace.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/ptrace.c 2006-09-20 17:01:45 +0200
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/security.h>
@@ -13008,7 +13022,7 @@
#include <asm/pgtable.h>
#include <asm/uaccess.h>
-@@ -506,6 +507,10 @@ asmlinkage long sys_ptrace(long request,
+@@ -521,6 +522,10 @@ asmlinkage long sys_ptrace(long request,
goto out;
}
@@ -13019,10 +13033,21 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out_put_task_struct;
-diff -NurpP --minimal linux-2.6.17.11/kernel/sched.c linux-2.6.17.11-vs2.0.2/kernel/sched.c
---- linux-2.6.17.11/kernel/sched.c 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/sched.c 2006-08-17 00:28:21 +0200
-@@ -53,6 +53,9 @@
+diff -NurpP --minimal linux-2.6.18/kernel/rtmutex-debug.c linux-2.6.18-vs2.0.2.1-t6/kernel/rtmutex-debug.c
+--- linux-2.6.18/kernel/rtmutex-debug.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/rtmutex-debug.c 2006-09-23 15:53:17 +0200
+@@ -27,6 +27,7 @@
+ #include <linux/plist.h>
+ #include <linux/fs.h>
+ #include <linux/debug_locks.h>
++#include <linux/vs_cvirt.h>
+
+ #include "rtmutex_common.h"
+
+diff -NurpP --minimal linux-2.6.18/kernel/sched.c linux-2.6.18-vs2.0.2.1-t6/kernel/sched.c
+--- linux-2.6.18/kernel/sched.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/sched.c 2006-09-21 16:43:24 +0200
+@@ -55,6 +55,9 @@
#include <asm/tlb.h>
#include <asm/unistd.h>
@@ -13032,9 +13057,9 @@
/*
* Convert user-nice values [ -20 ... 0 ... 19 ]
-@@ -241,6 +244,10 @@ struct runqueue {
+@@ -242,6 +245,10 @@ struct rq {
+ struct task_struct *migration_thread;
struct list_head migration_queue;
- int cpu;
#endif
+#ifdef CONFIG_VSERVER_HARDCPU
+ struct list_head hold_queue;
@@ -13043,45 +13068,43 @@
#ifdef CONFIG_SCHEDSTATS
/* latency stats */
-@@ -601,6 +608,7 @@ static inline void sched_info_switch(tas
+@@ -662,6 +669,7 @@ sched_info_switch(struct task_struct *pr
*/
- static void dequeue_task(struct task_struct *p, prio_array_t *array)
+ static void dequeue_task(struct task_struct *p, struct prio_array *array)
{
+ BUG_ON(p->state & TASK_ONHOLD);
array->nr_active--;
list_del(&p->run_list);
if (list_empty(array->queue + p->prio))
-@@ -609,6 +617,7 @@ static void dequeue_task(struct task_str
+@@ -670,6 +678,7 @@ static void dequeue_task(struct task_str
- static void enqueue_task(struct task_struct *p, prio_array_t *array)
+ static void enqueue_task(struct task_struct *p, struct prio_array *array)
{
+ BUG_ON(p->state & TASK_ONHOLD);
sched_info_queued(p);
list_add_tail(&p->run_list, array->queue + p->prio);
__set_bit(p->prio, array->bitmap);
-@@ -622,11 +631,13 @@ static void enqueue_task(struct task_str
+@@ -683,12 +692,14 @@ static void enqueue_task(struct task_str
*/
- static void requeue_task(struct task_struct *p, prio_array_t *array)
+ static void requeue_task(struct task_struct *p, struct prio_array *array)
{
+ BUG_ON(p->state & TASK_ONHOLD);
list_move_tail(&p->run_list, array->queue + p->prio);
}
- static inline void enqueue_task_head(struct task_struct *p, prio_array_t *array)
+ static inline void
+ enqueue_task_head(struct task_struct *p, struct prio_array *array)
{
+ BUG_ON(p->state & TASK_ONHOLD);
list_add(&p->run_list, array->queue + p->prio);
__set_bit(p->prio, array->bitmap);
array->nr_active++;
-@@ -650,6 +661,7 @@ static inline void enqueue_task_head(str
- static int effective_prio(task_t *p)
+@@ -713,10 +724,16 @@ enqueue_task_head(struct task_struct *p,
+ static inline int __normal_prio(struct task_struct *p)
{
int bonus, prio;
+ struct vx_info *vxi;
- if (rt_task(p))
- return p->prio;
-@@ -657,6 +669,11 @@ static int effective_prio(task_t *p)
bonus = CURRENT_BONUS(p) - MAX_BONUS / 2;
prio = p->static_prio - bonus;
@@ -13093,7 +13116,7 @@
if (prio < MAX_RT_PRIO)
prio = MAX_RT_PRIO;
if (prio > MAX_PRIO-1)
-@@ -797,19 +814,77 @@ static void activate_task(task_t *p, run
+@@ -965,19 +982,77 @@ static void activate_task(struct task_st
}
p->timestamp = now;
@@ -13104,16 +13127,16 @@
/*
* deactivate_task - remove a task from the runqueue.
*/
--static void deactivate_task(struct task_struct *p, runqueue_t *rq)
-+static void __deactivate_task(struct task_struct *p, runqueue_t *rq)
+-static void deactivate_task(struct task_struct *p, struct rq *rq)
++static void __deactivate_task(struct task_struct *p, struct rq *rq)
{
- rq->nr_running--;
+ dec_nr_running(p, rq);
dequeue_task(p, p->array);
p->array = NULL;
}
+static inline
-+void deactivate_task(struct task_struct *p, runqueue_t *rq)
++void deactivate_task(struct task_struct *p, struct rq *rq)
+{
+ vx_deactivate_task(p);
+ __deactivate_task(p, rq);
@@ -13126,7 +13149,7 @@
+ */
+static inline
+void vx_hold_task(struct vx_info *vxi,
-+ struct task_struct *p, runqueue_t *rq)
++ struct task_struct *p, struct rq *rq)
+{
+ __deactivate_task(p, rq);
+ p->state |= TASK_ONHOLD;
@@ -13140,14 +13163,14 @@
+ */
+static inline
+void vx_unhold_task(struct vx_info *vxi,
-+ struct task_struct *p, runqueue_t *rq)
++ struct task_struct *p, struct rq *rq)
+{
+ list_del(&p->run_list);
+ /* one less waiting */
+ vx_onhold_dec(vxi);
+ p->state &= ~TASK_ONHOLD;
+ enqueue_task(p, rq->expired);
-+ rq->nr_running++;
++ inc_nr_running(p, rq);
+
+ if (p->static_prio < rq->best_expired_prio)
+ rq->best_expired_prio = p->static_prio;
@@ -13155,14 +13178,14 @@
+#else
+static inline
+void vx_hold_task(struct vx_info *vxi,
-+ struct task_struct *p, runqueue_t *rq)
++ struct task_struct *p, struct rq *rq)
+{
+ return;
+}
+
+static inline
+void vx_unhold_task(struct vx_info *vxi,
-+ struct task_struct *p, runqueue_t *rq)
++ struct task_struct *p, struct rq *rq)
+{
+ return;
+}
@@ -13172,7 +13195,7 @@
/*
* resched_task - mark a task 'to be rescheduled now'.
*
-@@ -1173,6 +1248,12 @@ static int try_to_wake_up(task_t *p, uns
+@@ -1373,6 +1448,12 @@ static int try_to_wake_up(struct task_st
rq = task_rq_lock(p, &flags);
old_state = p->state;
@@ -13185,7 +13208,7 @@
if (!(old_state & state))
goto out;
-@@ -1276,6 +1357,7 @@ out_activate:
+@@ -1478,6 +1559,7 @@ out_activate:
#endif /* CONFIG_SMP */
if (old_state == TASK_UNINTERRUPTIBLE) {
rq->nr_uninterruptible--;
@@ -13193,7 +13216,7 @@
/*
* Tasks on involuntary sleep don't earn
* sleep_avg beyond just interactive state.
-@@ -1416,6 +1498,7 @@ void fastcall wake_up_new_task(task_t *p
+@@ -1624,6 +1706,7 @@ void fastcall wake_up_new_task(struct ta
p->prio = effective_prio(p);
@@ -13201,15 +13224,15 @@
if (likely(cpu == this_cpu)) {
if (!(clone_flags & CLONE_VM)) {
/*
-@@ -1427,6 +1510,7 @@ void fastcall wake_up_new_task(task_t *p
+@@ -1635,6 +1718,7 @@ void fastcall wake_up_new_task(struct ta
__activate_task(p, rq);
else {
p->prio = current->prio;
+ BUG_ON(p->state & TASK_ONHOLD);
+ p->normal_prio = current->normal_prio;
list_add_tail(&p->run_list, ¤t->run_list);
p->array = current->array;
- p->array->nr_active++;
-@@ -2514,13 +2598,16 @@ unsigned long long current_sched_time(co
+@@ -2914,13 +2998,16 @@ static inline int expired_starving(struc
void account_user_time(struct task_struct *p, cputime_t cputime)
{
struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
@@ -13227,12 +13250,12 @@
cpustat->nice = cputime64_add(cpustat->nice, tmp);
else
cpustat->user = cputime64_add(cpustat->user, tmp);
-@@ -2536,10 +2623,12 @@ void account_system_time(struct task_str
+@@ -2936,10 +3023,12 @@ void account_system_time(struct task_str
cputime_t cputime)
{
struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
+ struct vx_info *vxi = p->vx_info; /* p is _always_ current */
- runqueue_t *rq = this_rq();
+ struct rq *rq = this_rq();
cputime64_t tmp;
p->stime = cputime_add(p->stime, cputime);
@@ -13240,7 +13263,7 @@
/* Add system time to cpustat. */
tmp = cputime_to_cputime64(cputime);
-@@ -2599,6 +2688,10 @@ void scheduler_tick(void)
+@@ -2999,6 +3088,10 @@ void scheduler_tick(void)
if (p == rq->idle) {
if (wake_priority_sleeper(rq))
goto out;
@@ -13251,7 +13274,7 @@
rebalance_tick(cpu, rq, SCHED_IDLE);
return;
}
-@@ -2631,7 +2724,7 @@ void scheduler_tick(void)
+@@ -3031,7 +3124,7 @@ void scheduler_tick(void)
}
goto out_unlock;
}
@@ -13260,10 +13283,10 @@
dequeue_task(p, rq->active);
set_tsk_need_resched(p);
p->prio = effective_prio(p);
-@@ -2902,6 +2995,10 @@ asmlinkage void __sched schedule(void)
- unsigned long long now;
- unsigned long run_time;
+@@ -3264,6 +3357,10 @@ asmlinkage void __sched schedule(void)
int cpu, idx, new_prio;
+ long *switch_count;
+ struct rq *rq;
+ struct vx_info *vxi;
+#ifdef CONFIG_VSERVER_HARDCPU
+ int maxidle = -HZ;
@@ -13271,7 +13294,7 @@
/*
* Test if we are atomic. Since do_exit() needs to call into
-@@ -2959,12 +3056,41 @@ need_resched_nonpreemptible:
+@@ -3321,12 +3418,41 @@ need_resched_nonpreemptible:
unlikely(signal_pending(prev))))
prev->state = TASK_RUNNING;
else {
@@ -13291,7 +13314,7 @@
+
+ vxi = NULL;
+ list_for_each_safe(l, n, &rq->hold_queue) {
-+ next = list_entry(l, task_t, run_list);
++ next = list_entry(l, struct task_struct, run_list);
+ if (vxi == next->vx_info)
+ continue;
+
@@ -13313,10 +13336,10 @@
+
cpu = smp_processor_id();
if (unlikely(!rq->nr_running)) {
- go_idle:
-@@ -3012,6 +3138,22 @@ go_idle:
+ idle_balance(cpu, rq);
+@@ -3355,6 +3481,22 @@ need_resched_nonpreemptible:
queue = array->queue + idx;
- next = list_entry(queue->next, task_t, run_list);
+ next = list_entry(queue->next, struct task_struct, run_list);
+ vxi = next->vx_info;
+#ifdef CONFIG_VSERVER_HARDCPU
@@ -13337,7 +13360,7 @@
if (!rt_task(next) && interactive_sleep(next->sleep_type)) {
unsigned long long delta = now - next->timestamp;
if (unlikely((long long)(now - next->timestamp) < 0))
-@@ -3566,7 +3708,7 @@ asmlinkage long sys_nice(int increment)
+@@ -3957,7 +4099,7 @@ asmlinkage long sys_nice(int increment)
nice = 19;
if (increment < 0 && !can_nice(current, nice))
@@ -13346,7 +13369,7 @@
retval = security_task_setnice(current, nice);
if (retval)
-@@ -3726,6 +3868,7 @@ recheck:
+@@ -4124,6 +4266,7 @@ recheck:
oldprio = p->prio;
__setscheduler(p, policy, param->sched_priority);
if (array) {
@@ -13354,8 +13377,8 @@
__activate_task(p, rq);
/*
* Reschedule if we are currently running on this runqueue and
-@@ -6130,6 +6273,9 @@ void __init sched_init(void)
- rq->cpu = i;
+@@ -6751,6 +6894,9 @@ void __init sched_init(void)
+ INIT_LIST_HEAD(&rq->migration_queue);
#endif
atomic_set(&rq->nr_iowait, 0);
+#ifdef CONFIG_VSERVER_HARDCPU
@@ -13364,7 +13387,7 @@
for (j = 0; j < 2; j++) {
array = rq->arrays + j;
-@@ -6199,6 +6345,7 @@ void normalize_rt_tasks(void)
+@@ -6827,6 +6973,7 @@ void normalize_rt_tasks(void)
deactivate_task(p, task_rq(p));
__setscheduler(p, SCHED_NORMAL, 0);
if (array) {
@@ -13372,18 +13395,18 @@
__activate_task(p, task_rq(p));
resched_task(rq->curr);
}
-diff -NurpP --minimal linux-2.6.17.11/kernel/signal.c linux-2.6.17.11-vs2.0.2/kernel/signal.c
---- linux-2.6.17.11/kernel/signal.c 2006-06-18 04:55:34 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/signal.c 2006-08-17 00:28:21 +0200
-@@ -25,6 +25,7 @@
+diff -NurpP --minimal linux-2.6.18/kernel/signal.c linux-2.6.18-vs2.0.2.1-t6/kernel/signal.c
+--- linux-2.6.18/kernel/signal.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/signal.c 2006-09-20 17:24:57 +0200
+@@ -23,6 +23,7 @@
+ #include <linux/ptrace.h>
#include <linux/signal.h>
- #include <linux/audit.h>
#include <linux/capability.h>
+#include <linux/vs_cvirt.h>
#include <asm/param.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
-@@ -572,18 +573,27 @@ static int rm_from_queue(unsigned long m
+@@ -571,18 +572,27 @@ static int rm_from_queue(unsigned long m
static int check_kill_permission(int sig, struct siginfo *info,
struct task_struct *t)
{
@@ -13410,10 +13433,10 @@
+ if (user && !vx_check(vx_task_xid(t), VX_ADMIN|VX_IDENT))
+ return error;
+
- error = security_task_kill(t, info, sig);
+ error = security_task_kill(t, info, sig, 0);
if (!error)
audit_signal_info(sig, t); /* Let audit system see the signal */
-@@ -1803,6 +1813,11 @@ relock:
+@@ -1839,6 +1849,11 @@ relock:
if (current == child_reaper)
continue;
@@ -13425,18 +13448,18 @@
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-2.6.17.11/kernel/sys.c linux-2.6.17.11-vs2.0.2/kernel/sys.c
---- linux-2.6.17.11/kernel/sys.c 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/sys.c 2006-08-17 00:28:21 +0200
-@@ -11,6 +11,7 @@
+diff -NurpP --minimal linux-2.6.18/kernel/sys.c linux-2.6.18-vs2.0.2.1-t6/kernel/sys.c
+--- linux-2.6.18/kernel/sys.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/sys.c 2006-09-20 17:01:45 +0200
+@@ -10,6 +10,7 @@
#include <linux/mman.h>
#include <linux/smp_lock.h>
#include <linux/notifier.h>
+#include <linux/kmod.h>
#include <linux/reboot.h>
#include <linux/prctl.h>
- #include <linux/init.h>
-@@ -30,6 +31,7 @@
+ #include <linux/highuid.h>
+@@ -28,6 +29,7 @@
#include <linux/tty.h>
#include <linux/signal.h>
#include <linux/cn_proc.h>
@@ -13444,7 +13467,7 @@
#include <linux/compat.h>
#include <linux/syscalls.h>
-@@ -439,7 +441,10 @@ static int set_one_prio(struct task_stru
+@@ -444,7 +446,10 @@ static int set_one_prio(struct task_stru
goto out;
}
if (niceval < task_nice(p) && !can_nice(p, niceval)) {
@@ -13456,7 +13479,7 @@
goto out;
}
no_nice = security_task_setnice(p, niceval);
-@@ -491,7 +496,8 @@ asmlinkage long sys_setpriority(int whic
+@@ -496,7 +501,8 @@ asmlinkage long sys_setpriority(int whic
if (!who)
who = current->uid;
else
@@ -13466,7 +13489,7 @@
goto out_unlock; /* No processes for this user */
do_each_thread(g, p)
-@@ -549,7 +555,8 @@ asmlinkage long sys_getpriority(int whic
+@@ -554,7 +560,8 @@ asmlinkage long sys_getpriority(int whic
if (!who)
who = current->uid;
else
@@ -13476,7 +13499,7 @@
goto out_unlock; /* No processes for this user */
do_each_thread(g, p)
-@@ -666,6 +673,9 @@ void kernel_power_off(void)
+@@ -670,6 +677,9 @@ void kernel_power_off(void)
machine_power_off();
}
EXPORT_SYMBOL_GPL(kernel_power_off);
@@ -13486,7 +13509,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
-@@ -696,6 +706,9 @@ asmlinkage long sys_reboot(int magic1, i
+@@ -700,6 +710,9 @@ asmlinkage long sys_reboot(int magic1, i
if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)
cmd = LINUX_REBOOT_CMD_HALT;
@@ -13496,7 +13519,7 @@
lock_kernel();
switch (cmd) {
case LINUX_REBOOT_CMD_RESTART:
-@@ -883,7 +896,7 @@ static int set_user(uid_t new_ruid, int
+@@ -887,7 +900,7 @@ static int set_user(uid_t new_ruid, int
{
struct user_struct *new_user;
@@ -13505,7 +13528,7 @@
if (!new_user)
return -EAGAIN;
-@@ -1247,15 +1260,18 @@ asmlinkage long sys_setpgid(pid_t pid, p
+@@ -1251,15 +1264,18 @@ asmlinkage long sys_setpgid(pid_t pid, p
{
struct task_struct *p;
struct task_struct *group_leader = current->group_leader;
@@ -13525,7 +13548,7 @@
/* From this point forward we keep holding onto the tasklist lock
* so that our parent does not change from under us. -DaveM
*/
-@@ -1290,22 +1306,22 @@ asmlinkage long sys_setpgid(pid_t pid, p
+@@ -1294,22 +1310,22 @@ asmlinkage long sys_setpgid(pid_t pid, p
if (pgid != pid) {
struct task_struct *p;
@@ -13554,7 +13577,7 @@
}
err = 0;
-@@ -1318,7 +1334,7 @@ out:
+@@ -1322,7 +1338,7 @@ out:
asmlinkage long sys_getpgid(pid_t pid)
{
if (!pid) {
@@ -13563,7 +13586,7 @@
} else {
int retval;
struct task_struct *p;
-@@ -1330,7 +1346,7 @@ asmlinkage long sys_getpgid(pid_t pid)
+@@ -1334,7 +1350,7 @@ asmlinkage long sys_getpgid(pid_t pid)
if (p) {
retval = security_task_getpgid(p);
if (!retval)
@@ -13572,7 +13595,7 @@
}
read_unlock(&tasklist_lock);
return retval;
-@@ -1671,7 +1687,7 @@ asmlinkage long sys_newuname(struct new_
+@@ -1675,7 +1691,7 @@ asmlinkage long sys_newuname(struct new_
int errno = 0;
down_read(&uts_sem);
@@ -13581,7 +13604,7 @@
errno = -EFAULT;
up_read(&uts_sem);
return errno;
-@@ -1682,15 +1698,17 @@ asmlinkage long sys_sethostname(char __u
+@@ -1686,15 +1702,17 @@ asmlinkage long sys_sethostname(char __u
int errno;
char tmp[__NEW_UTS_LEN];
@@ -13602,7 +13625,7 @@
errno = 0;
}
up_write(&uts_sem);
-@@ -1702,15 +1720,17 @@ asmlinkage long sys_sethostname(char __u
+@@ -1706,15 +1724,17 @@ asmlinkage long sys_sethostname(char __u
asmlinkage long sys_gethostname(char __user *name, int len)
{
int i, errno;
@@ -13622,7 +13645,7 @@
errno = -EFAULT;
up_read(&uts_sem);
return errno;
-@@ -1727,7 +1747,7 @@ asmlinkage long sys_setdomainname(char _
+@@ -1731,7 +1751,7 @@ asmlinkage long sys_setdomainname(char _
int errno;
char tmp[__NEW_UTS_LEN];
@@ -13631,7 +13654,7 @@
return -EPERM;
if (len < 0 || len > __NEW_UTS_LEN)
return -EINVAL;
-@@ -1735,8 +1755,10 @@ asmlinkage long sys_setdomainname(char _
+@@ -1739,8 +1759,10 @@ asmlinkage long sys_setdomainname(char _
down_write(&uts_sem);
errno = -EFAULT;
if (!copy_from_user(tmp, name, len)) {
@@ -13644,7 +13667,7 @@
errno = 0;
}
up_write(&uts_sem);
-@@ -1794,7 +1816,7 @@ asmlinkage long sys_setrlimit(unsigned i
+@@ -1798,7 +1820,7 @@ asmlinkage long sys_setrlimit(unsigned i
return -EINVAL;
old_rlim = current->signal->rlim + resource;
if ((new_rlim.rlim_max > old_rlim->rlim_max) &&
@@ -13653,10 +13676,10 @@
return -EPERM;
if (resource == RLIMIT_NOFILE && new_rlim.rlim_max > NR_OPEN)
return -EPERM;
-diff -NurpP --minimal linux-2.6.17.11/kernel/sysctl.c linux-2.6.17.11-vs2.0.2/kernel/sysctl.c
---- linux-2.6.17.11/kernel/sysctl.c 2006-06-18 04:55:34 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/sysctl.c 2006-08-17 00:28:21 +0200
-@@ -46,6 +46,7 @@
+diff -NurpP --minimal linux-2.6.18/kernel/sysctl.c linux-2.6.18-vs2.0.2.1-t6/kernel/sysctl.c
+--- linux-2.6.18/kernel/sysctl.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/sysctl.c 2006-09-20 17:01:45 +0200
+@@ -45,6 +45,7 @@
#include <linux/syscalls.h>
#include <linux/nfs_fs.h>
#include <linux/acpi.h>
@@ -13664,7 +13687,7 @@
#include <asm/uaccess.h>
#include <asm/processor.h>
-@@ -89,6 +90,7 @@ static int ngroups_max = NGROUPS_MAX;
+@@ -90,6 +91,7 @@ static int ngroups_max = NGROUPS_MAX;
#ifdef CONFIG_KMOD
extern char modprobe_path[];
#endif
@@ -13672,7 +13695,7 @@
#ifdef CONFIG_CHR_DEV_SG
extern int sg_big_buff;
#endif
-@@ -237,6 +239,7 @@ static ctl_table kern_table[] = {
+@@ -235,6 +237,7 @@ static ctl_table kern_table[] = {
.maxlen = sizeof(system_utsname.sysname),
.mode = 0444,
.proc_handler = &proc_doutsstring,
@@ -13680,7 +13703,7 @@
.strategy = &sysctl_string,
},
{
-@@ -246,6 +249,7 @@ static ctl_table kern_table[] = {
+@@ -244,6 +247,7 @@ static ctl_table kern_table[] = {
.maxlen = sizeof(system_utsname.release),
.mode = 0444,
.proc_handler = &proc_doutsstring,
@@ -13688,7 +13711,7 @@
.strategy = &sysctl_string,
},
{
-@@ -255,6 +259,7 @@ static ctl_table kern_table[] = {
+@@ -253,6 +257,7 @@ static ctl_table kern_table[] = {
.maxlen = sizeof(system_utsname.version),
.mode = 0444,
.proc_handler = &proc_doutsstring,
@@ -13696,7 +13719,7 @@
.strategy = &sysctl_string,
},
{
-@@ -264,6 +269,7 @@ static ctl_table kern_table[] = {
+@@ -262,6 +267,7 @@ static ctl_table kern_table[] = {
.maxlen = sizeof(system_utsname.nodename),
.mode = 0644,
.proc_handler = &proc_doutsstring,
@@ -13704,7 +13727,7 @@
.strategy = &sysctl_string,
},
{
-@@ -273,6 +279,7 @@ static ctl_table kern_table[] = {
+@@ -271,6 +277,7 @@ static ctl_table kern_table[] = {
.maxlen = sizeof(system_utsname.domainname),
.mode = 0644,
.proc_handler = &proc_doutsstring,
@@ -13712,7 +13735,7 @@
.strategy = &sysctl_string,
},
{
-@@ -409,6 +416,15 @@ static ctl_table kern_table[] = {
+@@ -407,6 +414,15 @@ static ctl_table kern_table[] = {
.strategy = &sysctl_string,
},
#endif
@@ -13728,7 +13751,7 @@
#ifdef CONFIG_CHR_DEV_SG
{
.ctl_name = KERN_SG_BIG_BUFF,
-@@ -1563,16 +1579,20 @@ static ssize_t proc_writesys(struct file
+@@ -1600,16 +1616,20 @@ static ssize_t proc_writesys(struct file
int proc_dostring(ctl_table *table, int write, struct file *filp,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
@@ -13756,7 +13779,7 @@
if (write) {
len = 0;
p = buffer;
-@@ -1583,20 +1603,20 @@ int proc_dostring(ctl_table *table, int
+@@ -1620,20 +1640,20 @@ int proc_dostring(ctl_table *table, int
break;
len++;
}
@@ -13785,9 +13808,20 @@
return -EFAULT;
if (len < *lenp) {
if(put_user('\n', ((char __user *) buffer) + len))
-diff -NurpP --minimal linux-2.6.17.11/kernel/timer.c linux-2.6.17.11-vs2.0.2/kernel/timer.c
---- linux-2.6.17.11/kernel/timer.c 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/timer.c 2006-08-25 18:29:10 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/taskstats.c linux-2.6.18-vs2.0.2.1-t6/kernel/taskstats.c
+--- linux-2.6.18/kernel/taskstats.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/taskstats.c 2006-09-23 15:53:17 +0200
+@@ -21,6 +21,7 @@
+ #include <linux/delayacct.h>
+ #include <linux/cpumask.h>
+ #include <linux/percpu.h>
++#include <linux/vs_cvirt.h>
+ #include <net/genetlink.h>
+ #include <asm/atomic.h>
+
+diff -NurpP --minimal linux-2.6.18/kernel/timer.c linux-2.6.18-vs2.0.2.1-t6/kernel/timer.c
+--- linux-2.6.18/kernel/timer.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/timer.c 2006-09-20 17:01:45 +0200
@@ -34,6 +34,8 @@
#include <linux/cpu.h>
#include <linux/syscalls.h>
@@ -13797,7 +13831,7 @@
#include <asm/uaccess.h>
#include <asm/unistd.h>
-@@ -953,12 +955,6 @@ asmlinkage unsigned long sys_alarm(unsig
+@@ -1302,12 +1304,6 @@ asmlinkage unsigned long sys_alarm(unsig
#endif
@@ -13810,7 +13844,7 @@
/**
* sys_getpid - return the thread group id of the current process
-@@ -971,7 +967,7 @@ asmlinkage unsigned long sys_alarm(unsig
+@@ -1320,7 +1316,7 @@ asmlinkage unsigned long sys_alarm(unsig
*/
asmlinkage long sys_getpid(void)
{
@@ -13819,7 +13853,7 @@
}
/*
-@@ -987,10 +983,23 @@ asmlinkage long sys_getppid(void)
+@@ -1336,10 +1332,23 @@ asmlinkage long sys_getppid(void)
rcu_read_lock();
pid = rcu_dereference(current->real_parent)->tgid;
rcu_read_unlock();
@@ -13844,7 +13878,7 @@
asmlinkage long sys_getuid(void)
{
/* Only we change this so SMP safe */
-@@ -1151,6 +1160,8 @@ asmlinkage long sys_sysinfo(struct sysin
+@@ -1500,6 +1509,8 @@ asmlinkage long sys_sysinfo(struct sysin
tp.tv_nsec = tp.tv_nsec - NSEC_PER_SEC;
tp.tv_sec++;
}
@@ -13853,9 +13887,9 @@
val.uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0);
val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
-diff -NurpP --minimal linux-2.6.17.11/kernel/user.c linux-2.6.17.11-vs2.0.2/kernel/user.c
---- linux-2.6.17.11/kernel/user.c 2006-06-18 04:55:35 +0200
-+++ linux-2.6.17.11-vs2.0.2/kernel/user.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/user.c linux-2.6.18-vs2.0.2.1-t6/kernel/user.c
+--- linux-2.6.18/kernel/user.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/user.c 2006-09-20 17:01:45 +0200
@@ -23,8 +23,8 @@
#define UIDHASH_BITS (CONFIG_BASE_SMALL ? 3 : 8)
#define UIDHASH_SZ (1 << UIDHASH_BITS)
@@ -13944,9 +13978,9 @@
spin_unlock_irq(&uidhash_lock);
return 0;
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/Kconfig linux-2.6.17.11-vs2.0.2/kernel/vserver/Kconfig
---- linux-2.6.17.11/kernel/vserver/Kconfig 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/Kconfig 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/Kconfig linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/Kconfig
+--- linux-2.6.18/kernel/vserver/Kconfig 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/Kconfig 2006-09-20 17:01:45 +0200
@@ -0,0 +1,189 @@
+#
+# Linux VServer configuration
@@ -14137,9 +14171,9 @@
+ depends on !VSERVER_NGNET
+ default y
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/Makefile linux-2.6.17.11-vs2.0.2/kernel/vserver/Makefile
---- linux-2.6.17.11/kernel/vserver/Makefile 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/Makefile 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/Makefile linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/Makefile
+--- linux-2.6.18/kernel/vserver/Makefile 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/Makefile 2006-09-20 17:01:45 +0200
@@ -0,0 +1,16 @@
+#
+# Makefile for the Linux vserver routines.
@@ -14157,9 +14191,9 @@
+vserver-$(CONFIG_VSERVER_LEGACYNET) += legacynet.o
+vserver-$(CONFIG_VSERVER_HISTORY) += history.o
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/context.c linux-2.6.17.11-vs2.0.2/kernel/vserver/context.c
---- linux-2.6.17.11/kernel/vserver/context.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/context.c 2006-09-03 18:31:06 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/context.c linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/context.c
+--- linux-2.6.18/kernel/vserver/context.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/context.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,918 @@
+/*
+ * linux/kernel/vserver/context.c
@@ -15079,9 +15113,9 @@
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/cvirt.c linux-2.6.17.11-vs2.0.2/kernel/vserver/cvirt.c
---- linux-2.6.17.11/kernel/vserver/cvirt.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/cvirt.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/cvirt.c linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/cvirt.c
+--- linux-2.6.18/kernel/vserver/cvirt.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/cvirt.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,260 @@
+/*
+ * linux/kernel/vserver/cvirt.c
@@ -15343,9 +15377,9 @@
+ put_vx_info(vxi);
+ return (name ? 0 : -EFAULT);
+}
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/cvirt_init.h linux-2.6.17.11-vs2.0.2/kernel/vserver/cvirt_init.h
---- linux-2.6.17.11/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/cvirt_init.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/cvirt_init.h linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/cvirt_init.h
+--- linux-2.6.18/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/cvirt_init.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,81 @@
+
+
@@ -15428,9 +15462,9 @@
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/cvirt_proc.h linux-2.6.17.11-vs2.0.2/kernel/vserver/cvirt_proc.h
---- linux-2.6.17.11/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/cvirt_proc.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/cvirt_proc.h linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/cvirt_proc.h
+--- linux-2.6.18/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/cvirt_proc.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,92 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
@@ -15524,9 +15558,9 @@
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/dlimit.c linux-2.6.17.11-vs2.0.2/kernel/vserver/dlimit.c
---- linux-2.6.17.11/kernel/vserver/dlimit.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/dlimit.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/dlimit.c linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/dlimit.c
+--- linux-2.6.18/kernel/vserver/dlimit.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/dlimit.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,548 @@
+/*
+ * linux/kernel/vserver/dlimit.c
@@ -16076,9 +16110,9 @@
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/helper.c linux-2.6.17.11-vs2.0.2/kernel/vserver/helper.c
---- linux-2.6.17.11/kernel/vserver/helper.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/helper.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/helper.c linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/helper.c
+--- linux-2.6.18/kernel/vserver/helper.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/helper.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,210 @@
+/*
+ * linux/kernel/vserver/helper.c
@@ -16290,9 +16324,9 @@
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/history.c linux-2.6.17.11-vs2.0.2/kernel/vserver/history.c
---- linux-2.6.17.11/kernel/vserver/history.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/history.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/history.c linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/history.c
+--- linux-2.6.18/kernel/vserver/history.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/history.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,183 @@
+/*
+ * kernel/vserver/history.c
@@ -16477,9 +16511,9 @@
+
+EXPORT_SYMBOL_GPL(vxh_advance);
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/init.c linux-2.6.17.11-vs2.0.2/kernel/vserver/init.c
---- linux-2.6.17.11/kernel/vserver/init.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/init.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/init.c linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/init.c
+--- linux-2.6.18/kernel/vserver/init.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/init.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,43 @@
+/*
+ * linux/kernel/init.c
@@ -16524,9 +16558,9 @@
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/inode.c linux-2.6.17.11-vs2.0.2/kernel/vserver/inode.c
---- linux-2.6.17.11/kernel/vserver/inode.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/inode.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/inode.c linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/inode.c
+--- linux-2.6.18/kernel/vserver/inode.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/inode.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,368 @@
+/*
+ * linux/kernel/vserver/inode.c
@@ -16896,9 +16930,9 @@
+
+EXPORT_SYMBOL_GPL(vx_propagate_xid);
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/legacy.c linux-2.6.17.11-vs2.0.2/kernel/vserver/legacy.c
---- linux-2.6.17.11/kernel/vserver/legacy.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/legacy.c 2006-09-03 18:31:06 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/legacy.c linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/legacy.c
+--- linux-2.6.18/kernel/vserver/legacy.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/legacy.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,113 @@
+/*
+ * linux/kernel/vserver/legacy.c
@@ -17013,9 +17047,9 @@
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/legacynet.c linux-2.6.17.11-vs2.0.2/kernel/vserver/legacynet.c
---- linux-2.6.17.11/kernel/vserver/legacynet.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/legacynet.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/legacynet.c linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/legacynet.c
+--- linux-2.6.18/kernel/vserver/legacynet.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/legacynet.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,84 @@
+
+/*
@@ -17101,9 +17135,9 @@
+}
+
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/limit.c linux-2.6.17.11-vs2.0.2/kernel/vserver/limit.c
---- linux-2.6.17.11/kernel/vserver/limit.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/limit.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/limit.c linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/limit.c
+--- linux-2.6.18/kernel/vserver/limit.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/limit.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,238 @@
+/*
+ * linux/kernel/vserver/limit.c
@@ -17343,9 +17377,9 @@
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/limit_init.h linux-2.6.17.11-vs2.0.2/kernel/vserver/limit_init.h
---- linux-2.6.17.11/kernel/vserver/limit_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/limit_init.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/limit_init.h linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/limit_init.h
+--- linux-2.6.18/kernel/vserver/limit_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/limit_init.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,32 @@
+
+
@@ -17379,9 +17413,9 @@
+#endif
+}
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/limit_proc.h linux-2.6.17.11-vs2.0.2/kernel/vserver/limit_proc.h
---- linux-2.6.17.11/kernel/vserver/limit_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/limit_proc.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/limit_proc.h linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/limit_proc.h
+--- linux-2.6.18/kernel/vserver/limit_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/limit_proc.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,58 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
@@ -17441,9 +17475,9 @@
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/namespace.c linux-2.6.17.11-vs2.0.2/kernel/vserver/namespace.c
---- linux-2.6.17.11/kernel/vserver/namespace.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/namespace.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/namespace.c linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/namespace.c
+--- linux-2.6.18/kernel/vserver/namespace.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/namespace.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,113 @@
+/*
+ * linux/kernel/vserver/namespace.c
@@ -17558,9 +17592,9 @@
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/network.c linux-2.6.17.11-vs2.0.2/kernel/vserver/network.c
---- linux-2.6.17.11/kernel/vserver/network.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/network.c 2006-08-25 20:47:50 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/network.c linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/network.c
+--- linux-2.6.18/kernel/vserver/network.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/network.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,807 @@
+/*
+ * linux/kernel/vserver/network.c
@@ -18369,9 +18403,9 @@
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/proc.c linux-2.6.17.11-vs2.0.2/kernel/vserver/proc.c
---- linux-2.6.17.11/kernel/vserver/proc.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/proc.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/proc.c linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/proc.c
+--- linux-2.6.18/kernel/vserver/proc.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/proc.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,860 @@
+/*
+ * linux/kernel/vserver/proc.c
@@ -19233,9 +19267,9 @@
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/sched.c linux-2.6.17.11-vs2.0.2/kernel/vserver/sched.c
---- linux-2.6.17.11/kernel/vserver/sched.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/sched.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/sched.c linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/sched.c
+--- linux-2.6.18/kernel/vserver/sched.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/sched.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,217 @@
+/*
+ * linux/kernel/vserver/sched.c
@@ -19454,9 +19488,9 @@
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/sched_init.h linux-2.6.17.11-vs2.0.2/kernel/vserver/sched_init.h
---- linux-2.6.17.11/kernel/vserver/sched_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/sched_init.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/sched_init.h linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/sched_init.h
+--- linux-2.6.18/kernel/vserver/sched_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/sched_init.h 2006-09-20 20:58:29 +0200
@@ -0,0 +1,30 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
@@ -19476,7 +19510,7 @@
+ sched->priority_bias = 0;
+ sched->vavavoom = 0;
+
-+ for_each_cpu(i) {
++ for_each_possible_cpu(i) {
+ sched->cpu[i].user_ticks = 0;
+ sched->cpu[i].sys_ticks = 0;
+ sched->cpu[i].hold_ticks = 0;
@@ -19488,9 +19522,9 @@
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/sched_proc.h linux-2.6.17.11-vs2.0.2/kernel/vserver/sched_proc.h
---- linux-2.6.17.11/kernel/vserver/sched_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/sched_proc.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/sched_proc.h linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/sched_proc.h
+--- linux-2.6.18/kernel/vserver/sched_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/sched_proc.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,40 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
@@ -19532,9 +19566,9 @@
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/signal.c linux-2.6.17.11-vs2.0.2/kernel/vserver/signal.c
---- linux-2.6.17.11/kernel/vserver/signal.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/signal.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/signal.c linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/signal.c
+--- linux-2.6.18/kernel/vserver/signal.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/signal.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,139 @@
+/*
+ * linux/kernel/vserver/signal.c
@@ -19675,9 +19709,9 @@
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/switch.c linux-2.6.17.11-vs2.0.2/kernel/vserver/switch.c
---- linux-2.6.17.11/kernel/vserver/switch.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/switch.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/switch.c linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/switch.c
+--- linux-2.6.18/kernel/vserver/switch.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/switch.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,268 @@
+/*
+ * linux/kernel/vserver/switch.c
@@ -19947,9 +19981,9 @@
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/sysctl.c linux-2.6.17.11-vs2.0.2/kernel/vserver/sysctl.c
---- linux-2.6.17.11/kernel/vserver/sysctl.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/sysctl.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/sysctl.c linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/sysctl.c
+--- linux-2.6.18/kernel/vserver/sysctl.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/sysctl.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,227 @@
+/*
+ * kernel/vserver/sysctl.c
@@ -20178,9 +20212,9 @@
+EXPORT_SYMBOL_GPL(vx_debug_cvirt);
+EXPORT_SYMBOL_GPL(vx_debug_misc);
+
-diff -NurpP --minimal linux-2.6.17.11/kernel/vserver/vci_config.h linux-2.6.17.11-vs2.0.2/kernel/vserver/vci_config.h
---- linux-2.6.17.11/kernel/vserver/vci_config.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/kernel/vserver/vci_config.h 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/kernel/vserver/vci_config.h linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/vci_config.h
+--- linux-2.6.18/kernel/vserver/vci_config.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18-vs2.0.2.1-t6/kernel/vserver/vci_config.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,70 @@
+
+enum {
@@ -20252,14 +20286,9 @@
+ 0;
+}
+
-diff -NurpP --minimal linux-2.6.17.11/lxdialog.scrltmp linux-2.6.17.11-vs2.0.2/lxdialog.scrltmp
---- linux-2.6.17.11/lxdialog.scrltmp 1970-01-01 01:00:00 +0100
-+++ linux-2.6.17.11-vs2.0.2/lxdialog.scrltmp 2006-08-29 17:50:52 +0200
-@@ -0,0 +1 @@
-+11
-diff -NurpP --minimal linux-2.6.17.11/mm/filemap_xip.c linux-2.6.17.11-vs2.0.2/mm/filemap_xip.c
---- linux-2.6.17.11/mm/filemap_xip.c 2006-04-09 13:49:58 +0200
-+++ linux-2.6.17.11-vs2.0.2/mm/filemap_xip.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/mm/filemap_xip.c linux-2.6.18-vs2.0.2.1-t6/mm/filemap_xip.c
+--- linux-2.6.18/mm/filemap_xip.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/mm/filemap_xip.c 2006-09-20 17:01:45 +0200
@@ -13,6 +13,7 @@
#include <linux/module.h>
#include <linux/uio.h>
@@ -20268,9 +20297,9 @@
#include <asm/tlbflush.h>
#include "filemap.h"
-diff -NurpP --minimal linux-2.6.17.11/mm/fremap.c linux-2.6.17.11-vs2.0.2/mm/fremap.c
---- linux-2.6.17.11/mm/fremap.c 2006-01-03 17:30:13 +0100
-+++ linux-2.6.17.11-vs2.0.2/mm/fremap.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/mm/fremap.c linux-2.6.18-vs2.0.2.1-t6/mm/fremap.c
+--- linux-2.6.18/mm/fremap.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/mm/fremap.c 2006-09-20 17:01:45 +0200
@@ -15,6 +15,7 @@
#include <linux/rmap.h>
#include <linux/module.h>
@@ -20288,9 +20317,9 @@
if (pte_none(*pte) || !zap_pte(mm, vma, addr, pte))
inc_mm_counter(mm, file_rss);
-diff -NurpP --minimal linux-2.6.17.11/mm/hugetlb.c linux-2.6.17.11-vs2.0.2/mm/hugetlb.c
---- linux-2.6.17.11/mm/hugetlb.c 2006-06-18 04:55:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/mm/hugetlb.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/mm/hugetlb.c linux-2.6.18-vs2.0.2.1-t6/mm/hugetlb.c
+--- linux-2.6.18/mm/hugetlb.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/mm/hugetlb.c 2006-09-20 17:01:45 +0200
@@ -19,6 +19,7 @@
#include <asm/pgtable.h>
@@ -20299,10 +20328,10 @@
#include "internal.h"
const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
-diff -NurpP --minimal linux-2.6.17.11/mm/memory.c linux-2.6.17.11-vs2.0.2/mm/memory.c
---- linux-2.6.17.11/mm/memory.c 2006-06-18 04:55:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/mm/memory.c 2006-08-17 00:28:21 +0200
-@@ -1901,6 +1901,10 @@ again:
+diff -NurpP --minimal linux-2.6.18/mm/memory.c linux-2.6.18-vs2.0.2.1-t6/mm/memory.c
+--- linux-2.6.18/mm/memory.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/mm/memory.c 2006-09-20 17:22:18 +0200
+@@ -1958,6 +1958,11 @@ static int do_swap_page(struct mm_struct
grab_swap_token();
}
@@ -20310,10 +20339,11 @@
+ ret = VM_FAULT_OOM;
+ goto out;
+ }
++
+ delayacct_clear_flag(DELAYACCT_PF_SWAPIN);
mark_page_accessed(page);
lock_page(page);
- if (!PageSwapCache(page)) {
-@@ -1978,6 +1982,8 @@ static int do_anonymous_page(struct mm_s
+@@ -2030,6 +2035,8 @@ static int do_anonymous_page(struct mm_s
/* Allocate our own private page. */
pte_unmap(page_table);
@@ -20322,7 +20352,7 @@
if (unlikely(anon_vma_prepare(vma)))
goto oom;
page = alloc_zeroed_user_highpage(vma, address);
-@@ -2056,6 +2062,9 @@ static int do_no_page(struct mm_struct *
+@@ -2108,6 +2115,9 @@ static int do_no_page(struct mm_struct *
smp_rmb(); /* serializes i_size against truncate_count */
}
retry:
@@ -20332,20 +20362,31 @@
new_page = vma->vm_ops->nopage(vma, address & PAGE_MASK, &ret);
/*
* No smp_rmb is needed here as long as there's a full
-diff -NurpP --minimal linux-2.6.17.11/mm/mempolicy.c linux-2.6.17.11-vs2.0.2/mm/mempolicy.c
---- linux-2.6.17.11/mm/mempolicy.c 2006-06-18 04:55:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/mm/mempolicy.c 2006-08-17 00:28:21 +0200
-@@ -87,6 +87,7 @@
- #include <linux/seq_file.h>
- #include <linux/proc_fs.h>
+diff -NurpP --minimal linux-2.6.18/mm/mempolicy.c linux-2.6.18-vs2.0.2.1-t6/mm/mempolicy.c
+--- linux-2.6.18/mm/mempolicy.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/mm/mempolicy.c 2006-09-20 17:16:11 +0200
+@@ -89,6 +89,7 @@
#include <linux/migrate.h>
+ #include <linux/rmap.h>
+ #include <linux/security.h>
+#include <linux/vs_cvirt.h>
#include <asm/tlbflush.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.17.11/mm/mlock.c linux-2.6.17.11-vs2.0.2/mm/mlock.c
---- linux-2.6.17.11/mm/mlock.c 2006-04-09 13:49:58 +0200
-+++ linux-2.6.17.11-vs2.0.2/mm/mlock.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/mm/migrate.c linux-2.6.18-vs2.0.2.1-t6/mm/migrate.c
+--- linux-2.6.18/mm/migrate.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/mm/migrate.c 2006-09-23 15:53:17 +0200
+@@ -28,6 +28,7 @@
+ #include <linux/mempolicy.h>
+ #include <linux/vmalloc.h>
+ #include <linux/security.h>
++#include <linux/vs_cvirt.h>
+
+ #include "internal.h"
+
+diff -NurpP --minimal linux-2.6.18/mm/mlock.c linux-2.6.18-vs2.0.2.1-t6/mm/mlock.c
+--- linux-2.6.18/mm/mlock.c 2006-04-09 13:49:58 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/mm/mlock.c 2006-09-20 17:01:45 +0200
@@ -10,6 +10,7 @@
#include <linux/mm.h>
#include <linux/mempolicy.h>
@@ -20402,10 +20443,10 @@
if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
capable(CAP_IPC_LOCK))
ret = do_mlockall(flags);
-diff -NurpP --minimal linux-2.6.17.11/mm/mmap.c linux-2.6.17.11-vs2.0.2/mm/mmap.c
---- linux-2.6.17.11/mm/mmap.c 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/mm/mmap.c 2006-08-25 05:44:21 +0200
-@@ -1126,10 +1126,10 @@ munmap_back:
+diff -NurpP --minimal linux-2.6.18/mm/mmap.c linux-2.6.18-vs2.0.2.1-t6/mm/mmap.c
+--- linux-2.6.18/mm/mmap.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/mm/mmap.c 2006-09-20 17:01:45 +0200
+@@ -1137,10 +1137,10 @@ munmap_back:
kmem_cache_free(vm_area_cachep, vma);
}
out:
@@ -20418,7 +20459,7 @@
make_pages_present(addr, addr + len);
}
if (flags & MAP_POPULATE) {
-@@ -1489,9 +1489,9 @@ static int acct_stack_growth(struct vm_a
+@@ -1500,9 +1500,9 @@ static int acct_stack_growth(struct vm_a
return -ENOMEM;
/* Ok, everything looks good - let it rip */
@@ -20430,7 +20471,7 @@
vm_stat_account(mm, vma->vm_flags, vma->vm_file, grow);
return 0;
}
-@@ -1644,9 +1644,9 @@ static void remove_vma_list(struct mm_st
+@@ -1655,9 +1655,9 @@ static void remove_vma_list(struct mm_st
do {
long nrpages = vma_pages(vma);
@@ -20442,7 +20483,7 @@
vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
vma = remove_vma(vma);
} while (vma);
-@@ -1882,6 +1882,8 @@ unsigned long do_brk(unsigned long addr,
+@@ -1893,6 +1893,8 @@ unsigned long do_brk(unsigned long addr,
lock_limit >>= PAGE_SHIFT;
if (locked > lock_limit && !capable(CAP_IPC_LOCK))
return -EAGAIN;
@@ -20451,7 +20492,7 @@
}
/*
-@@ -1908,7 +1910,8 @@ unsigned long do_brk(unsigned long addr,
+@@ -1919,7 +1921,8 @@ unsigned long do_brk(unsigned long addr,
if (mm->map_count > sysctl_max_map_count)
return -ENOMEM;
@@ -20461,8 +20502,8 @@
return -ENOMEM;
/* Can we just expand an old private anonymous mapping? */
-@@ -1933,9 +1936,9 @@ unsigned long do_brk(unsigned long addr,
- vma->vm_page_prot = protection_map[flags & 0x0f];
+@@ -1945,9 +1948,9 @@ unsigned long do_brk(unsigned long addr,
+ (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)];
vma_link(mm, vma, prev, rb_link, rb_parent);
out:
- mm->total_vm += len >> PAGE_SHIFT;
@@ -20473,7 +20514,7 @@
make_pages_present(addr, addr + len);
}
return addr;
-@@ -1961,6 +1964,11 @@ void exit_mmap(struct mm_struct *mm)
+@@ -1973,6 +1976,11 @@ void exit_mmap(struct mm_struct *mm)
free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, 0);
tlb_finish_mmu(tlb, 0, end);
@@ -20485,7 +20526,7 @@
/*
* Walk the list again, actually closing and freeing it,
* with preemption enabled, without holding any MM locks.
-@@ -2000,7 +2008,8 @@ int insert_vm_struct(struct mm_struct *
+@@ -2012,7 +2020,8 @@ int insert_vm_struct(struct mm_struct *
if (__vma && __vma->vm_start < vma->vm_end)
return -ENOMEM;
if ((vma->vm_flags & VM_ACCOUNT) &&
@@ -20495,7 +20536,7 @@
return -ENOMEM;
vma_link(mm, vma, prev, rb_link, rb_parent);
return 0;
-@@ -2073,5 +2082,7 @@ int may_expand_vm(struct mm_struct *mm,
+@@ -2085,5 +2094,7 @@ int may_expand_vm(struct mm_struct *mm,
if (cur + npages > lim)
return 0;
@@ -20503,9 +20544,9 @@
+ return 0;
return 1;
}
-diff -NurpP --minimal linux-2.6.17.11/mm/mremap.c linux-2.6.17.11-vs2.0.2/mm/mremap.c
---- linux-2.6.17.11/mm/mremap.c 2006-04-09 13:49:58 +0200
-+++ linux-2.6.17.11-vs2.0.2/mm/mremap.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/mm/mremap.c linux-2.6.18-vs2.0.2.1-t6/mm/mremap.c
+--- linux-2.6.18/mm/mremap.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/mm/mremap.c 2006-09-20 17:01:45 +0200
@@ -18,6 +18,7 @@
#include <linux/highmem.h>
#include <linux/security.h>
@@ -20555,9 +20596,9 @@
make_pages_present(addr + old_len,
addr + new_len);
}
-diff -NurpP --minimal linux-2.6.17.11/mm/nommu.c linux-2.6.17.11-vs2.0.2/mm/nommu.c
---- linux-2.6.17.11/mm/nommu.c 2006-06-18 04:55:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/mm/nommu.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/mm/nommu.c linux-2.6.18-vs2.0.2.1-t6/mm/nommu.c
+--- linux-2.6.18/mm/nommu.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/mm/nommu.c 2006-09-20 17:01:45 +0200
@@ -820,7 +820,7 @@ unsigned long do_mmap_pgoff(struct file
realalloc += kobjsize(vma);
askedalloc += sizeof(*vma);
@@ -20585,10 +20626,10 @@
while ((tmp = mm->context.vmlist)) {
mm->context.vmlist = tmp->next;
-diff -NurpP --minimal linux-2.6.17.11/mm/oom_kill.c linux-2.6.17.11-vs2.0.2/mm/oom_kill.c
---- linux-2.6.17.11/mm/oom_kill.c 2006-06-18 04:55:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/mm/oom_kill.c 2006-08-17 00:28:21 +0200
-@@ -66,6 +66,8 @@ unsigned long badness(struct task_struct
+diff -NurpP --minimal linux-2.6.18/mm/oom_kill.c linux-2.6.18-vs2.0.2.1-t6/mm/oom_kill.c
+--- linux-2.6.18/mm/oom_kill.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/mm/oom_kill.c 2006-09-20 17:01:45 +0200
+@@ -67,6 +67,8 @@ unsigned long badness(struct task_struct
*/
task_unlock(p);
@@ -20597,18 +20638,18 @@
/*
* Processes which fork a lot of child processes are likely
* a good choice. We add half the vmsize of the children if they
-diff -NurpP --minimal linux-2.6.17.11/mm/page_alloc.c linux-2.6.17.11-vs2.0.2/mm/page_alloc.c
---- linux-2.6.17.11/mm/page_alloc.c 2006-06-18 04:55:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/mm/page_alloc.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/mm/page_alloc.c linux-2.6.18-vs2.0.2.1-t6/mm/page_alloc.c
+--- linux-2.6.18/mm/page_alloc.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/mm/page_alloc.c 2006-09-20 17:04:12 +0200
@@ -37,6 +37,7 @@
- #include <linux/nodemask.h>
#include <linux/vmalloc.h>
#include <linux/mempolicy.h>
+ #include <linux/stop_machine.h>
+#include <linux/vs_limit.h>
#include <asm/tlbflush.h>
#include <asm/div64.h>
-@@ -1375,6 +1376,8 @@ void si_meminfo(struct sysinfo *val)
+@@ -1223,6 +1224,8 @@ void si_meminfo(struct sysinfo *val)
val->freehigh = 0;
#endif
val->mem_unit = PAGE_SIZE;
@@ -20617,7 +20658,7 @@
}
EXPORT_SYMBOL(si_meminfo);
-@@ -1389,6 +1392,8 @@ void si_meminfo_node(struct sysinfo *val
+@@ -1237,6 +1240,8 @@ void si_meminfo_node(struct sysinfo *val
val->totalhigh = pgdat->node_zones[ZONE_HIGHMEM].present_pages;
val->freehigh = pgdat->node_zones[ZONE_HIGHMEM].free_pages;
val->mem_unit = PAGE_SIZE;
@@ -20626,9 +20667,9 @@
}
#endif
-diff -NurpP --minimal linux-2.6.17.11/mm/rmap.c linux-2.6.17.11-vs2.0.2/mm/rmap.c
---- linux-2.6.17.11/mm/rmap.c 2006-06-18 04:55:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/mm/rmap.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/mm/rmap.c linux-2.6.18-vs2.0.2.1-t6/mm/rmap.c
+--- linux-2.6.18/mm/rmap.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/mm/rmap.c 2006-09-20 17:01:45 +0200
@@ -53,6 +53,7 @@
#include <linux/rmap.h>
#include <linux/rcupdate.h>
@@ -20637,10 +20678,10 @@
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.17.11/mm/shmem.c linux-2.6.17.11-vs2.0.2/mm/shmem.c
---- linux-2.6.17.11/mm/shmem.c 2006-06-18 04:55:36 +0200
-+++ linux-2.6.17.11-vs2.0.2/mm/shmem.c 2006-08-17 00:28:21 +0200
-@@ -53,7 +53,6 @@
+diff -NurpP --minimal linux-2.6.18/mm/shmem.c linux-2.6.18-vs2.0.2.1-t6/mm/shmem.c
+--- linux-2.6.18/mm/shmem.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/mm/shmem.c 2006-09-20 17:01:45 +0200
+@@ -51,7 +51,6 @@
#include <asm/pgtable.h>
/* This magic number is used in glibc for posix shared memory */
@@ -20648,16 +20689,16 @@
#define ENTRIES_PER_PAGE (PAGE_CACHE_SIZE/sizeof(unsigned long))
#define ENTRIES_PER_PAGEPAGE (ENTRIES_PER_PAGE*ENTRIES_PER_PAGE)
-@@ -1658,7 +1657,7 @@ static int shmem_statfs(struct super_blo
+@@ -1648,7 +1647,7 @@ static int shmem_statfs(struct dentry *d
{
- struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
+ struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
- buf->f_type = TMPFS_MAGIC;
+ buf->f_type = TMPFS_SUPER_MAGIC;
buf->f_bsize = PAGE_CACHE_SIZE;
buf->f_namelen = NAME_MAX;
spin_lock(&sbinfo->stat_lock);
-@@ -2101,7 +2100,7 @@ static int shmem_fill_super(struct super
+@@ -2091,7 +2090,7 @@ static int shmem_fill_super(struct super
sb->s_maxbytes = SHMEM_MAX_BYTES;
sb->s_blocksize = PAGE_CACHE_SIZE;
sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
@@ -20666,10 +20707,10 @@
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-2.6.17.11/mm/swapfile.c linux-2.6.17.11-vs2.0.2/mm/swapfile.c
---- linux-2.6.17.11/mm/swapfile.c 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/mm/swapfile.c 2006-08-25 05:44:21 +0200
-@@ -32,6 +32,7 @@
+diff -NurpP --minimal linux-2.6.18/mm/swapfile.c linux-2.6.18-vs2.0.2.1-t6/mm/swapfile.c
+--- linux-2.6.18/mm/swapfile.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/mm/swapfile.c 2006-09-20 17:01:45 +0200
+@@ -31,6 +31,7 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
#include <linux/swapops.h>
@@ -20677,7 +20718,7 @@
DEFINE_SPINLOCK(swap_lock);
unsigned int nr_swapfiles;
-@@ -1696,6 +1697,8 @@ void si_swapinfo(struct sysinfo *val)
+@@ -1667,6 +1668,8 @@ void si_swapinfo(struct sysinfo *val)
val->freeswap = nr_swap_pages + nr_to_be_unused;
val->totalswap = total_swap_pages + nr_to_be_unused;
spin_unlock(&swap_lock);
@@ -20686,30 +20727,18 @@
}
/*
-diff -NurpP --minimal linux-2.6.17.11/mm/vmscan.c linux-2.6.17.11-vs2.0.2/mm/vmscan.c
---- linux-2.6.17.11/mm/vmscan.c 2006-06-18 04:55:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/mm/vmscan.c 2006-08-17 00:28:21 +0200
-@@ -1357,7 +1357,7 @@ static int __init kswapd_init(void)
- pid = kernel_thread(kswapd, pgdat, CLONE_KERNEL);
- BUG_ON(pid < 0);
- read_lock(&tasklist_lock);
-- pgdat->kswapd = find_task_by_pid(pid);
-+ pgdat->kswapd = find_task_by_real_pid(pid);
- read_unlock(&tasklist_lock);
- }
- total_memory = nr_free_pagecache_pages();
-diff -NurpP --minimal linux-2.6.17.11/net/core/dev.c linux-2.6.17.11-vs2.0.2/net/core/dev.c
---- linux-2.6.17.11/net/core/dev.c 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/core/dev.c 2006-08-17 00:28:21 +0200
-@@ -115,6 +115,7 @@
- #include <net/iw_handler.h>
- #include <asm/current.h>
- #include <linux/audit.h>
+diff -NurpP --minimal linux-2.6.18/net/core/dev.c linux-2.6.18-vs2.0.2.1-t6/net/core/dev.c
+--- linux-2.6.18/net/core/dev.c 2006-09-20 16:58:49 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/core/dev.c 2006-09-20 17:03:02 +0200
+@@ -117,6 +117,7 @@
+ #include <linux/dmaengine.h>
+ #include <linux/err.h>
+ #include <linux/ctype.h>
+#include <linux/vs_network.h>
/*
* The list of packet types we will receive (as opposed to discard)
-@@ -1945,6 +1946,9 @@ static int dev_ifconf(char __user *arg)
+@@ -2047,6 +2048,9 @@ static int dev_ifconf(char __user *arg)
total = 0;
for (dev = dev_base; dev; dev = dev->next) {
@@ -20719,7 +20748,7 @@
for (i = 0; i < NPROTO; i++) {
if (gifconf_list[i]) {
int done;
-@@ -2005,6 +2009,10 @@ void dev_seq_stop(struct seq_file *seq,
+@@ -2107,6 +2111,10 @@ void dev_seq_stop(struct seq_file *seq,
static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
{
@@ -20730,10 +20759,10 @@
if (dev->get_stats) {
struct net_device_stats *stats = dev->get_stats(dev);
-diff -NurpP --minimal linux-2.6.17.11/net/core/rtnetlink.c linux-2.6.17.11-vs2.0.2/net/core/rtnetlink.c
---- linux-2.6.17.11/net/core/rtnetlink.c 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/core/rtnetlink.c 2006-08-25 05:44:21 +0200
-@@ -323,6 +323,9 @@ static int rtnetlink_dump_ifinfo(struct
+diff -NurpP --minimal linux-2.6.18/net/core/rtnetlink.c linux-2.6.18-vs2.0.2.1-t6/net/core/rtnetlink.c
+--- linux-2.6.18/net/core/rtnetlink.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/core/rtnetlink.c 2006-09-20 17:01:45 +0200
+@@ -322,6 +322,9 @@ static int rtnetlink_dump_ifinfo(struct
for (dev=dev_base, idx=0; dev; dev = dev->next, idx++) {
if (idx < s_idx)
continue;
@@ -20743,7 +20772,7 @@
if (rtnetlink_fill_ifinfo(skb, dev, RTM_NEWLINK,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq, 0,
-@@ -613,6 +616,9 @@ void rtmsg_ifinfo(int type, struct net_d
+@@ -612,6 +615,9 @@ void rtmsg_ifinfo(int type, struct net_d
sizeof(struct rtnl_link_ifmap) +
sizeof(struct rtnl_link_stats) + 128);
@@ -20753,10 +20782,10 @@
skb = alloc_skb(size, GFP_KERNEL);
if (!skb)
return;
-diff -NurpP --minimal linux-2.6.17.11/net/core/sock.c linux-2.6.17.11-vs2.0.2/net/core/sock.c
---- linux-2.6.17.11/net/core/sock.c 2006-06-18 04:55:39 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/core/sock.c 2006-08-17 00:28:21 +0200
-@@ -125,6 +125,9 @@
+diff -NurpP --minimal linux-2.6.18/net/core/sock.c linux-2.6.18-vs2.0.2.1-t6/net/core/sock.c
+--- linux-2.6.18/net/core/sock.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/core/sock.c 2006-09-20 17:01:45 +0200
+@@ -124,6 +124,9 @@
#include <linux/ipsec.h>
#include <linux/filter.h>
@@ -20766,7 +20795,7 @@
#ifdef CONFIG_INET
#include <net/tcp.h>
-@@ -768,6 +771,8 @@ struct sock *sk_alloc(int family, gfp_t
+@@ -859,6 +862,8 @@ struct sock *sk_alloc(int family, gfp_t
sk->sk_prot = sk->sk_prot_creator = prot;
sock_lock_init(sk);
}
@@ -20775,7 +20804,7 @@
if (security_sk_alloc(sk, family, priority))
goto out_free;
-@@ -806,6 +811,11 @@ void sk_free(struct sock *sk)
+@@ -897,6 +902,11 @@ void sk_free(struct sock *sk)
__FUNCTION__, atomic_read(&sk->sk_omem_alloc));
security_sk_free(sk);
@@ -20787,7 +20816,7 @@
if (sk->sk_prot_creator->slab != NULL)
kmem_cache_free(sk->sk_prot_creator->slab, sk);
else
-@@ -823,6 +833,8 @@ struct sock *sk_clone(const struct sock
+@@ -914,6 +924,8 @@ struct sock *sk_clone(const struct sock
memcpy(newsk, sk, sk->sk_prot->obj_size);
/* SANITY */
@@ -20796,7 +20825,7 @@
sk_node_init(&newsk->sk_node);
sock_lock_init(newsk);
bh_lock_sock(newsk);
-@@ -863,6 +875,12 @@ struct sock *sk_clone(const struct sock
+@@ -959,6 +971,12 @@ struct sock *sk_clone(const struct sock
newsk->sk_priority = 0;
atomic_set(&newsk->sk_refcnt, 2);
@@ -20809,7 +20838,7 @@
/*
* Increment the counter in the same struct proto as the master
* sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
-@@ -1427,6 +1445,11 @@ void sock_init_data(struct socket *sock,
+@@ -1528,6 +1546,11 @@ void sock_init_data(struct socket *sock,
sk->sk_stamp.tv_sec = -1L;
sk->sk_stamp.tv_usec = -1L;
@@ -20821,10 +20850,10 @@
atomic_set(&sk->sk_refcnt, 1);
}
-diff -NurpP --minimal linux-2.6.17.11/net/ipv4/af_inet.c linux-2.6.17.11-vs2.0.2/net/ipv4/af_inet.c
---- linux-2.6.17.11/net/ipv4/af_inet.c 2006-06-18 04:55:43 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/ipv4/af_inet.c 2006-08-17 00:28:21 +0200
-@@ -114,6 +114,7 @@
+diff -NurpP --minimal linux-2.6.18/net/ipv4/af_inet.c linux-2.6.18-vs2.0.2.1-t6/net/ipv4/af_inet.c
+--- linux-2.6.18/net/ipv4/af_inet.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/ipv4/af_inet.c 2006-09-20 17:01:45 +0200
+@@ -115,6 +115,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
#endif
@@ -20832,7 +20861,7 @@
DEFINE_SNMP_STAT(struct linux_mib, net_statistics) __read_mostly;
-@@ -282,9 +283,11 @@ lookup_protocol:
+@@ -283,9 +284,11 @@ lookup_protocol:
}
err = -EPERM;
@@ -20845,7 +20874,7 @@
sock->ops = answer->ops;
answer_prot = answer->prot;
answer_no_check = answer->no_check;
-@@ -401,6 +404,10 @@ int inet_bind(struct socket *sock, struc
+@@ -402,6 +405,10 @@ int inet_bind(struct socket *sock, struc
unsigned short snum;
int chk_addr_ret;
int err;
@@ -20856,7 +20885,7 @@
/* If the socket has its own bind function then use it. (RAW) */
if (sk->sk_prot->bind) {
-@@ -411,7 +418,40 @@ int inet_bind(struct socket *sock, struc
+@@ -412,7 +419,40 @@ int inet_bind(struct socket *sock, struc
if (addr_len < sizeof(struct sockaddr_in))
goto out;
@@ -20898,7 +20927,7 @@
/* Not specified by any standard per-se, however it breaks too
* many applications when removed. It is unfortunate since
-@@ -423,7 +463,7 @@ int inet_bind(struct socket *sock, struc
+@@ -424,7 +464,7 @@ int inet_bind(struct socket *sock, struc
err = -EADDRNOTAVAIL;
if (!sysctl_ip_nonlocal_bind &&
!inet->freebind &&
@@ -20907,7 +20936,7 @@
chk_addr_ret != RTN_LOCAL &&
chk_addr_ret != RTN_MULTICAST &&
chk_addr_ret != RTN_BROADCAST)
-@@ -448,7 +488,8 @@ int inet_bind(struct socket *sock, struc
+@@ -449,7 +489,8 @@ int inet_bind(struct socket *sock, struc
if (sk->sk_state != TCP_CLOSE || inet->num)
goto out_release_sock;
@@ -20917,10 +20946,10 @@
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->saddr = 0; /* Use device */
-diff -NurpP --minimal linux-2.6.17.11/net/ipv4/devinet.c linux-2.6.17.11-vs2.0.2/net/ipv4/devinet.c
---- linux-2.6.17.11/net/ipv4/devinet.c 2006-06-18 04:55:43 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/ipv4/devinet.c 2006-08-17 00:28:21 +0200
-@@ -609,6 +609,9 @@ int devinet_ioctl(unsigned int cmd, void
+diff -NurpP --minimal linux-2.6.18/net/ipv4/devinet.c linux-2.6.18-vs2.0.2.1-t6/net/ipv4/devinet.c
+--- linux-2.6.18/net/ipv4/devinet.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/ipv4/devinet.c 2006-09-20 17:01:45 +0200
+@@ -606,6 +606,9 @@ int devinet_ioctl(unsigned int cmd, void
*colon = ':';
if ((in_dev = __in_dev_get_rtnl(dev)) != NULL) {
@@ -20930,7 +20959,7 @@
if (tryaddrmatch) {
/* Matthias Andree */
/* compare label and address (4.4BSD style) */
-@@ -617,6 +620,8 @@ int devinet_ioctl(unsigned int cmd, void
+@@ -614,6 +617,8 @@ int devinet_ioctl(unsigned int cmd, void
This is checked above. */
for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
ifap = &ifa->ifa_next) {
@@ -20939,7 +20968,7 @@
if (!strcmp(ifr.ifr_name, ifa->ifa_label) &&
sin_orig.sin_addr.s_addr ==
ifa->ifa_address) {
-@@ -629,9 +634,12 @@ int devinet_ioctl(unsigned int cmd, void
+@@ -626,9 +631,12 @@ int devinet_ioctl(unsigned int cmd, void
comparing just the label */
if (!ifa) {
for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
@@ -20953,7 +20982,7 @@
}
}
-@@ -782,6 +790,9 @@ static int inet_gifconf(struct net_devic
+@@ -779,6 +787,9 @@ static int inet_gifconf(struct net_devic
goto out;
for (; ifa; ifa = ifa->ifa_next) {
@@ -20963,7 +20992,7 @@
if (!buf) {
done += sizeof(ifr);
continue;
-@@ -1093,6 +1104,7 @@ static int inet_dump_ifaddr(struct sk_bu
+@@ -1090,6 +1101,7 @@ static int inet_dump_ifaddr(struct sk_bu
struct net_device *dev;
struct in_device *in_dev;
struct in_ifaddr *ifa;
@@ -20971,7 +21000,7 @@
int s_ip_idx, s_idx = cb->args[0];
s_ip_idx = ip_idx = cb->args[1];
-@@ -1110,6 +1122,9 @@ static int inet_dump_ifaddr(struct sk_bu
+@@ -1107,6 +1119,9 @@ static int inet_dump_ifaddr(struct sk_bu
for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
ifa = ifa->ifa_next, ip_idx++) {
@@ -20981,10 +21010,10 @@
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid,
-diff -NurpP --minimal linux-2.6.17.11/net/ipv4/fib_hash.c linux-2.6.17.11-vs2.0.2/net/ipv4/fib_hash.c
---- linux-2.6.17.11/net/ipv4/fib_hash.c 2006-04-09 13:49:59 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/ipv4/fib_hash.c 2006-08-17 00:28:21 +0200
-@@ -989,6 +989,8 @@ static unsigned fib_flag_trans(int type,
+diff -NurpP --minimal linux-2.6.18/net/ipv4/fib_hash.c linux-2.6.18-vs2.0.2.1-t6/net/ipv4/fib_hash.c
+--- linux-2.6.18/net/ipv4/fib_hash.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/ipv4/fib_hash.c 2006-09-20 17:01:45 +0200
+@@ -987,6 +987,8 @@ static unsigned fib_flag_trans(int type,
return flags;
}
@@ -20993,7 +21022,7 @@
/*
* This outputs /proc/net/route.
*
-@@ -1019,7 +1021,8 @@ static int fib_seq_show(struct seq_file
+@@ -1017,7 +1019,8 @@ static int fib_seq_show(struct seq_file
prefix = f->fn_key;
mask = FZ_MASK(iter->zone);
flags = fib_flag_trans(fa->fa_type, mask, fi);
@@ -21003,10 +21032,10 @@
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.17.11/net/ipv4/inet_connection_sock.c linux-2.6.17.11-vs2.0.2/net/ipv4/inet_connection_sock.c
---- linux-2.6.17.11/net/ipv4/inet_connection_sock.c 2006-06-18 04:55:43 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/ipv4/inet_connection_sock.c 2006-08-17 00:28:21 +0200
-@@ -40,7 +40,6 @@ int sysctl_local_port_range[2] = { 1024,
+diff -NurpP --minimal linux-2.6.18/net/ipv4/inet_connection_sock.c linux-2.6.18-vs2.0.2.1-t6/net/ipv4/inet_connection_sock.c
+--- linux-2.6.18/net/ipv4/inet_connection_sock.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/ipv4/inet_connection_sock.c 2006-09-20 17:01:45 +0200
+@@ -39,7 +39,6 @@ int sysctl_local_port_range[2] = { 1024,
int inet_csk_bind_conflict(const struct sock *sk,
const struct inet_bind_bucket *tb)
{
@@ -21014,7 +21043,7 @@
struct sock *sk2;
struct hlist_node *node;
int reuse = sk->sk_reuse;
-@@ -53,9 +52,8 @@ int inet_csk_bind_conflict(const struct
+@@ -52,9 +51,8 @@ int inet_csk_bind_conflict(const struct
sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) {
if (!reuse || !sk2->sk_reuse ||
sk2->sk_state == TCP_LISTEN) {
@@ -21026,10 +21055,10 @@
break;
}
}
-diff -NurpP --minimal linux-2.6.17.11/net/ipv4/inet_diag.c linux-2.6.17.11-vs2.0.2/net/ipv4/inet_diag.c
---- linux-2.6.17.11/net/ipv4/inet_diag.c 2006-04-09 13:49:59 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/ipv4/inet_diag.c 2006-08-17 00:28:21 +0200
-@@ -694,6 +694,8 @@ static int inet_diag_dump(struct sk_buff
+diff -NurpP --minimal linux-2.6.18/net/ipv4/inet_diag.c linux-2.6.18-vs2.0.2.1-t6/net/ipv4/inet_diag.c
+--- linux-2.6.18/net/ipv4/inet_diag.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/ipv4/inet_diag.c 2006-09-20 17:01:45 +0200
+@@ -693,6 +693,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);
@@ -21038,7 +21067,7 @@
if (num < s_num) {
num++;
continue;
-@@ -754,6 +756,8 @@ skip_listen_ht:
+@@ -753,6 +755,8 @@ skip_listen_ht:
sk_for_each(sk, node, &head->chain) {
struct inet_sock *inet = inet_sk(sk);
@@ -21047,7 +21076,7 @@
if (num < s_num)
goto next_normal;
if (!(r->idiag_states & (1 << sk->sk_state)))
-@@ -778,6 +782,8 @@ next_normal:
+@@ -777,6 +781,8 @@ next_normal:
inet_twsk_for_each(tw, node,
&hashinfo->ehash[i + hashinfo->ehash_size].chain) {
@@ -21056,10 +21085,10 @@
if (num < s_num)
goto next_dying;
if (r->id.idiag_sport != tw->tw_sport &&
-diff -NurpP --minimal linux-2.6.17.11/net/ipv4/inet_hashtables.c linux-2.6.17.11-vs2.0.2/net/ipv4/inet_hashtables.c
---- linux-2.6.17.11/net/ipv4/inet_hashtables.c 2006-06-18 04:55:43 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/ipv4/inet_hashtables.c 2006-08-17 00:28:21 +0200
-@@ -139,11 +139,10 @@ struct sock *__inet_lookup_listener(cons
+diff -NurpP --minimal linux-2.6.18/net/ipv4/inet_hashtables.c linux-2.6.18-vs2.0.2.1-t6/net/ipv4/inet_hashtables.c
+--- linux-2.6.18/net/ipv4/inet_hashtables.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/ipv4/inet_hashtables.c 2006-09-20 17:01:45 +0200
+@@ -138,11 +138,10 @@ struct sock *__inet_lookup_listener(cons
const __u32 rcv_saddr = inet->rcv_saddr;
int score = sk->sk_family == PF_INET ? 1 : 0;
@@ -21074,9 +21103,9 @@
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
continue;
-diff -NurpP --minimal linux-2.6.17.11/net/ipv4/raw.c linux-2.6.17.11-vs2.0.2/net/ipv4/raw.c
---- linux-2.6.17.11/net/ipv4/raw.c 2006-06-18 04:55:45 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/ipv4/raw.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/net/ipv4/raw.c linux-2.6.18-vs2.0.2.1-t6/net/ipv4/raw.c
+--- linux-2.6.18/net/ipv4/raw.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/ipv4/raw.c 2006-09-20 17:01:45 +0200
@@ -102,6 +102,27 @@ static void raw_v4_unhash(struct sock *s
write_unlock_bh(&raw_v4_lock);
}
@@ -21103,7 +21132,7 @@
+}
+
struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
- unsigned long raddr, unsigned long laddr,
+ __be32 raddr, __be32 laddr,
int dif)
@@ -113,7 +134,8 @@ struct sock *__raw_v4_lookup(struct sock
@@ -21148,7 +21177,7 @@
err = ip_route_output_flow(&rt, &fl, sk, !(msg->msg_flags&MSG_DONTWAIT));
}
if (err)
-@@ -787,7 +821,8 @@ static struct sock *raw_get_first(struct
+@@ -788,7 +822,8 @@ static struct sock *raw_get_first(struct
struct hlist_node *node;
sk_for_each(sk, node, &raw_v4_htable[state->bucket])
@@ -21158,7 +21187,7 @@
goto found;
}
sk = NULL;
-@@ -803,7 +838,8 @@ static struct sock *raw_get_next(struct
+@@ -804,7 +839,8 @@ static struct sock *raw_get_next(struct
sk = sk_next(sk);
try_again:
;
@@ -21168,20 +21197,20 @@
if (!sk && ++state->bucket < RAWV4_HTABLE_SIZE) {
sk = sk_head(&raw_v4_htable[state->bucket]);
-diff -NurpP --minimal linux-2.6.17.11/net/ipv4/tcp.c linux-2.6.17.11-vs2.0.2/net/ipv4/tcp.c
---- linux-2.6.17.11/net/ipv4/tcp.c 2006-06-18 04:55:45 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/ipv4/tcp.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/net/ipv4/tcp.c linux-2.6.18-vs2.0.2.1-t6/net/ipv4/tcp.c
+--- linux-2.6.18/net/ipv4/tcp.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/ipv4/tcp.c 2006-09-20 17:02:28 +0200
@@ -258,6 +258,7 @@
- #include <linux/random.h>
#include <linux/bootmem.h>
#include <linux/cache.h>
+ #include <linux/err.h>
+#include <linux/in.h>
#include <net/icmp.h>
#include <net/tcp.h>
-diff -NurpP --minimal linux-2.6.17.11/net/ipv4/tcp_ipv4.c linux-2.6.17.11-vs2.0.2/net/ipv4/tcp_ipv4.c
---- linux-2.6.17.11/net/ipv4/tcp_ipv4.c 2006-06-18 04:55:45 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/ipv4/tcp_ipv4.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/net/ipv4/tcp_ipv4.c linux-2.6.18-vs2.0.2.1-t6/net/ipv4/tcp_ipv4.c
+--- linux-2.6.18/net/ipv4/tcp_ipv4.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/ipv4/tcp_ipv4.c 2006-09-20 17:01:45 +0200
@@ -77,6 +77,7 @@
#include <linux/stddef.h>
#include <linux/proc_fs.h>
@@ -21190,7 +21219,7 @@
int sysctl_tcp_tw_reuse;
int sysctl_tcp_low_latency;
-@@ -1355,6 +1356,12 @@ static void *listening_get_next(struct s
+@@ -1388,6 +1389,12 @@ static void *listening_get_next(struct s
req = req->dl_next;
while (1) {
while (req) {
@@ -21203,7 +21232,7 @@
if (req->rsk_ops->family == st->family) {
cur = req;
goto out;
-@@ -1379,6 +1386,10 @@ get_req:
+@@ -1412,6 +1419,10 @@ get_req:
}
get_sk:
sk_for_each_from(sk, node) {
@@ -21214,7 +21243,7 @@
if (sk->sk_family == st->family) {
cur = sk;
goto out;
-@@ -1430,18 +1441,26 @@ static void *established_get_first(struc
+@@ -1463,18 +1474,26 @@ static void *established_get_first(struc
read_lock(&tcp_hashinfo.ehash[st->bucket].lock);
sk_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
@@ -21245,7 +21274,7 @@
rc = tw;
goto out;
}
-@@ -1465,7 +1484,8 @@ static void *established_get_next(struct
+@@ -1498,7 +1517,8 @@ static void *established_get_next(struct
tw = cur;
tw = tw_next(tw);
get_tw:
@@ -21255,7 +21284,7 @@
tw = tw_next(tw);
}
if (tw) {
-@@ -1489,6 +1509,11 @@ get_tw:
+@@ -1522,6 +1542,11 @@ get_tw:
sk = sk_next(sk);
sk_for_each_from(sk, node) {
@@ -21267,10 +21296,10 @@
if (sk->sk_family == st->family)
goto found;
}
-diff -NurpP --minimal linux-2.6.17.11/net/ipv4/tcp_minisocks.c linux-2.6.17.11-vs2.0.2/net/ipv4/tcp_minisocks.c
---- linux-2.6.17.11/net/ipv4/tcp_minisocks.c 2006-04-09 13:49:59 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/ipv4/tcp_minisocks.c 2006-08-17 00:28:21 +0200
-@@ -29,6 +29,10 @@
+diff -NurpP --minimal linux-2.6.18/net/ipv4/tcp_minisocks.c linux-2.6.18-vs2.0.2.1-t6/net/ipv4/tcp_minisocks.c
+--- linux-2.6.18/net/ipv4/tcp_minisocks.c 2006-09-20 16:58:51 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/ipv4/tcp_minisocks.c 2006-09-20 17:01:45 +0200
+@@ -28,6 +28,10 @@
#include <net/inet_common.h>
#include <net/xfrm.h>
@@ -21281,7 +21310,7 @@
#ifdef CONFIG_SYSCTL
#define SYNC_INIT 0 /* let the user enable it */
#else
-@@ -295,6 +299,11 @@ void tcp_time_wait(struct sock *sk, int
+@@ -294,6 +298,11 @@ void tcp_time_wait(struct sock *sk, int
tcptw->tw_ts_recent = tp->rx_opt.ts_recent;
tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp;
@@ -21293,10 +21322,10 @@
#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.17.11/net/ipv4/udp.c linux-2.6.17.11-vs2.0.2/net/ipv4/udp.c
---- linux-2.6.17.11/net/ipv4/udp.c 2006-06-18 04:55:45 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/ipv4/udp.c 2006-08-17 00:28:21 +0200
-@@ -176,14 +176,12 @@ gotit:
+diff -NurpP --minimal linux-2.6.18/net/ipv4/udp.c linux-2.6.18-vs2.0.2.1-t6/net/ipv4/udp.c
+--- linux-2.6.18/net/ipv4/udp.c 2006-09-20 16:58:51 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/ipv4/udp.c 2006-09-20 17:01:45 +0200
+@@ -175,14 +175,12 @@ gotit:
struct inet_sock *inet2 = inet_sk(sk2);
if (inet2->num == snum &&
@@ -21314,7 +21343,7 @@
(!sk2->sk_reuse || !sk->sk_reuse))
goto fail;
}
-@@ -238,6 +236,11 @@ static struct sock *udp_v4_lookup_longwa
+@@ -237,6 +235,11 @@ static struct sock *udp_v4_lookup_longwa
if (inet->rcv_saddr != daddr)
continue;
score+=2;
@@ -21326,7 +21355,7 @@
}
if (inet->daddr) {
if (inet->daddr != saddr)
-@@ -294,7 +297,8 @@ static inline struct sock *udp_v4_mcast_
+@@ -293,7 +296,8 @@ static inline struct sock *udp_v4_mcast_
if (inet->num != hnum ||
(inet->daddr && inet->daddr != rmt_addr) ||
(inet->dport != rmt_port && inet->dport) ||
@@ -21336,7 +21365,7 @@
ipv6_only_sock(s) ||
(s->sk_bound_dev_if && s->sk_bound_dev_if != dif))
continue;
-@@ -604,6 +608,19 @@ int udp_sendmsg(struct kiocb *iocb, stru
+@@ -603,6 +607,19 @@ int udp_sendmsg(struct kiocb *iocb, stru
.uli_u = { .ports =
{ .sport = inet->sport,
.dport = dport } } };
@@ -21356,7 +21385,7 @@
err = ip_route_output_flow(&rt, &fl, sk, !(msg->msg_flags&MSG_DONTWAIT));
if (err)
goto out;
-@@ -1403,8 +1420,10 @@ static struct sock *udp_get_first(struct
+@@ -1402,8 +1419,10 @@ static struct sock *udp_get_first(struct
for (state->bucket = 0; state->bucket < UDP_HTABLE_SIZE; ++state->bucket) {
struct hlist_node *node;
@@ -21368,7 +21397,7 @@
goto found;
}
}
-@@ -1421,7 +1440,8 @@ static struct sock *udp_get_next(struct
+@@ -1420,7 +1439,8 @@ static struct sock *udp_get_next(struct
sk = sk_next(sk);
try_again:
;
@@ -21378,10 +21407,10 @@
if (!sk && ++state->bucket < UDP_HTABLE_SIZE) {
sk = sk_head(&udp_hash[state->bucket]);
-diff -NurpP --minimal linux-2.6.17.11/net/ipv6/addrconf.c linux-2.6.17.11-vs2.0.2/net/ipv6/addrconf.c
---- linux-2.6.17.11/net/ipv6/addrconf.c 2006-08-25 00:25:37 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/ipv6/addrconf.c 2006-08-17 00:28:21 +0200
-@@ -2654,7 +2654,10 @@ static void if6_seq_stop(struct seq_file
+diff -NurpP --minimal linux-2.6.18/net/ipv6/addrconf.c linux-2.6.18-vs2.0.2.1-t6/net/ipv6/addrconf.c
+--- linux-2.6.18/net/ipv6/addrconf.c 2006-09-20 16:58:51 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/ipv6/addrconf.c 2006-09-20 17:01:45 +0200
+@@ -2698,7 +2698,10 @@ static void if6_seq_stop(struct seq_file
static int if6_seq_show(struct seq_file *seq, void *v)
{
struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
@@ -21393,7 +21422,7 @@
NIP6_SEQFMT " %02x %02x %02x %02x %8s\n",
NIP6(ifp->addr),
ifp->idev->dev->ifindex,
-@@ -3014,6 +3017,10 @@ static int inet6_dump_addr(struct sk_buf
+@@ -3133,6 +3136,10 @@ static int inet6_dump_addr(struct sk_buf
struct ifmcaddr6 *ifmca;
struct ifacaddr6 *ifaca;
@@ -21404,7 +21433,7 @@
s_idx = cb->args[0];
s_ip_idx = ip_idx = cb->args[1];
read_lock(&dev_base_lock);
-@@ -3239,6 +3246,10 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -3414,6 +3421,10 @@ static int inet6_dump_ifinfo(struct sk_b
struct net_device *dev;
struct inet6_dev *idev;
@@ -21415,10 +21444,10 @@
read_lock(&dev_base_lock);
for (dev=dev_base, idx=0; dev; dev = dev->next, idx++) {
if (idx < s_idx)
-diff -NurpP --minimal linux-2.6.17.11/net/netlink/af_netlink.c linux-2.6.17.11-vs2.0.2/net/netlink/af_netlink.c
---- linux-2.6.17.11/net/netlink/af_netlink.c 2006-06-18 04:55:50 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/netlink/af_netlink.c 2006-08-17 00:28:21 +0200
-@@ -57,6 +57,9 @@
+diff -NurpP --minimal linux-2.6.18/net/netlink/af_netlink.c linux-2.6.18-vs2.0.2.1-t6/net/netlink/af_netlink.c
+--- linux-2.6.18/net/netlink/af_netlink.c 2006-09-20 16:58:51 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/netlink/af_netlink.c 2006-09-20 17:01:45 +0200
+@@ -56,6 +56,9 @@
#include <linux/types.h>
#include <linux/audit.h>
#include <linux/selinux.h>
@@ -21428,10 +21457,10 @@
#include <net/sock.h>
#include <net/scm.h>
-diff -NurpP --minimal linux-2.6.17.11/net/socket.c linux-2.6.17.11-vs2.0.2/net/socket.c
---- linux-2.6.17.11/net/socket.c 2006-06-18 04:55:52 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/socket.c 2006-08-17 00:28:21 +0200
-@@ -94,6 +94,7 @@
+diff -NurpP --minimal linux-2.6.18/net/socket.c linux-2.6.18-vs2.0.2.1-t6/net/socket.c
+--- linux-2.6.18/net/socket.c 2006-09-20 16:58:54 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/socket.c 2006-09-20 17:01:45 +0200
+@@ -93,6 +93,7 @@
#include <net/sock.h>
#include <linux/netfilter.h>
@@ -21510,7 +21539,7 @@
/* Compatibility.
This uglymoron is moved from INET layer to here to avoid
-@@ -1244,6 +1273,7 @@ asmlinkage long sys_socket(int family, i
+@@ -1245,6 +1274,7 @@ asmlinkage long sys_socket(int family, i
if (retval < 0)
goto out;
@@ -21518,7 +21547,7 @@
retval = sock_map_fd(sock);
if (retval < 0)
goto out_release;
-@@ -1274,10 +1304,12 @@ asmlinkage long sys_socketpair(int famil
+@@ -1275,10 +1305,12 @@ asmlinkage long sys_socketpair(int famil
err = sock_create(family, type, protocol, &sock1);
if (err < 0)
goto out;
@@ -21531,9 +21560,9 @@
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-2.6.17.11/net/sunrpc/auth.c linux-2.6.17.11-vs2.0.2/net/sunrpc/auth.c
---- linux-2.6.17.11/net/sunrpc/auth.c 2006-06-18 04:55:52 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/sunrpc/auth.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/net/sunrpc/auth.c linux-2.6.18-vs2.0.2.1-t6/net/sunrpc/auth.c
+--- linux-2.6.18/net/sunrpc/auth.c 2006-06-18 04:55:52 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/sunrpc/auth.c 2006-09-20 17:01:45 +0200
@@ -13,6 +13,7 @@
#include <linux/errno.h>
#include <linux/sunrpc/clnt.h>
@@ -21558,9 +21587,9 @@
.group_info = current->group_info,
};
struct rpc_cred *ret;
-diff -NurpP --minimal linux-2.6.17.11/net/sunrpc/auth_unix.c linux-2.6.17.11-vs2.0.2/net/sunrpc/auth_unix.c
---- linux-2.6.17.11/net/sunrpc/auth_unix.c 2006-02-18 14:40:43 +0100
-+++ linux-2.6.17.11-vs2.0.2/net/sunrpc/auth_unix.c 2006-08-17 00:28:21 +0200
+diff -NurpP --minimal linux-2.6.18/net/sunrpc/auth_unix.c linux-2.6.18-vs2.0.2.1-t6/net/sunrpc/auth_unix.c
+--- linux-2.6.18/net/sunrpc/auth_unix.c 2006-09-20 16:58:54 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/sunrpc/auth_unix.c 2006-09-20 17:01:45 +0200
@@ -11,12 +11,14 @@
#include <linux/module.h>
#include <linux/sunrpc/clnt.h>
@@ -21626,10 +21655,10 @@
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.17.11/net/unix/af_unix.c linux-2.6.17.11-vs2.0.2/net/unix/af_unix.c
---- linux-2.6.17.11/net/unix/af_unix.c 2006-06-18 04:55:56 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/unix/af_unix.c 2006-08-17 00:28:21 +0200
-@@ -117,6 +117,9 @@
+diff -NurpP --minimal linux-2.6.18/net/unix/af_unix.c linux-2.6.18-vs2.0.2.1-t6/net/unix/af_unix.c
+--- linux-2.6.18/net/unix/af_unix.c 2006-09-20 16:58:54 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/unix/af_unix.c 2006-09-20 17:01:45 +0200
+@@ -116,6 +116,9 @@
#include <linux/mount.h>
#include <net/checksum.h>
#include <linux/security.h>
@@ -21639,7 +21668,7 @@
int sysctl_unix_max_dgram_qlen = 10;
-@@ -235,6 +238,8 @@ static struct sock *__unix_find_socket_b
+@@ -252,6 +255,8 @@ static struct sock *__unix_find_socket_b
sk_for_each(s, node, &unix_socket_table[hash ^ type]) {
struct unix_sock *u = unix_sk(s);
@@ -21648,7 +21677,7 @@
if (u->addr->len == len &&
!memcmp(u->addr->name, sunname, len))
goto found;
-@@ -781,7 +786,7 @@ static int unix_bind(struct socket *sock
+@@ -807,7 +812,7 @@ static int unix_bind(struct socket *sock
*/
mode = S_IFSOCK |
(SOCK_INODE(sock)->i_mode & ~current->fs->umask);
@@ -21657,10 +21686,10 @@
if (err)
goto out_mknod_dput;
mutex_unlock(&nd.dentry->d_inode->i_mutex);
-diff -NurpP --minimal linux-2.6.17.11/net/x25/af_x25.c linux-2.6.17.11-vs2.0.2/net/x25/af_x25.c
---- linux-2.6.17.11/net/x25/af_x25.c 2006-06-18 04:55:56 +0200
-+++ linux-2.6.17.11-vs2.0.2/net/x25/af_x25.c 2006-08-17 00:28:21 +0200
-@@ -502,7 +502,10 @@ static int x25_create(struct socket *soc
+diff -NurpP --minimal linux-2.6.18/net/x25/af_x25.c linux-2.6.18-vs2.0.2.1-t6/net/x25/af_x25.c
+--- linux-2.6.18/net/x25/af_x25.c 2006-09-20 16:58:54 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/net/x25/af_x25.c 2006-09-20 17:01:45 +0200
+@@ -501,7 +501,10 @@ static int x25_create(struct socket *soc
x25 = x25_sk(sk);
@@ -21672,10 +21701,10 @@
x25_init_timers(sk);
-diff -NurpP --minimal linux-2.6.17.11/security/commoncap.c linux-2.6.17.11-vs2.0.2/security/commoncap.c
---- linux-2.6.17.11/security/commoncap.c 2006-06-18 04:55:57 +0200
-+++ linux-2.6.17.11-vs2.0.2/security/commoncap.c 2006-08-17 00:28:21 +0200
-@@ -143,7 +143,7 @@ void cap_bprm_apply_creds (struct linux_
+diff -NurpP --minimal linux-2.6.18/security/commoncap.c linux-2.6.18-vs2.0.2.1-t6/security/commoncap.c
+--- linux-2.6.18/security/commoncap.c 2006-09-20 16:58:54 +0200
++++ linux-2.6.18-vs2.0.2.1-t6/security/commoncap.c 2006-09-20 17:01:45 +0200
+@@ -142,7 +142,7 @@ void cap_bprm_apply_creds (struct linux_
/* Derived from fs/exec.c:compute_creds. */
kernel_cap_t new_permitted, working;
@@ -21684,7 +21713,7 @@
working = cap_intersect (bprm->cap_inheritable,
current->cap_inheritable);
new_permitted = cap_combine (new_permitted, working);
-@@ -312,7 +312,8 @@ void cap_task_reparent_to_init (struct t
+@@ -311,7 +311,8 @@ void cap_task_reparent_to_init (struct t
int cap_syslog (int type)
{
Modified: dists/trunk/linux-2.6/debian/patches/series/1-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1-extra (original)
+++ dists/trunk/linux-2.6/debian/patches/series/1-extra Sat Sep 23 20:01:05 2006
@@ -1,3 +1,5 @@
++ debian/vserver-version.patch *_vserver *_xen-vserver
++ features/all/vserver/vs2.0.2.1-t6.patch *_vserver *_xen-vserver
+ features/all/xen/fedora-36175.patch *_xen *_xen-vserver
+ mips-tulip.patch mipsel
+ mips-tulip_dc21143.patch mipsel
More information about the Kernel-svn-changes
mailing list