-diff -NurpP --minimal linux-2.6.32.6/arch/alpha/Kconfig linux-2.6.32.6-vs2.3.0.36.28/arch/alpha/Kconfig
---- linux-2.6.32.6/arch/alpha/Kconfig 2009-12-03 20:01:49.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/alpha/Kconfig 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/Documentation/scheduler/sched-cfs-hard-limits.txt linux-2.6.32.59-vs2.3.0.36.29.9/Documentation/scheduler/sched-cfs-hard-limits.txt
+--- linux-2.6.32.59/Documentation/scheduler/sched-cfs-hard-limits.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/Documentation/scheduler/sched-cfs-hard-limits.txt 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,48 @@
++CPU HARD LIMITS FOR CFS GROUPS
++==============================
++
++1. Overview
++2. Interface
++3. Examples
++
++1. Overview
++-----------
++
++CFS is a proportional share scheduler which tries to divide the CPU time
++proportionately between tasks or groups of tasks (task group/cgroup) depending
++on the priority/weight of the task or shares assigned to groups of tasks.
++In CFS, a task/task group can get more than its share of CPU if there are
++enough idle CPU cycles available in the system, due to the work conserving
++nature of the scheduler. However in certain scenarios (like pay-per-use),
++it is desirable not to provide extra time to a group even in the presence
++of idle CPU cycles. This is where hard limiting can be of use.
++
++Hard limits for task groups can be set by specifying how much CPU runtime a
++group can consume within a given period. If the group consumes more CPU time
++than the runtime in a given period, it gets throttled. None of the tasks of
++the throttled group gets to run until the runtime of the group gets refreshed
++at the beginning of the next period.
++
++2. Interface
++------------
++
++Hard limit feature adds 2 cgroup files for CFS group scheduler:
++
++cfs_runtime_us: Hard limit for the group in microseconds.
++
++cfs_period_us: Time period in microseconds within which hard limits is
++enforced.
++
++A group gets created with default values for runtime (infinite runtime which
++means hard limits disabled) and period (0.5s). Each group can set its own
++values for runtime and period independent of other groups in the system.
++
++3. Examples
++-----------
++
++# mount -t cgroup -ocpu none /cgroups/
++# cd /cgroups
++# mkdir 1
++# cd 1/
++# echo 250000 > cfs_runtime_us /* set a 250ms runtime or limit */
++# echo 500000 > cfs_period_us /* set a 500ms period */
+diff -NurpP --minimal linux-2.6.32.59/Documentation/vserver/debug.txt linux-2.6.32.59-vs2.3.0.36.29.9/Documentation/vserver/debug.txt
+--- linux-2.6.32.59/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/Documentation/vserver/debug.txt 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,154 @@
++
++debug_cvirt:
++
++ 2 4 "vx_map_tgid: %p/%llx: %d -> %d"
++ "vx_rmap_tgid: %p/%llx: %d -> %d"
++
++debug_dlim:
++
++ 0 1 "ALLOC (%p,#%d)%c inode (%d)"
++ "FREE (%p,#%d)%c inode"
++ 1 2 "ALLOC (%p,#%d)%c %lld bytes (%d)"
++ "FREE (%p,#%d)%c %lld bytes"
++ 2 4 "ADJUST: %lld,%lld on %ld,%ld [mult=%d]"
++ 3 8 "ext3_has_free_blocks(%p): %lu<%lu+1, %c, %u!=%u r=%d"
++ "ext3_has_free_blocks(%p): free=%lu, root=%lu"
++ "rcu_free_dl_info(%p)"
++ 4 10 "alloc_dl_info(%p,%d) = %p"
++ "dealloc_dl_info(%p)"
++ "get_dl_info(%p[#%d.%d])"
++ "put_dl_info(%p[#%d.%d])"
++ 5 20 "alloc_dl_info(%p,%d)*"
++ 6 40 "__hash_dl_info: %p[#%d]"
++ "__unhash_dl_info: %p[#%d]"
++ 7 80 "locate_dl_info(%p,#%d) = %p"
++
++debug_misc:
++
++ 0 1 "destroy_dqhash: %p [#0x%08x] c=%d"
++ "new_dqhash: %p [#0x%08x]"
++ "vroot[%d]_clr_dev: dev=%p[%lu,%d:%d]"
++ "vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]"
++ "vroot[%d]_set_dev: dev=%p[%lu,%d:%d]"
++ "vroot_get_real_bdev not set"
++ 1 2 "cow_break_link(»%s«)"
++ "temp copy »%s«"
++ 2 4 "dentry_open(new): %p"
++ "dentry_open(old): %p"
++ "lookup_create(new): %p"
++ "old path »%s«"
++ "path_lookup(old): %d"
++ "vfs_create(new): %d"
++ "vfs_rename: %d"
++ "vfs_sendfile: %d"
++ 3 8 "fput(new_file=%p[#%d])"
++ "fput(old_file=%p[#%d])"
++ 4 10 "vx_info_kill(%p[#%d],%d,%d) = %d"
++ "vx_info_kill(%p[#%d],%d,%d)*"
++ 5 20 "vs_reboot(%p[#%d],%d)"
++ 6 40 "dropping task %p[#%u,%u] for %p[#%u,%u]"
++
++debug_net:
++
++ 2 4 "nx_addr_conflict(%p,%p) %d.%d,%d.%d"
++ 3 8 "inet_bind(%p) %d.%d.%d.%d, %d.%d.%d.%d, %d.%d.%d.%d"
++ "inet_bind(%p)* %p,%p;%lx %d.%d.%d.%d"
++ 4 10 "ip_route_connect(%p) %p,%p;%lx"
++ 5 20 "__addr_in_socket(%p,%d.%d.%d.%d) %p:%d.%d.%d.%d %p;%lx"
++ 6 40 "sk,egf: %p [#%d] (from %d)"
++ "sk,egn: %p [#%d] (from %d)"
++ "sk,req: %p [#%d] (from %d)"
++ "sk: %p [#%d] (from %d)"
++ "tw: %p [#%d] (from %d)"
++ 7 80 "__sock_recvmsg: %p[%p,%p,%p;%d]:%d/%d"
++ "__sock_sendmsg: %p[%p,%p,%p;%d]:%d/%d"
++
++debug_nid:
++
++ 0 1 "__lookup_nx_info(#%u): %p[#%u]"
++ "alloc_nx_info(%d) = %p"
++ "create_nx_info(%d) (dynamic rejected)"
++ "create_nx_info(%d) = %p (already there)"
++ "create_nx_info(%d) = %p (new)"
++ "dealloc_nx_info(%p)"
++ 1 2 "alloc_nx_info(%d)*"
++ "create_nx_info(%d)*"
++ 2 4 "get_nx_info(%p[#%d.%d])"
++ "put_nx_info(%p[#%d.%d])"
++ 3 8 "claim_nx_info(%p[#%d.%d.%d]) %p"
++ "clr_nx_info(%p[#%d.%d])"
++ "init_nx_info(%p[#%d.%d])"
++ "release_nx_info(%p[#%d.%d.%d]) %p"
++ "set_nx_info(%p[#%d.%d])"
++ 4 10 "__hash_nx_info: %p[#%d]"
++ "__nx_dynamic_id: [#%d]"
++ "__unhash_nx_info: %p[#%d.%d.%d]"
++ 5 20 "moved task %p into nxi:%p[#%d]"
++ "nx_migrate_task(%p,%p[#%d.%d.%d])"
++ "task_get_nx_info(%p)"
++ 6 40 "nx_clear_persistent(%p[#%d])"
++
++debug_quota:
++
++ 0 1 "quota_sync_dqh(%p,%d) discard inode %p"
++ 1 2 "quota_sync_dqh(%p,%d)"
++ "sync_dquots(%p,%d)"
++ "sync_dquots_dqh(%p,%d)"
++ 3 8 "do_quotactl(%p,%d,cmd=%d,id=%d,%p)"
++
++debug_switch:
++
++ 0 1 "vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]"
++ 1 2 "vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]"
++ 4 10 "%s: (%s %s) returned %s with %d"
++
++debug_tag:
++
++ 7 80 "dx_parse_tag(»%s«): %d:#%d"
++ "dx_propagate_tag(%p[#%lu.%d]): %d,%d"
++
++debug_xid:
++
++ 0 1 "__lookup_vx_info(#%u): %p[#%u]"
++ "alloc_vx_info(%d) = %p"
++ "alloc_vx_info(%d)*"
++ "create_vx_info(%d) (dynamic rejected)"
++ "create_vx_info(%d) = %p (already there)"
++ "create_vx_info(%d) = %p (new)"
++ "dealloc_vx_info(%p)"
++ "loc_vx_info(%d) = %p (found)"
++ "loc_vx_info(%d) = %p (new)"
++ "loc_vx_info(%d) = %p (not available)"
++ 1 2 "create_vx_info(%d)*"
++ "loc_vx_info(%d)*"
++ 2 4 "get_vx_info(%p[#%d.%d])"
++ "put_vx_info(%p[#%d.%d])"
++ 3 8 "claim_vx_info(%p[#%d.%d.%d]) %p"
++ "clr_vx_info(%p[#%d.%d])"
++ "init_vx_info(%p[#%d.%d])"
++ "release_vx_info(%p[#%d.%d.%d]) %p"
++ "set_vx_info(%p[#%d.%d])"
++ 4 10 "__hash_vx_info: %p[#%d]"
++ "__unhash_vx_info: %p[#%d.%d.%d]"
++ "__vx_dynamic_id: [#%d]"
++ 5 20 "enter_vx_info(%p[#%d],%p) %p[#%d,%p]"
++ "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]"
++ "moved task %p into vxi:%p[#%d]"
++ "task_get_vx_info(%p)"
++ "vx_migrate_task(%p,%p[#%d.%d])"
++ 6 40 "vx_clear_persistent(%p[#%d])"
++ "vx_exit_init(%p[#%d],%p[#%d,%d,%d])"
++ "vx_set_init(%p[#%d],%p[#%d,%d,%d])"
++ "vx_set_persistent(%p[#%d])"
++ "vx_set_reaper(%p[#%d],%p[#%d,%d])"
++ 7 80 "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]"
++
++
++debug_limit:
++
++ n 2^n "vx_acc_cres[%5d,%s,%2d]: %5d%s"
++ "vx_cres_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
++
++ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
++ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
++ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
+diff -NurpP --minimal linux-2.6.32.59/arch/alpha/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/Kconfig
+--- linux-2.6.32.59/arch/alpha/Kconfig 2009-12-03 20:01:49.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -674,6 +674,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.6/arch/alpha/kernel/entry.S linux-2.6.32.6-vs2.3.0.36.28/arch/alpha/kernel/entry.S
---- linux-2.6.32.6/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/alpha/kernel/entry.S 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/alpha/kernel/entry.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/entry.S
+--- linux-2.6.32.59/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/entry.S 2011-06-10 13:03:02.000000000 +0200
@@ -874,24 +874,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.32.6/arch/alpha/kernel/osf_sys.c linux-2.6.32.6-vs2.3.0.36.28/arch/alpha/kernel/osf_sys.c
---- linux-2.6.32.6/arch/alpha/kernel/osf_sys.c 2010-01-26 19:31:20.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/alpha/kernel/osf_sys.c 2010-01-20 04:21:33.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/alpha/kernel/osf_sys.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.32.59/arch/alpha/kernel/osf_sys.c 2012-03-20 11:26:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/osf_sys.c 2011-11-17 12:18:26.000000000 +0100
@@ -865,7 +865,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
{
if (tv) {
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.32.6/arch/alpha/kernel/ptrace.c linux-2.6.32.6-vs2.3.0.36.28/arch/alpha/kernel/ptrace.c
---- linux-2.6.32.6/arch/alpha/kernel/ptrace.c 2009-09-10 15:25:14.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/alpha/kernel/ptrace.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/alpha/kernel/ptrace.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/ptrace.c
+--- linux-2.6.32.59/arch/alpha/kernel/ptrace.c 2009-09-10 15:25:14.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/ptrace.c 2011-06-10 13:03:02.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/slab.h>
#include <linux/security.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.32.6/arch/alpha/kernel/systbls.S linux-2.6.32.6-vs2.3.0.36.28/arch/alpha/kernel/systbls.S
---- linux-2.6.32.6/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/alpha/kernel/systbls.S 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/alpha/kernel/systbls.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/systbls.S
+--- linux-2.6.32.59/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/systbls.S 2011-06-10 13:03:02.000000000 +0200
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
.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.32.6/arch/alpha/kernel/traps.c linux-2.6.32.6-vs2.3.0.36.28/arch/alpha/kernel/traps.c
---- linux-2.6.32.6/arch/alpha/kernel/traps.c 2009-06-11 17:11:46.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/alpha/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/alpha/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/traps.c
+--- linux-2.6.32.59/arch/alpha/kernel/traps.c 2009-06-11 17:11:46.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-2.6.32.6/arch/alpha/mm/fault.c linux-2.6.32.6-vs2.3.0.36.28/arch/alpha/mm/fault.c
---- linux-2.6.32.6/arch/alpha/mm/fault.c 2009-09-10 15:25:14.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/alpha/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/alpha/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/mm/fault.c
+--- linux-2.6.32.59/arch/alpha/mm/fault.c 2009-09-10 15:25:14.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -193,8 +193,8 @@ do_page_fault(unsigned long address, uns
down_read(&mm->mmap_sem);
goto survive;
if (!user_mode(regs))
goto no_context;
do_group_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.32.6/arch/arm/Kconfig linux-2.6.32.6-vs2.3.0.36.28/arch/arm/Kconfig
---- linux-2.6.32.6/arch/arm/Kconfig 2009-12-03 20:01:49.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/arm/Kconfig 2009-12-03 20:04:56.000000000 +0100
-@@ -1512,6 +1512,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.32.59/arch/arm/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/Kconfig
+--- linux-2.6.32.59/arch/arm/Kconfig 2012-03-20 11:26:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/Kconfig 2012-01-10 09:18:12.000000000 +0100
+@@ -1536,6 +1536,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.6/arch/arm/kernel/calls.S linux-2.6.32.6-vs2.3.0.36.28/arch/arm/kernel/calls.S
---- linux-2.6.32.6/arch/arm/kernel/calls.S 2010-01-26 19:31:20.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/arm/kernel/calls.S 2010-01-20 04:21:33.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/arm/include/asm/tlb.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/include/asm/tlb.h
+--- linux-2.6.32.59/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/include/asm/tlb.h 2011-06-10 13:03:02.000000000 +0200
+@@ -27,6 +27,7 @@
+
+ #else /* !CONFIG_MMU */
+
++#include <linux/vs_memory.h>
+ #include <asm/pgalloc.h>
+
+ /*
+diff -NurpP --minimal linux-2.6.32.59/arch/arm/kernel/calls.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/kernel/calls.S
+--- linux-2.6.32.59/arch/arm/kernel/calls.S 2012-03-20 11:26:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/kernel/calls.S 2011-06-10 13:03:02.000000000 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.32.6/arch/arm/kernel/process.c linux-2.6.32.6-vs2.3.0.36.28/arch/arm/kernel/process.c
---- linux-2.6.32.6/arch/arm/kernel/process.c 2009-12-03 20:01:50.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/arm/kernel/process.c 2009-12-03 20:04:56.000000000 +0100
-@@ -269,7 +269,8 @@ void __show_regs(struct pt_regs *regs)
+diff -NurpP --minimal linux-2.6.32.59/arch/arm/kernel/process.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/kernel/process.c
+--- linux-2.6.32.59/arch/arm/kernel/process.c 2012-03-20 11:26:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/kernel/process.c 2012-01-10 09:18:12.000000000 +0100
+@@ -272,7 +272,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
printk("\n");
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-2.6.32.6/arch/arm/kernel/traps.c linux-2.6.32.6-vs2.3.0.36.28/arch/arm/kernel/traps.c
---- linux-2.6.32.6/arch/arm/kernel/traps.c 2009-12-03 20:01:50.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/arm/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/arm/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/kernel/traps.c
+--- linux-2.6.32.59/arch/arm/kernel/traps.c 2009-12-03 20:01:50.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -234,8 +234,8 @@ static void __die(const char *str, int e
sysfs_printk_last_file();
print_modules();
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.32.6/arch/avr32/mm/fault.c linux-2.6.32.6-vs2.3.0.36.28/arch/avr32/mm/fault.c
---- linux-2.6.32.6/arch/avr32/mm/fault.c 2009-09-10 15:25:20.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/avr32/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/avr32/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/avr32/mm/fault.c
+--- linux-2.6.32.59/arch/avr32/mm/fault.c 2009-09-10 15:25:20.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/avr32/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -216,7 +216,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.6/arch/cris/Kconfig linux-2.6.32.6-vs2.3.0.36.28/arch/cris/Kconfig
---- linux-2.6.32.6/arch/cris/Kconfig 2009-06-11 17:11:56.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/cris/Kconfig 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/cris/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/cris/Kconfig
+--- linux-2.6.32.59/arch/cris/Kconfig 2009-06-11 17:11:56.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/cris/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -685,6 +685,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.6/arch/cris/mm/fault.c linux-2.6.32.6-vs2.3.0.36.28/arch/cris/mm/fault.c
---- linux-2.6.32.6/arch/cris/mm/fault.c 2009-12-03 20:01:56.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/cris/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/cris/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/cris/mm/fault.c
+--- linux-2.6.32.59/arch/cris/mm/fault.c 2009-12-03 20:01:56.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/cris/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -245,7 +245,8 @@ do_page_fault(unsigned long address, str
out_of_memory:
if (user_mode(regs))
do_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.6/arch/frv/kernel/kernel_thread.S linux-2.6.32.6-vs2.3.0.36.28/arch/frv/kernel/kernel_thread.S
---- linux-2.6.32.6/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/frv/kernel/kernel_thread.S 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/frv/kernel/kernel_thread.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.32.59/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/frv/kernel/kernel_thread.S 2011-06-10 13:03:02.000000000 +0200
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
setlo #0xe4e4,gr9
setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
-diff -NurpP --minimal linux-2.6.32.6/arch/frv/mm/fault.c linux-2.6.32.6-vs2.3.0.36.28/arch/frv/mm/fault.c
---- linux-2.6.32.6/arch/frv/mm/fault.c 2009-09-10 15:25:22.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/frv/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/frv/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/frv/mm/fault.c
+--- linux-2.6.32.59/arch/frv/mm/fault.c 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/frv/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -257,7 +257,8 @@ asmlinkage void do_page_fault(int datamm
*/
out_of_memory:
if (user_mode(__frame))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.6/arch/h8300/Kconfig linux-2.6.32.6-vs2.3.0.36.28/arch/h8300/Kconfig
---- linux-2.6.32.6/arch/h8300/Kconfig 2009-03-24 14:18:24.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/h8300/Kconfig 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/h8300/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/h8300/Kconfig
+--- linux-2.6.32.59/arch/h8300/Kconfig 2009-03-24 14:18:24.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/h8300/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -226,6 +226,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.6/arch/ia64/ia32/ia32_entry.S linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.32.6/arch/ia64/ia32/ia32_entry.S 2009-06-11 17:11:57.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/ia32/ia32_entry.S 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/ia64/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/Kconfig
+--- linux-2.6.32.59/arch/ia64/Kconfig 2012-03-20 11:26:01.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/Kconfig 2012-03-23 18:34:19.000000000 +0100
+@@ -668,6 +668,8 @@ source "fs/Kconfig"
+
+ source "arch/ia64/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-2.6.32.59/arch/ia64/ia32/ia32_entry.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.32.59/arch/ia64/ia32/ia32_entry.S 2009-06-11 17:11:57.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/ia32/ia32_entry.S 2011-06-10 13:03:02.000000000 +0200
@@ -451,7 +451,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.32.6/arch/ia64/include/asm/tlb.h linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/include/asm/tlb.h
---- linux-2.6.32.6/arch/ia64/include/asm/tlb.h 2009-09-10 15:25:22.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/include/asm/tlb.h 2009-12-31 14:37:34.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/ia64/include/asm/tlb.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/include/asm/tlb.h
+--- linux-2.6.32.59/arch/ia64/include/asm/tlb.h 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/include/asm/tlb.h 2011-06-10 13:03:02.000000000 +0200
@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.32.6/arch/ia64/Kconfig linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/Kconfig
---- linux-2.6.32.6/arch/ia64/Kconfig 2009-12-03 20:01:56.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/Kconfig 2009-12-03 20:04:56.000000000 +0100
-@@ -685,6 +685,8 @@ source "fs/Kconfig"
-
- source "arch/ia64/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.6/arch/ia64/kernel/entry.S linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/kernel/entry.S
---- linux-2.6.32.6/arch/ia64/kernel/entry.S 2009-09-10 15:25:22.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/kernel/entry.S 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/ia64/kernel/entry.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/entry.S
+--- linux-2.6.32.59/arch/ia64/kernel/entry.S 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/entry.S 2011-06-10 13:03:02.000000000 +0200
@@ -1753,7 +1753,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.32.6/arch/ia64/kernel/perfmon.c linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/kernel/perfmon.c
---- linux-2.6.32.6/arch/ia64/kernel/perfmon.c 2009-09-10 15:25:22.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/kernel/perfmon.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/ia64/kernel/perfmon.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/perfmon.c
+--- linux-2.6.32.59/arch/ia64/kernel/perfmon.c 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/perfmon.c 2011-06-10 13:03:02.000000000 +0200
@@ -41,6 +41,7 @@
#include <linux/rcupdate.h>
#include <linux/completion.h>
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.32.6/arch/ia64/kernel/process.c linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/kernel/process.c
---- linux-2.6.32.6/arch/ia64/kernel/process.c 2009-12-03 20:01:56.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/kernel/process.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/ia64/kernel/process.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/process.c
+--- linux-2.6.32.59/arch/ia64/kernel/process.c 2009-12-03 20:01:56.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/process.c 2011-06-10 13:03:02.000000000 +0200
@@ -110,8 +110,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
init_utsname()->release);
-diff -NurpP --minimal linux-2.6.32.6/arch/ia64/kernel/ptrace.c linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/kernel/ptrace.c
---- linux-2.6.32.6/arch/ia64/kernel/ptrace.c 2009-09-10 15:25:22.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/kernel/ptrace.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/ia64/kernel/ptrace.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/ptrace.c
+--- linux-2.6.32.59/arch/ia64/kernel/ptrace.c 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/ptrace.c 2011-06-10 13:03:02.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.32.6/arch/ia64/kernel/traps.c linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/kernel/traps.c
---- linux-2.6.32.6/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/ia64/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/traps.c
+--- linux-2.6.32.59/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
}
}
}
-diff -NurpP --minimal linux-2.6.32.6/arch/ia64/mm/fault.c linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/mm/fault.c
---- linux-2.6.32.6/arch/ia64/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/ia64/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/ia64/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/mm/fault.c
+--- linux-2.6.32.59/arch/ia64/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.6/arch/m32r/kernel/traps.c linux-2.6.32.6-vs2.3.0.36.28/arch/m32r/kernel/traps.c
---- linux-2.6.32.6/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/m32r/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/m32r/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/m32r/kernel/traps.c
+--- linux-2.6.32.59/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/m32r/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.32.6/arch/m32r/mm/fault.c linux-2.6.32.6-vs2.3.0.36.28/arch/m32r/mm/fault.c
---- linux-2.6.32.6/arch/m32r/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/m32r/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/m32r/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/m32r/mm/fault.c
+--- linux-2.6.32.59/arch/m32r/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/m32r/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -276,7 +276,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
if (error_code & ACE_USERMODE)
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.6/arch/m68k/Kconfig linux-2.6.32.6-vs2.3.0.36.28/arch/m68k/Kconfig
---- linux-2.6.32.6/arch/m68k/Kconfig 2009-12-03 20:01:57.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/m68k/Kconfig 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/m68k/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68k/Kconfig
+--- linux-2.6.32.59/arch/m68k/Kconfig 2009-12-03 20:01:57.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68k/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -622,6 +622,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.6/arch/m68k/kernel/ptrace.c linux-2.6.32.6-vs2.3.0.36.28/arch/m68k/kernel/ptrace.c
---- linux-2.6.32.6/arch/m68k/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/m68k/kernel/ptrace.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/m68k/kernel/ptrace.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68k/kernel/ptrace.c
+--- linux-2.6.32.59/arch/m68k/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68k/kernel/ptrace.c 2011-06-10 13:03:02.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/user.h>
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.32.6/arch/m68k/kernel/traps.c linux-2.6.32.6-vs2.3.0.36.28/arch/m68k/kernel/traps.c
---- linux-2.6.32.6/arch/m68k/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/m68k/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/m68k/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68k/kernel/traps.c
+--- linux-2.6.32.59/arch/m68k/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68k/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -906,8 +906,8 @@ void show_registers(struct pt_regs *regs
printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
regs->d4, regs->d5, regs->a0, regs->a1);
addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format);
switch (regs->format) {
-diff -NurpP --minimal linux-2.6.32.6/arch/m68k/mm/fault.c linux-2.6.32.6-vs2.3.0.36.28/arch/m68k/mm/fault.c
---- linux-2.6.32.6/arch/m68k/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/m68k/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/m68k/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68k/mm/fault.c
+--- linux-2.6.32.59/arch/m68k/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68k/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -186,7 +186,8 @@ out_of_memory:
goto survive;
}
if (user_mode(regs))
do_group_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.32.6/arch/m68knommu/Kconfig linux-2.6.32.6-vs2.3.0.36.28/arch/m68knommu/Kconfig
---- linux-2.6.32.6/arch/m68knommu/Kconfig 2009-12-03 20:01:57.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/m68knommu/Kconfig 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/m68knommu/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68knommu/Kconfig
+--- linux-2.6.32.59/arch/m68knommu/Kconfig 2009-12-03 20:01:57.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68knommu/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -727,6 +727,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.6/arch/m68knommu/kernel/traps.c linux-2.6.32.6-vs2.3.0.36.28/arch/m68knommu/kernel/traps.c
---- linux-2.6.32.6/arch/m68knommu/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/m68knommu/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/m68knommu/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68knommu/kernel/traps.c
+--- linux-2.6.32.59/arch/m68knommu/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68knommu/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -78,8 +78,9 @@ void die_if_kernel(char *str, struct pt_
printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
fp->d4, fp->d5, fp->a0, fp->a1);
show_stack(NULL, (unsigned long *)(fp + 1));
add_taint(TAINT_DIE);
do_exit(SIGSEGV);
-diff -NurpP --minimal linux-2.6.32.6/arch/microblaze/mm/fault.c linux-2.6.32.6-vs2.3.0.36.28/arch/microblaze/mm/fault.c
---- linux-2.6.32.6/arch/microblaze/mm/fault.c 2009-09-10 15:25:24.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/microblaze/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/microblaze/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/microblaze/mm/fault.c
+--- linux-2.6.32.59/arch/microblaze/mm/fault.c 2009-09-10 15:25:24.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/microblaze/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -279,7 +279,8 @@ out_of_memory:
goto survive;
}
if (user_mode(regs))
do_exit(SIGKILL);
bad_page_fault(regs, address, SIGKILL);
-diff -NurpP --minimal linux-2.6.32.6/arch/mips/Kconfig linux-2.6.32.6-vs2.3.0.36.28/arch/mips/Kconfig
---- linux-2.6.32.6/arch/mips/Kconfig 2009-12-03 20:01:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/mips/Kconfig 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/mips/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/Kconfig
+--- linux-2.6.32.59/arch/mips/Kconfig 2009-12-03 20:01:58.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -2188,6 +2188,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.6/arch/mips/kernel/ptrace.c linux-2.6.32.6-vs2.3.0.36.28/arch/mips/kernel/ptrace.c
---- linux-2.6.32.6/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/mips/kernel/ptrace.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/mips/kernel/ptrace.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/ptrace.c
+--- linux-2.6.32.59/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/ptrace.c 2011-06-10 13:03:02.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-2.6.32.6/arch/mips/kernel/scall32-o32.S linux-2.6.32.6-vs2.3.0.36.28/arch/mips/kernel/scall32-o32.S
---- linux-2.6.32.6/arch/mips/kernel/scall32-o32.S 2009-12-03 20:01:59.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/mips/kernel/scall32-o32.S 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/mips/kernel/scall32-o32.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/scall32-o32.S
+--- linux-2.6.32.59/arch/mips/kernel/scall32-o32.S 2009-12-03 20:01:59.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/scall32-o32.S 2011-06-10 13:03:02.000000000 +0200
@@ -525,7 +525,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-2.6.32.6/arch/mips/kernel/scall64-64.S linux-2.6.32.6-vs2.3.0.36.28/arch/mips/kernel/scall64-64.S
---- linux-2.6.32.6/arch/mips/kernel/scall64-64.S 2009-12-03 20:01:59.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/mips/kernel/scall64-64.S 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/mips/kernel/scall64-64.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/scall64-64.S
+--- linux-2.6.32.59/arch/mips/kernel/scall64-64.S 2009-12-03 20:01:59.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/scall64-64.S 2011-06-10 13:03:02.000000000 +0200
@@ -362,7 +362,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.32.6/arch/mips/kernel/scall64-n32.S linux-2.6.32.6-vs2.3.0.36.28/arch/mips/kernel/scall64-n32.S
---- linux-2.6.32.6/arch/mips/kernel/scall64-n32.S 2009-12-03 20:01:59.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/mips/kernel/scall64-n32.S 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/mips/kernel/scall64-n32.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/scall64-n32.S
+--- linux-2.6.32.59/arch/mips/kernel/scall64-n32.S 2009-12-03 20:01:59.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/scall64-n32.S 2011-06-10 13:03:02.000000000 +0200
@@ -360,7 +360,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.32.6/arch/mips/kernel/scall64-o32.S linux-2.6.32.6-vs2.3.0.36.28/arch/mips/kernel/scall64-o32.S
---- linux-2.6.32.6/arch/mips/kernel/scall64-o32.S 2009-12-03 20:01:59.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/mips/kernel/scall64-o32.S 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/mips/kernel/scall64-o32.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/scall64-o32.S
+--- linux-2.6.32.59/arch/mips/kernel/scall64-o32.S 2009-12-03 20:01:59.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/scall64-o32.S 2011-06-10 13:03:02.000000000 +0200
@@ -480,7 +480,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.32.6/arch/mips/kernel/traps.c linux-2.6.32.6-vs2.3.0.36.28/arch/mips/kernel/traps.c
---- linux-2.6.32.6/arch/mips/kernel/traps.c 2009-12-03 20:01:59.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/mips/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/mips/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/traps.c
+--- linux-2.6.32.59/arch/mips/kernel/traps.c 2009-12-03 20:01:59.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -335,9 +335,10 @@ void show_registers(const struct pt_regs
__show_regs(regs);
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-2.6.32.6/arch/mn10300/mm/fault.c linux-2.6.32.6-vs2.3.0.36.28/arch/mn10300/mm/fault.c
---- linux-2.6.32.6/arch/mn10300/mm/fault.c 2009-09-10 15:25:39.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/mn10300/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/mn10300/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/mn10300/mm/fault.c
+--- linux-2.6.32.59/arch/mn10300/mm/fault.c 2009-09-10 15:25:39.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/mn10300/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -339,7 +339,8 @@ no_context:
out_of_memory:
up_read(&mm->mmap_sem);
if ((fault_code & MMUFCR_xFC_ACCESS) == MMUFCR_xFC_ACCESS_USR)
do_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.6/arch/parisc/Kconfig linux-2.6.32.6-vs2.3.0.36.28/arch/parisc/Kconfig
---- linux-2.6.32.6/arch/parisc/Kconfig 2009-12-03 20:02:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/parisc/Kconfig 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/parisc/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/parisc/Kconfig
+--- linux-2.6.32.59/arch/parisc/Kconfig 2009-12-03 20:02:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/parisc/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -294,6 +294,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.6/arch/parisc/kernel/syscall_table.S linux-2.6.32.6-vs2.3.0.36.28/arch/parisc/kernel/syscall_table.S
---- linux-2.6.32.6/arch/parisc/kernel/syscall_table.S 2009-12-03 20:02:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/parisc/kernel/syscall_table.S 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/parisc/kernel/syscall_table.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/parisc/kernel/syscall_table.S
+--- linux-2.6.32.59/arch/parisc/kernel/syscall_table.S 2009-12-03 20:02:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/parisc/kernel/syscall_table.S 2011-06-10 13:03:02.000000000 +0200
@@ -361,7 +361,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-2.6.32.6/arch/parisc/kernel/traps.c linux-2.6.32.6-vs2.3.0.36.28/arch/parisc/kernel/traps.c
---- linux-2.6.32.6/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/parisc/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/parisc/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/parisc/kernel/traps.c
+--- linux-2.6.32.59/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/parisc/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-2.6.32.6/arch/parisc/mm/fault.c linux-2.6.32.6-vs2.3.0.36.28/arch/parisc/mm/fault.c
---- linux-2.6.32.6/arch/parisc/mm/fault.c 2009-09-10 15:25:40.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/parisc/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/parisc/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/parisc/mm/fault.c
+--- linux-2.6.32.59/arch/parisc/mm/fault.c 2009-09-10 15:25:40.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/parisc/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -237,8 +237,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.6/arch/powerpc/include/asm/unistd.h linux-2.6.32.6-vs2.3.0.36.28/arch/powerpc/include/asm/unistd.h
---- linux-2.6.32.6/arch/powerpc/include/asm/unistd.h 2009-12-03 20:02:01.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/powerpc/include/asm/unistd.h 2009-12-03 20:04:56.000000000 +0100
-@@ -275,7 +275,7 @@
- #endif
- #define __NR_rtas 255
- #define __NR_sys_debug_setcontext 256
--/* Number 257 is reserved for vserver */
-+#define __NR_vserver 257
- #define __NR_migrate_pages 258
- #define __NR_mbind 259
- #define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-2.6.32.6/arch/powerpc/Kconfig linux-2.6.32.6-vs2.3.0.36.28/arch/powerpc/Kconfig
---- linux-2.6.32.6/arch/powerpc/Kconfig 2009-12-03 20:02:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/powerpc/Kconfig 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/Kconfig
+--- linux-2.6.32.59/arch/powerpc/Kconfig 2009-12-03 20:02:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -943,6 +943,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.32.6/arch/powerpc/kernel/irq.c linux-2.6.32.6-vs2.3.0.36.28/arch/powerpc/kernel/irq.c
---- linux-2.6.32.6/arch/powerpc/kernel/irq.c 2009-12-03 20:02:01.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/powerpc/kernel/irq.c 2009-12-03 20:04:56.000000000 +0100
-@@ -54,6 +54,7 @@
- #include <linux/pci.h>
- #include <linux/debugfs.h>
- #include <linux/perf_event.h>
-+// #include <linux/vs_context.h>
-
- #include <asm/uaccess.h>
- #include <asm/system.h>
-diff -NurpP --minimal linux-2.6.32.6/arch/powerpc/kernel/process.c linux-2.6.32.6-vs2.3.0.36.28/arch/powerpc/kernel/process.c
---- linux-2.6.32.6/arch/powerpc/kernel/process.c 2009-12-03 20:02:02.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/powerpc/kernel/process.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/include/asm/unistd.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/include/asm/unistd.h
+--- linux-2.6.32.59/arch/powerpc/include/asm/unistd.h 2009-12-03 20:02:01.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/include/asm/unistd.h 2011-06-10 13:03:02.000000000 +0200
+@@ -275,7 +275,7 @@
+ #endif
+ #define __NR_rtas 255
+ #define __NR_sys_debug_setcontext 256
+-/* Number 257 is reserved for vserver */
++#define __NR_vserver 257
+ #define __NR_migrate_pages 258
+ #define __NR_mbind 259
+ #define __NR_get_mempolicy 260
+diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/kernel/process.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/kernel/process.c
+--- linux-2.6.32.59/arch/powerpc/kernel/process.c 2012-03-20 11:26:03.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/kernel/process.c 2011-06-10 13:03:02.000000000 +0200
@@ -519,8 +519,9 @@ void show_regs(struct pt_regs * regs)
#else
printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-2.6.32.6/arch/powerpc/kernel/traps.c linux-2.6.32.6-vs2.3.0.36.28/arch/powerpc/kernel/traps.c
---- linux-2.6.32.6/arch/powerpc/kernel/traps.c 2009-09-10 15:25:41.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/powerpc/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/kernel/traps.c
+--- linux-2.6.32.59/arch/powerpc/kernel/traps.c 2009-09-10 15:25:41.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -931,8 +931,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-2.6.32.6/arch/powerpc/kernel/vdso.c linux-2.6.32.6-vs2.3.0.36.28/arch/powerpc/kernel/vdso.c
---- linux-2.6.32.6/arch/powerpc/kernel/vdso.c 2009-12-03 20:02:02.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/powerpc/kernel/vdso.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/kernel/vdso.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/kernel/vdso.c
+--- linux-2.6.32.59/arch/powerpc/kernel/vdso.c 2009-12-03 20:02:02.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/kernel/vdso.c 2011-06-10 13:03:02.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/security.h>
#include <linux/bootmem.h>
#include <asm/pgtable.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.32.6/arch/powerpc/mm/fault.c linux-2.6.32.6-vs2.3.0.36.28/arch/powerpc/mm/fault.c
---- linux-2.6.32.6/arch/powerpc/mm/fault.c 2009-12-03 20:02:02.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/powerpc/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/mm/fault.c
+--- linux-2.6.32.59/arch/powerpc/mm/fault.c 2009-12-03 20:02:02.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -358,7 +358,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
if (user_mode(regs))
do_group_exit(SIGKILL);
return SIGKILL;
-diff -NurpP --minimal linux-2.6.32.6/arch/s390/include/asm/tlb.h linux-2.6.32.6-vs2.3.0.36.28/arch/s390/include/asm/tlb.h
---- linux-2.6.32.6/arch/s390/include/asm/tlb.h 2009-09-10 15:25:43.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/s390/include/asm/tlb.h 2009-12-31 14:37:21.000000000 +0100
-@@ -23,6 +23,8 @@
+diff -NurpP --minimal linux-2.6.32.59/arch/s390/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/Kconfig
+--- linux-2.6.32.59/arch/s390/Kconfig 2012-03-20 11:26:03.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/Kconfig 2012-03-23 18:34:19.000000000 +0100
+@@ -619,6 +619,8 @@ source "fs/Kconfig"
- #include <linux/mm.h>
- #include <linux/swap.h>
-+#include <linux/vs_memory.h>
-+
+ source "arch/s390/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-2.6.32.59/arch/s390/include/asm/tlb.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/include/asm/tlb.h
+--- linux-2.6.32.59/arch/s390/include/asm/tlb.h 2009-09-10 15:25:43.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/include/asm/tlb.h 2011-06-10 13:03:02.000000000 +0200
+@@ -23,6 +23,8 @@
+
+ #include <linux/mm.h>
+ #include <linux/swap.h>
++#include <linux/vs_memory.h>
++
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/smp.h>
-diff -NurpP --minimal linux-2.6.32.6/arch/s390/include/asm/unistd.h linux-2.6.32.6-vs2.3.0.36.28/arch/s390/include/asm/unistd.h
---- linux-2.6.32.6/arch/s390/include/asm/unistd.h 2009-12-03 20:02:03.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/s390/include/asm/unistd.h 2009-12-30 00:58:47.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/s390/include/asm/unistd.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/include/asm/unistd.h
+--- linux-2.6.32.59/arch/s390/include/asm/unistd.h 2009-12-03 20:02:03.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/include/asm/unistd.h 2011-06-10 13:03:02.000000000 +0200
@@ -202,7 +202,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-2.6.32.6/arch/s390/Kconfig linux-2.6.32.6-vs2.3.0.36.28/arch/s390/Kconfig
---- linux-2.6.32.6/arch/s390/Kconfig 2009-12-03 20:02:03.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/s390/Kconfig 2009-12-03 20:04:56.000000000 +0100
-@@ -616,6 +616,8 @@ source "fs/Kconfig"
-
- source "arch/s390/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.6/arch/s390/kernel/ptrace.c linux-2.6.32.6-vs2.3.0.36.28/arch/s390/kernel/ptrace.c
---- linux-2.6.32.6/arch/s390/kernel/ptrace.c 2009-12-03 20:02:03.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/s390/kernel/ptrace.c 2009-12-03 20:04:56.000000000 +0100
-@@ -36,6 +36,7 @@
- #include <linux/regset.h>
+diff -NurpP --minimal linux-2.6.32.59/arch/s390/kernel/ptrace.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/kernel/ptrace.c
+--- linux-2.6.32.59/arch/s390/kernel/ptrace.c 2012-03-20 11:26:04.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/kernel/ptrace.c 2012-03-23 18:34:49.000000000 +0100
+@@ -37,6 +37,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
+ #include <linux/compat.h>
+#include <linux/vs_base.h>
#include <trace/syscall.h>
- #include <asm/compat.h>
#include <asm/segment.h>
-diff -NurpP --minimal linux-2.6.32.6/arch/s390/kernel/syscalls.S linux-2.6.32.6-vs2.3.0.36.28/arch/s390/kernel/syscalls.S
---- linux-2.6.32.6/arch/s390/kernel/syscalls.S 2009-12-03 20:02:03.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/s390/kernel/syscalls.S 2009-12-03 20:04:56.000000000 +0100
+ #include <asm/page.h>
+diff -NurpP --minimal linux-2.6.32.59/arch/s390/kernel/syscalls.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/kernel/syscalls.S
+--- linux-2.6.32.59/arch/s390/kernel/syscalls.S 2009-12-03 20:02:03.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/kernel/syscalls.S 2011-06-10 13:03:02.000000000 +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)
SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
-diff -NurpP --minimal linux-2.6.32.6/arch/s390/lib/uaccess_pt.c linux-2.6.32.6-vs2.3.0.36.28/arch/s390/lib/uaccess_pt.c
---- linux-2.6.32.6/arch/s390/lib/uaccess_pt.c 2009-09-10 15:25:43.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/s390/lib/uaccess_pt.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/s390/lib/uaccess_pt.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/lib/uaccess_pt.c
+--- linux-2.6.32.59/arch/s390/lib/uaccess_pt.c 2009-09-10 15:25:43.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/lib/uaccess_pt.c 2011-06-10 13:03:02.000000000 +0200
@@ -90,7 +90,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
return ret;
out_sigbus:
-diff -NurpP --minimal linux-2.6.32.6/arch/sh/Kconfig linux-2.6.32.6-vs2.3.0.36.28/arch/sh/Kconfig
---- linux-2.6.32.6/arch/sh/Kconfig 2009-12-03 20:02:03.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/sh/Kconfig 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/sh/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/Kconfig
+--- linux-2.6.32.59/arch/sh/Kconfig 2009-12-03 20:02:03.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -853,6 +853,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.6/arch/sh/kernel/irq.c linux-2.6.32.6-vs2.3.0.36.28/arch/sh/kernel/irq.c
---- linux-2.6.32.6/arch/sh/kernel/irq.c 2009-12-03 20:02:10.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/sh/kernel/irq.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/sh/kernel/irq.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/kernel/irq.c
+--- linux-2.6.32.59/arch/sh/kernel/irq.c 2009-12-03 20:02:10.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/kernel/irq.c 2011-06-10 13:03:02.000000000 +0200
@@ -12,6 +12,7 @@
#include <linux/kernel_stat.h>
#include <linux/seq_file.h>
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.32.6/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.32.6-vs2.3.0.36.28/arch/sh/kernel/vsyscall/vsyscall.c
---- linux-2.6.32.6/arch/sh/kernel/vsyscall/vsyscall.c 2009-03-24 14:18:42.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/sh/kernel/vsyscall/vsyscall.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/kernel/vsyscall/vsyscall.c
+--- linux-2.6.32.59/arch/sh/kernel/vsyscall/vsyscall.c 2009-03-24 14:18:42.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/kernel/vsyscall/vsyscall.c 2011-06-10 13:03:02.000000000 +0200
@@ -19,6 +19,7 @@
#include <linux/elf.h>
#include <linux/sched.h>
/*
* Should the kernel map a VDSO page into processes and pass its
-diff -NurpP --minimal linux-2.6.32.6/arch/sh/mm/fault_32.c linux-2.6.32.6-vs2.3.0.36.28/arch/sh/mm/fault_32.c
---- linux-2.6.32.6/arch/sh/mm/fault_32.c 2009-12-03 20:02:14.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/sh/mm/fault_32.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/sh/mm/fault_32.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/mm/fault_32.c
+--- linux-2.6.32.59/arch/sh/mm/fault_32.c 2009-12-03 20:02:14.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/mm/fault_32.c 2011-06-10 13:03:02.000000000 +0200
@@ -292,7 +292,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.6/arch/sh/mm/tlbflush_64.c linux-2.6.32.6-vs2.3.0.36.28/arch/sh/mm/tlbflush_64.c
---- linux-2.6.32.6/arch/sh/mm/tlbflush_64.c 2009-12-03 20:02:14.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/sh/mm/tlbflush_64.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/sh/mm/tlbflush_64.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/mm/tlbflush_64.c
+--- linux-2.6.32.59/arch/sh/mm/tlbflush_64.c 2009-12-03 20:02:14.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/mm/tlbflush_64.c 2011-06-10 13:03:02.000000000 +0200
@@ -306,7 +306,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.6/arch/sparc/include/asm/tlb_64.h linux-2.6.32.6-vs2.3.0.36.28/arch/sparc/include/asm/tlb_64.h
---- linux-2.6.32.6/arch/sparc/include/asm/tlb_64.h 2009-09-10 15:25:45.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/sparc/include/asm/tlb_64.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/sparc/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/Kconfig
+--- linux-2.6.32.59/arch/sparc/Kconfig 2009-12-03 20:02:14.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/Kconfig 2011-06-10 13:03:02.000000000 +0200
+@@ -550,6 +550,8 @@ source "fs/Kconfig"
+
+ source "arch/sparc/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-2.6.32.59/arch/sparc/include/asm/tlb_64.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/include/asm/tlb_64.h
+--- linux-2.6.32.59/arch/sparc/include/asm/tlb_64.h 2009-09-10 15:25:45.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/include/asm/tlb_64.h 2011-06-10 13:03:02.000000000 +0200
@@ -3,6 +3,7 @@
#include <linux/swap.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
-diff -NurpP --minimal linux-2.6.32.6/arch/sparc/include/asm/unistd.h linux-2.6.32.6-vs2.3.0.36.28/arch/sparc/include/asm/unistd.h
---- linux-2.6.32.6/arch/sparc/include/asm/unistd.h 2009-12-03 20:02:15.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/sparc/include/asm/unistd.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/sparc/include/asm/unistd.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/include/asm/unistd.h
+--- linux-2.6.32.59/arch/sparc/include/asm/unistd.h 2009-12-03 20:02:15.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/include/asm/unistd.h 2011-06-10 13:03:02.000000000 +0200
@@ -335,7 +335,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-2.6.32.6/arch/sparc/Kconfig linux-2.6.32.6-vs2.3.0.36.28/arch/sparc/Kconfig
---- linux-2.6.32.6/arch/sparc/Kconfig 2009-12-03 20:02:14.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/sparc/Kconfig 2009-12-03 20:04:56.000000000 +0100
-@@ -550,6 +550,8 @@ source "fs/Kconfig"
-
- source "arch/sparc/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.6/arch/sparc/kernel/systbls_32.S linux-2.6.32.6-vs2.3.0.36.28/arch/sparc/kernel/systbls_32.S
---- linux-2.6.32.6/arch/sparc/kernel/systbls_32.S 2010-01-26 19:31:21.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/sparc/kernel/systbls_32.S 2010-01-20 04:21:33.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/sparc/kernel/systbls_32.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/kernel/systbls_32.S
+--- linux-2.6.32.59/arch/sparc/kernel/systbls_32.S 2012-03-20 11:26:05.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/kernel/systbls_32.S 2011-06-10 13:03:02.000000000 +0200
@@ -70,7 +70,7 @@ sys_call_table:
/*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
/*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
/*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.32.6/arch/sparc/kernel/systbls_64.S linux-2.6.32.6-vs2.3.0.36.28/arch/sparc/kernel/systbls_64.S
---- linux-2.6.32.6/arch/sparc/kernel/systbls_64.S 2010-01-26 19:31:21.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/sparc/kernel/systbls_64.S 2010-01-20 04:21:33.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/sparc/kernel/systbls_64.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/kernel/systbls_64.S
+--- linux-2.6.32.59/arch/sparc/kernel/systbls_64.S 2012-03-20 11:26:05.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/kernel/systbls_64.S 2011-06-10 13:03:02.000000000 +0200
@@ -71,7 +71,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
/*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.32.6/arch/x86/ia32/ia32entry.S linux-2.6.32.6-vs2.3.0.36.28/arch/x86/ia32/ia32entry.S
---- linux-2.6.32.6/arch/x86/ia32/ia32entry.S 2010-01-26 19:31:21.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/x86/ia32/ia32entry.S 2010-01-20 04:21:33.000000000 +0100
-@@ -777,7 +777,7 @@ ia32_sys_call_table:
+diff -NurpP --minimal linux-2.6.32.59/arch/um/Kconfig.rest linux-2.6.32.59-vs2.3.0.36.29.9/arch/um/Kconfig.rest
+--- linux-2.6.32.59/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/um/Kconfig.rest 2011-06-10 13:03:02.000000000 +0200
+@@ -18,6 +18,8 @@ source "drivers/connector/Kconfig"
+
+ source "fs/Kconfig"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-2.6.32.59/arch/um/include/asm/tlb.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/um/include/asm/tlb.h
+--- linux-2.6.32.59/arch/um/include/asm/tlb.h 2009-09-10 15:25:46.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/um/include/asm/tlb.h 2011-06-10 13:03:02.000000000 +0200
+@@ -3,6 +3,7 @@
+
+ #include <linux/pagemap.h>
+ #include <linux/swap.h>
++#include <linux/vs_memory.h>
+ #include <asm/percpu.h>
+ #include <asm/pgalloc.h>
+ #include <asm/tlbflush.h>
+diff -NurpP --minimal linux-2.6.32.59/arch/x86/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/x86/Kconfig
+--- linux-2.6.32.59/arch/x86/Kconfig 2012-03-20 11:26:05.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/x86/Kconfig 2011-06-10 13:03:02.000000000 +0200
+@@ -2100,6 +2100,8 @@ source "fs/Kconfig"
+
+ source "arch/x86/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-2.6.32.59/arch/x86/ia32/ia32entry.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/x86/ia32/ia32entry.S
+--- linux-2.6.32.59/arch/x86/ia32/ia32entry.S 2012-03-20 11:26:05.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/x86/ia32/ia32entry.S 2011-06-10 13:03:02.000000000 +0200
+@@ -783,7 +783,7 @@ ia32_sys_call_table:
.quad sys_tgkill /* 270 */
.quad compat_sys_utimes
.quad sys32_fadvise64_64
.quad sys_mbind
.quad compat_sys_get_mempolicy /* 275 */
.quad sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.32.6/arch/x86/include/asm/unistd_64.h linux-2.6.32.6-vs2.3.0.36.28/arch/x86/include/asm/unistd_64.h
---- linux-2.6.32.6/arch/x86/include/asm/unistd_64.h 2009-12-03 20:02:16.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/x86/include/asm/unistd_64.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/x86/include/asm/unistd_64.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/x86/include/asm/unistd_64.h
+--- linux-2.6.32.59/arch/x86/include/asm/unistd_64.h 2009-12-03 20:02:16.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/x86/include/asm/unistd_64.h 2011-06-10 13:03:02.000000000 +0200
@@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
#define __NR_utimes 235
__SYSCALL(__NR_utimes, sys_utimes)
#define __NR_mbind 237
__SYSCALL(__NR_mbind, sys_mbind)
#define __NR_set_mempolicy 238
-diff -NurpP --minimal linux-2.6.32.6/arch/x86/Kconfig linux-2.6.32.6-vs2.3.0.36.28/arch/x86/Kconfig
---- linux-2.6.32.6/arch/x86/Kconfig 2009-12-03 20:02:15.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/x86/Kconfig 2009-12-03 20:04:56.000000000 +0100
-@@ -2085,6 +2085,8 @@ source "fs/Kconfig"
-
- source "arch/x86/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.6/arch/x86/kernel/syscall_table_32.S linux-2.6.32.6-vs2.3.0.36.28/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.32.6/arch/x86/kernel/syscall_table_32.S 2010-01-26 19:31:21.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/x86/kernel/syscall_table_32.S 2010-01-20 04:21:33.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/x86/kernel/syscall_table_32.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.32.59/arch/x86/kernel/syscall_table_32.S 2012-03-20 11:26:06.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/x86/kernel/syscall_table_32.S 2011-06-10 13:03:02.000000000 +0200
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.32.6/arch/xtensa/mm/fault.c linux-2.6.32.6-vs2.3.0.36.28/arch/xtensa/mm/fault.c
---- linux-2.6.32.6/arch/xtensa/mm/fault.c 2009-09-10 15:25:48.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/arch/xtensa/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/arch/xtensa/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/xtensa/mm/fault.c
+--- linux-2.6.32.59/arch/xtensa/mm/fault.c 2009-09-10 15:25:48.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/xtensa/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -151,7 +151,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
if (user_mode(regs))
do_group_exit(SIGKILL);
bad_page_fault(regs, address, SIGKILL);
-diff -NurpP --minimal linux-2.6.32.6/Documentation/scheduler/sched-cfs-hard-limits.txt linux-2.6.32.6-vs2.3.0.36.28/Documentation/scheduler/sched-cfs-hard-limits.txt
---- linux-2.6.32.6/Documentation/scheduler/sched-cfs-hard-limits.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/Documentation/scheduler/sched-cfs-hard-limits.txt 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,48 @@
-+CPU HARD LIMITS FOR CFS GROUPS
-+==============================
+diff -NurpP --minimal linux-2.6.32.59/drivers/block/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/drivers/block/Kconfig
+--- linux-2.6.32.59/drivers/block/Kconfig 2009-09-10 15:25:49.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/block/Kconfig 2011-06-10 13:03:02.000000000 +0200
+@@ -271,6 +271,13 @@ config BLK_DEV_CRYPTOLOOP
+ instead, which can be configured to be on-disk compatible with the
+ cryptoloop device.
+
++config BLK_DEV_VROOT
++ tristate "Virtual Root device support"
++ depends on QUOTACTL
++ ---help---
++ Saying Y here will allow you to use quota/fs ioctls on a shared
++ partition within a virtual server without compromising security.
+
-+1. Overview
-+2. Interface
-+3. Examples
+ config BLK_DEV_NBD
+ tristate "Network block device support"
+ depends on NET
+diff -NurpP --minimal linux-2.6.32.59/drivers/block/Makefile linux-2.6.32.59-vs2.3.0.36.29.9/drivers/block/Makefile
+--- linux-2.6.32.59/drivers/block/Makefile 2009-09-10 15:25:49.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/block/Makefile 2011-06-10 13:03:02.000000000 +0200
+@@ -34,6 +34,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o
+ obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
+ obj-$(CONFIG_BLK_DEV_UB) += ub.o
+ obj-$(CONFIG_BLK_DEV_HD) += hd.o
++obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o
+
+ obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
+
+diff -NurpP --minimal linux-2.6.32.59/drivers/block/loop.c linux-2.6.32.59-vs2.3.0.36.29.9/drivers/block/loop.c
+--- linux-2.6.32.59/drivers/block/loop.c 2012-03-20 11:26:08.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/block/loop.c 2011-08-08 22:40:36.000000000 +0200
+@@ -74,6 +74,7 @@
+ #include <linux/gfp.h>
+ #include <linux/kthread.h>
+ #include <linux/splice.h>
++#include <linux/vs_context.h>
+
+ #include <asm/uaccess.h>
+
+@@ -814,6 +815,7 @@ static int loop_set_fd(struct loop_devic
+ lo->lo_blocksize = lo_blocksize;
+ lo->lo_device = bdev;
+ lo->lo_flags = lo_flags;
++ lo->lo_xid = vx_current_xid();
+ lo->lo_backing_file = file;
+ lo->transfer = transfer_none;
+ lo->ioctl = NULL;
+@@ -939,6 +941,7 @@ static int loop_clr_fd(struct loop_devic
+ lo->lo_encrypt_key_size = 0;
+ lo->lo_flags = 0;
+ lo->lo_thread = NULL;
++ lo->lo_xid = 0;
+ memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
+ memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
+ memset(lo->lo_file_name, 0, LO_NAME_SIZE);
+@@ -973,7 +976,7 @@ loop_set_status(struct loop_device *lo,
+
+ if (lo->lo_encrypt_key_size &&
+ lo->lo_key_owner != uid &&
+- !capable(CAP_SYS_ADMIN))
++ !vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP))
+ return -EPERM;
+ if (lo->lo_state != Lo_bound)
+ return -ENXIO;
+@@ -1057,7 +1060,8 @@ loop_get_status(struct loop_device *lo,
+ memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
+ info->lo_encrypt_type =
+ lo->lo_encryption ? lo->lo_encryption->number : 0;
+- if (lo->lo_encrypt_key_size && capable(CAP_SYS_ADMIN)) {
++ if (lo->lo_encrypt_key_size &&
++ vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP)) {
+ info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
+ memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
+ lo->lo_encrypt_key_size);
+@@ -1401,6 +1405,9 @@ static int lo_open(struct block_device *
+ {
+ struct loop_device *lo = bdev->bd_disk->private_data;
+
++ if (!vx_check(lo->lo_xid, VS_IDENT|VS_HOSTID|VS_ADMIN_P))
++ return -EACCES;
+
-+1. Overview
-+-----------
+ mutex_lock(&lo->lo_ctl_mutex);
+ lo->lo_refcnt++;
+ mutex_unlock(&lo->lo_ctl_mutex);
+diff -NurpP --minimal linux-2.6.32.59/drivers/block/vroot.c linux-2.6.32.59-vs2.3.0.36.29.9/drivers/block/vroot.c
+--- linux-2.6.32.59/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/block/vroot.c 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,281 @@
++/*
++ * linux/drivers/block/vroot.c
++ *
++ * written by Herbert Pötzl, 9/11/2002
++ * ported to 2.6.10 by Herbert Pötzl, 30/12/2004
++ *
++ * based on the loop.c code by Theodore Ts'o.
++ *
++ * Copyright (C) 2002-2007 by Herbert Pötzl.
++ * Redistribution of this file is permitted under the
++ * GNU General Public License.
++ *
++ */
+
-+CFS is a proportional share scheduler which tries to divide the CPU time
-+proportionately between tasks or groups of tasks (task group/cgroup) depending
-+on the priority/weight of the task or shares assigned to groups of tasks.
-+In CFS, a task/task group can get more than its share of CPU if there are
-+enough idle CPU cycles available in the system, due to the work conserving
-+nature of the scheduler. However in certain scenarios (like pay-per-use),
-+it is desirable not to provide extra time to a group even in the presence
-+of idle CPU cycles. This is where hard limiting can be of use.
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/file.h>
++#include <linux/major.h>
++#include <linux/blkdev.h>
+
-+Hard limits for task groups can be set by specifying how much CPU runtime a
-+group can consume within a given period. If the group consumes more CPU time
-+than the runtime in a given period, it gets throttled. None of the tasks of
-+the throttled group gets to run until the runtime of the group gets refreshed
-+at the beginning of the next period.
++#include <linux/vroot.h>
++#include <linux/vs_context.h>
+
-+2. Interface
-+------------
+
-+Hard limit feature adds 2 cgroup files for CFS group scheduler:
++static int max_vroot = 8;
+
-+cfs_runtime_us: Hard limit for the group in microseconds.
++static struct vroot_device *vroot_dev;
++static struct gendisk **disks;
+
-+cfs_period_us: Time period in microseconds within which hard limits is
-+enforced.
+
-+A group gets created with default values for runtime (infinite runtime which
-+means hard limits disabled) and period (0.5s). Each group can set its own
-+values for runtime and period independent of other groups in the system.
++static int vroot_set_dev(
++ struct vroot_device *vr,
++ struct block_device *bdev,
++ unsigned int arg)
++{
++ struct block_device *real_bdev;
++ struct file *file;
++ struct inode *inode;
++ int error;
+
-+3. Examples
-+-----------
++ error = -EBUSY;
++ if (vr->vr_state != Vr_unbound)
++ goto out;
+
-+# mount -t cgroup -ocpu none /cgroups/
-+# cd /cgroups
-+# mkdir 1
-+# cd 1/
-+# echo 250000 > cfs_runtime_us /* set a 250ms runtime or limit */
-+# echo 500000 > cfs_period_us /* set a 500ms period */
-diff -NurpP --minimal linux-2.6.32.6/Documentation/vserver/debug.txt linux-2.6.32.6-vs2.3.0.36.28/Documentation/vserver/debug.txt
---- linux-2.6.32.6/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/Documentation/vserver/debug.txt 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,154 @@
++ error = -EBADF;
++ file = fget(arg);
++ if (!file)
++ goto out;
+
-+debug_cvirt:
++ error = -EINVAL;
++ inode = file->f_dentry->d_inode;
+
-+ 2 4 "vx_map_tgid: %p/%llx: %d -> %d"
-+ "vx_rmap_tgid: %p/%llx: %d -> %d"
+
-+debug_dlim:
++ if (S_ISBLK(inode->i_mode)) {
++ real_bdev = inode->i_bdev;
++ vr->vr_device = real_bdev;
++ __iget(real_bdev->bd_inode);
++ } else
++ goto out_fput;
+
-+ 0 1 "ALLOC (%p,#%d)%c inode (%d)"
-+ "FREE (%p,#%d)%c inode"
-+ 1 2 "ALLOC (%p,#%d)%c %lld bytes (%d)"
-+ "FREE (%p,#%d)%c %lld bytes"
-+ 2 4 "ADJUST: %lld,%lld on %ld,%ld [mult=%d]"
-+ 3 8 "ext3_has_free_blocks(%p): %lu<%lu+1, %c, %u!=%u r=%d"
-+ "ext3_has_free_blocks(%p): free=%lu, root=%lu"
-+ "rcu_free_dl_info(%p)"
-+ 4 10 "alloc_dl_info(%p,%d) = %p"
-+ "dealloc_dl_info(%p)"
-+ "get_dl_info(%p[#%d.%d])"
-+ "put_dl_info(%p[#%d.%d])"
-+ 5 20 "alloc_dl_info(%p,%d)*"
-+ 6 40 "__hash_dl_info: %p[#%d]"
-+ "__unhash_dl_info: %p[#%d]"
-+ 7 80 "locate_dl_info(%p,#%d) = %p"
++ vxdprintk(VXD_CBIT(misc, 0),
++ "vroot[%d]_set_dev: dev=" VXF_DEV,
++ vr->vr_number, VXD_DEV(real_bdev));
+
-+debug_misc:
++ vr->vr_state = Vr_bound;
++ error = 0;
+
-+ 0 1 "destroy_dqhash: %p [#0x%08x] c=%d"
-+ "new_dqhash: %p [#0x%08x]"
-+ "vroot[%d]_clr_dev: dev=%p[%lu,%d:%d]"
-+ "vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]"
-+ "vroot[%d]_set_dev: dev=%p[%lu,%d:%d]"
-+ "vroot_get_real_bdev not set"
-+ 1 2 "cow_break_link(»%s«)"
-+ "temp copy »%s«"
-+ 2 4 "dentry_open(new): %p"
-+ "dentry_open(old): %p"
-+ "lookup_create(new): %p"
-+ "old path »%s«"
-+ "path_lookup(old): %d"
-+ "vfs_create(new): %d"
-+ "vfs_rename: %d"
-+ "vfs_sendfile: %d"
-+ 3 8 "fput(new_file=%p[#%d])"
-+ "fput(old_file=%p[#%d])"
-+ 4 10 "vx_info_kill(%p[#%d],%d,%d) = %d"
-+ "vx_info_kill(%p[#%d],%d,%d)*"
-+ 5 20 "vs_reboot(%p[#%d],%d)"
-+ 6 40 "dropping task %p[#%u,%u] for %p[#%u,%u]"
++ out_fput:
++ fput(file);
++ out:
++ return error;
++}
+
-+debug_net:
++static int vroot_clr_dev(
++ struct vroot_device *vr,
++ struct block_device *bdev)
++{
++ struct block_device *real_bdev;
+
-+ 2 4 "nx_addr_conflict(%p,%p) %d.%d,%d.%d"
-+ 3 8 "inet_bind(%p) %d.%d.%d.%d, %d.%d.%d.%d, %d.%d.%d.%d"
-+ "inet_bind(%p)* %p,%p;%lx %d.%d.%d.%d"
-+ 4 10 "ip_route_connect(%p) %p,%p;%lx"
-+ 5 20 "__addr_in_socket(%p,%d.%d.%d.%d) %p:%d.%d.%d.%d %p;%lx"
-+ 6 40 "sk,egf: %p [#%d] (from %d)"
-+ "sk,egn: %p [#%d] (from %d)"
-+ "sk,req: %p [#%d] (from %d)"
-+ "sk: %p [#%d] (from %d)"
-+ "tw: %p [#%d] (from %d)"
-+ 7 80 "__sock_recvmsg: %p[%p,%p,%p;%d]:%d/%d"
-+ "__sock_sendmsg: %p[%p,%p,%p;%d]:%d/%d"
++ if (vr->vr_state != Vr_bound)
++ return -ENXIO;
++ if (vr->vr_refcnt > 1) /* we needed one fd for the ioctl */
++ return -EBUSY;
+
-+debug_nid:
++ real_bdev = vr->vr_device;
+
-+ 0 1 "__lookup_nx_info(#%u): %p[#%u]"
-+ "alloc_nx_info(%d) = %p"
-+ "create_nx_info(%d) (dynamic rejected)"
-+ "create_nx_info(%d) = %p (already there)"
-+ "create_nx_info(%d) = %p (new)"
-+ "dealloc_nx_info(%p)"
-+ 1 2 "alloc_nx_info(%d)*"
-+ "create_nx_info(%d)*"
-+ 2 4 "get_nx_info(%p[#%d.%d])"
-+ "put_nx_info(%p[#%d.%d])"
-+ 3 8 "claim_nx_info(%p[#%d.%d.%d]) %p"
-+ "clr_nx_info(%p[#%d.%d])"
-+ "init_nx_info(%p[#%d.%d])"
-+ "release_nx_info(%p[#%d.%d.%d]) %p"
-+ "set_nx_info(%p[#%d.%d])"
-+ 4 10 "__hash_nx_info: %p[#%d]"
-+ "__nx_dynamic_id: [#%d]"
-+ "__unhash_nx_info: %p[#%d.%d.%d]"
-+ 5 20 "moved task %p into nxi:%p[#%d]"
-+ "nx_migrate_task(%p,%p[#%d.%d.%d])"
-+ "task_get_nx_info(%p)"
-+ 6 40 "nx_clear_persistent(%p[#%d])"
++ vxdprintk(VXD_CBIT(misc, 0),
++ "vroot[%d]_clr_dev: dev=" VXF_DEV,
++ vr->vr_number, VXD_DEV(real_bdev));
+
-+debug_quota:
++ bdput(real_bdev);
++ vr->vr_state = Vr_unbound;
++ vr->vr_device = NULL;
++ return 0;
++}
+
-+ 0 1 "quota_sync_dqh(%p,%d) discard inode %p"
-+ 1 2 "quota_sync_dqh(%p,%d)"
-+ "sync_dquots(%p,%d)"
-+ "sync_dquots_dqh(%p,%d)"
-+ 3 8 "do_quotactl(%p,%d,cmd=%d,id=%d,%p)"
+
-+debug_switch:
++static int vr_ioctl(struct block_device *bdev, fmode_t mode,
++ unsigned int cmd, unsigned long arg)
++{
++ struct vroot_device *vr = bdev->bd_disk->private_data;
++ int err;
+
-+ 0 1 "vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]"
-+ 1 2 "vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]"
-+ 4 10 "%s: (%s %s) returned %s with %d"
++ down(&vr->vr_ctl_mutex);
++ switch (cmd) {
++ case VROOT_SET_DEV:
++ err = vroot_set_dev(vr, bdev, arg);
++ break;
++ case VROOT_CLR_DEV:
++ err = vroot_clr_dev(vr, bdev);
++ break;
++ default:
++ err = -EINVAL;
++ break;
++ }
++ up(&vr->vr_ctl_mutex);
++ return err;
++}
+
-+debug_tag:
++static int vr_open(struct block_device *bdev, fmode_t mode)
++{
++ struct vroot_device *vr = bdev->bd_disk->private_data;
+
-+ 7 80 "dx_parse_tag(»%s«): %d:#%d"
-+ "dx_propagate_tag(%p[#%lu.%d]): %d,%d"
++ down(&vr->vr_ctl_mutex);
++ vr->vr_refcnt++;
++ up(&vr->vr_ctl_mutex);
++ return 0;
++}
+
-+debug_xid:
++static int vr_release(struct gendisk *disk, fmode_t mode)
++{
++ struct vroot_device *vr = disk->private_data;
+
-+ 0 1 "__lookup_vx_info(#%u): %p[#%u]"
-+ "alloc_vx_info(%d) = %p"
-+ "alloc_vx_info(%d)*"
-+ "create_vx_info(%d) (dynamic rejected)"
-+ "create_vx_info(%d) = %p (already there)"
-+ "create_vx_info(%d) = %p (new)"
-+ "dealloc_vx_info(%p)"
-+ "loc_vx_info(%d) = %p (found)"
-+ "loc_vx_info(%d) = %p (new)"
-+ "loc_vx_info(%d) = %p (not available)"
-+ 1 2 "create_vx_info(%d)*"
-+ "loc_vx_info(%d)*"
-+ 2 4 "get_vx_info(%p[#%d.%d])"
-+ "put_vx_info(%p[#%d.%d])"
-+ 3 8 "claim_vx_info(%p[#%d.%d.%d]) %p"
-+ "clr_vx_info(%p[#%d.%d])"
-+ "init_vx_info(%p[#%d.%d])"
-+ "release_vx_info(%p[#%d.%d.%d]) %p"
-+ "set_vx_info(%p[#%d.%d])"
-+ 4 10 "__hash_vx_info: %p[#%d]"
-+ "__unhash_vx_info: %p[#%d.%d.%d]"
-+ "__vx_dynamic_id: [#%d]"
-+ 5 20 "enter_vx_info(%p[#%d],%p) %p[#%d,%p]"
-+ "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]"
-+ "moved task %p into vxi:%p[#%d]"
-+ "task_get_vx_info(%p)"
-+ "vx_migrate_task(%p,%p[#%d.%d])"
-+ 6 40 "vx_clear_persistent(%p[#%d])"
-+ "vx_exit_init(%p[#%d],%p[#%d,%d,%d])"
-+ "vx_set_init(%p[#%d],%p[#%d,%d,%d])"
-+ "vx_set_persistent(%p[#%d])"
-+ "vx_set_reaper(%p[#%d],%p[#%d,%d])"
-+ 7 80 "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]"
++ down(&vr->vr_ctl_mutex);
++ --vr->vr_refcnt;
++ up(&vr->vr_ctl_mutex);
++ return 0;
++}
+
++static struct block_device_operations vr_fops = {
++ .owner = THIS_MODULE,
++ .open = vr_open,
++ .release = vr_release,
++ .ioctl = vr_ioctl,
++};
+
-+debug_limit:
++struct block_device *__vroot_get_real_bdev(struct block_device *bdev)
++{
++ struct inode *inode = bdev->bd_inode;
++ struct vroot_device *vr;
++ struct block_device *real_bdev;
++ int minor = iminor(inode);
+
-+ n 2^n "vx_acc_cres[%5d,%s,%2d]: %5d%s"
-+ "vx_cres_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
++ vr = &vroot_dev[minor];
++ real_bdev = vr->vr_device;
+
-+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
-+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
-+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-diff -NurpP --minimal linux-2.6.32.6/drivers/block/Kconfig linux-2.6.32.6-vs2.3.0.36.28/drivers/block/Kconfig
---- linux-2.6.32.6/drivers/block/Kconfig 2009-09-10 15:25:49.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/drivers/block/Kconfig 2009-12-03 20:04:56.000000000 +0100
-@@ -271,6 +271,13 @@ config BLK_DEV_CRYPTOLOOP
- instead, which can be configured to be on-disk compatible with the
- cryptoloop device.
-
-+config BLK_DEV_VROOT
-+ tristate "Virtual Root device support"
-+ depends on QUOTACTL
-+ ---help---
-+ Saying Y here will allow you to use quota/fs ioctls on a shared
-+ partition within a virtual server without compromising security.
++ vxdprintk(VXD_CBIT(misc, 0),
++ "vroot[%d]_get_real_bdev: dev=" VXF_DEV,
++ vr->vr_number, VXD_DEV(real_bdev));
+
- config BLK_DEV_NBD
- tristate "Network block device support"
- depends on NET
-diff -NurpP --minimal linux-2.6.32.6/drivers/block/loop.c linux-2.6.32.6-vs2.3.0.36.28/drivers/block/loop.c
---- linux-2.6.32.6/drivers/block/loop.c 2009-12-03 20:02:19.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/drivers/block/loop.c 2009-12-03 20:04:56.000000000 +0100
-@@ -74,6 +74,7 @@
- #include <linux/gfp.h>
- #include <linux/kthread.h>
- #include <linux/splice.h>
-+#include <linux/vs_context.h>
-
- #include <asm/uaccess.h>
-
-@@ -812,6 +813,7 @@ static int loop_set_fd(struct loop_devic
- lo->lo_blocksize = lo_blocksize;
- lo->lo_device = bdev;
- lo->lo_flags = lo_flags;
-+ lo->lo_xid = vx_current_xid();
- lo->lo_backing_file = file;
- lo->transfer = transfer_none;
- lo->ioctl = NULL;
-@@ -937,6 +939,7 @@ static int loop_clr_fd(struct loop_devic
- lo->lo_encrypt_key_size = 0;
- lo->lo_flags = 0;
- lo->lo_thread = NULL;
-+ lo->lo_xid = 0;
- memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
- memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
- memset(lo->lo_file_name, 0, LO_NAME_SIZE);
-@@ -971,7 +974,7 @@ loop_set_status(struct loop_device *lo,
-
- if (lo->lo_encrypt_key_size &&
- lo->lo_key_owner != uid &&
-- !capable(CAP_SYS_ADMIN))
-+ !vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP))
- return -EPERM;
- if (lo->lo_state != Lo_bound)
- return -ENXIO;
-@@ -1055,7 +1058,8 @@ loop_get_status(struct loop_device *lo,
- memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
- info->lo_encrypt_type =
- lo->lo_encryption ? lo->lo_encryption->number : 0;
-- if (lo->lo_encrypt_key_size && capable(CAP_SYS_ADMIN)) {
-+ if (lo->lo_encrypt_key_size &&
-+ vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP)) {
- info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
- memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
- lo->lo_encrypt_key_size);
-@@ -1399,6 +1403,9 @@ static int lo_open(struct block_device *
- {
- struct loop_device *lo = bdev->bd_disk->private_data;
-
-+ if (!vx_check(lo->lo_xid, VS_IDENT|VS_HOSTID|VS_ADMIN_P))
-+ return -EACCES;
-+
- mutex_lock(&lo->lo_ctl_mutex);
- lo->lo_refcnt++;
- mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-2.6.32.6/drivers/block/Makefile linux-2.6.32.6-vs2.3.0.36.28/drivers/block/Makefile
---- linux-2.6.32.6/drivers/block/Makefile 2009-09-10 15:25:49.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/drivers/block/Makefile 2009-12-03 20:04:56.000000000 +0100
-@@ -34,6 +34,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o
- obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
- obj-$(CONFIG_BLK_DEV_UB) += ub.o
- obj-$(CONFIG_BLK_DEV_HD) += hd.o
-+obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o
-
- obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
-
-diff -NurpP --minimal linux-2.6.32.6/drivers/block/vroot.c linux-2.6.32.6-vs2.3.0.36.28/drivers/block/vroot.c
---- linux-2.6.32.6/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/drivers/block/vroot.c 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,281 @@
-+/*
-+ * linux/drivers/block/vroot.c
-+ *
-+ * written by Herbert Pötzl, 9/11/2002
-+ * ported to 2.6.10 by Herbert Pötzl, 30/12/2004
-+ *
-+ * based on the loop.c code by Theodore Ts'o.
-+ *
-+ * Copyright (C) 2002-2007 by Herbert Pötzl.
-+ * Redistribution of this file is permitted under the
-+ * GNU General Public License.
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/file.h>
-+#include <linux/major.h>
-+#include <linux/blkdev.h>
-+
-+#include <linux/vroot.h>
-+#include <linux/vs_context.h>
-+
-+
-+static int max_vroot = 8;
-+
-+static struct vroot_device *vroot_dev;
-+static struct gendisk **disks;
-+
-+
-+static int vroot_set_dev(
-+ struct vroot_device *vr,
-+ struct block_device *bdev,
-+ unsigned int arg)
-+{
-+ struct block_device *real_bdev;
-+ struct file *file;
-+ struct inode *inode;
-+ int error;
-+
-+ error = -EBUSY;
-+ if (vr->vr_state != Vr_unbound)
-+ goto out;
-+
-+ error = -EBADF;
-+ file = fget(arg);
-+ if (!file)
-+ goto out;
-+
-+ error = -EINVAL;
-+ inode = file->f_dentry->d_inode;
-+
-+
-+ if (S_ISBLK(inode->i_mode)) {
-+ real_bdev = inode->i_bdev;
-+ vr->vr_device = real_bdev;
-+ __iget(real_bdev->bd_inode);
-+ } else
-+ goto out_fput;
-+
-+ vxdprintk(VXD_CBIT(misc, 0),
-+ "vroot[%d]_set_dev: dev=" VXF_DEV,
-+ vr->vr_number, VXD_DEV(real_bdev));
-+
-+ vr->vr_state = Vr_bound;
-+ error = 0;
-+
-+ out_fput:
-+ fput(file);
-+ out:
-+ return error;
-+}
-+
-+static int vroot_clr_dev(
-+ struct vroot_device *vr,
-+ struct block_device *bdev)
-+{
-+ struct block_device *real_bdev;
-+
-+ if (vr->vr_state != Vr_bound)
-+ return -ENXIO;
-+ if (vr->vr_refcnt > 1) /* we needed one fd for the ioctl */
-+ return -EBUSY;
-+
-+ real_bdev = vr->vr_device;
-+
-+ vxdprintk(VXD_CBIT(misc, 0),
-+ "vroot[%d]_clr_dev: dev=" VXF_DEV,
-+ vr->vr_number, VXD_DEV(real_bdev));
-+
-+ bdput(real_bdev);
-+ vr->vr_state = Vr_unbound;
-+ vr->vr_device = NULL;
-+ return 0;
-+}
-+
-+
-+static int vr_ioctl(struct block_device *bdev, fmode_t mode,
-+ unsigned int cmd, unsigned long arg)
-+{
-+ struct vroot_device *vr = bdev->bd_disk->private_data;
-+ int err;
-+
-+ down(&vr->vr_ctl_mutex);
-+ switch (cmd) {
-+ case VROOT_SET_DEV:
-+ err = vroot_set_dev(vr, bdev, arg);
-+ break;
-+ case VROOT_CLR_DEV:
-+ err = vroot_clr_dev(vr, bdev);
-+ break;
-+ default:
-+ err = -EINVAL;
-+ break;
-+ }
-+ up(&vr->vr_ctl_mutex);
-+ return err;
-+}
-+
-+static int vr_open(struct block_device *bdev, fmode_t mode)
-+{
-+ struct vroot_device *vr = bdev->bd_disk->private_data;
-+
-+ down(&vr->vr_ctl_mutex);
-+ vr->vr_refcnt++;
-+ up(&vr->vr_ctl_mutex);
-+ return 0;
-+}
-+
-+static int vr_release(struct gendisk *disk, fmode_t mode)
-+{
-+ struct vroot_device *vr = disk->private_data;
-+
-+ down(&vr->vr_ctl_mutex);
-+ --vr->vr_refcnt;
-+ up(&vr->vr_ctl_mutex);
-+ return 0;
-+}
-+
-+static struct block_device_operations vr_fops = {
-+ .owner = THIS_MODULE,
-+ .open = vr_open,
-+ .release = vr_release,
-+ .ioctl = vr_ioctl,
-+};
-+
-+struct block_device *__vroot_get_real_bdev(struct block_device *bdev)
-+{
-+ struct inode *inode = bdev->bd_inode;
-+ struct vroot_device *vr;
-+ struct block_device *real_bdev;
-+ int minor = iminor(inode);
-+
-+ vr = &vroot_dev[minor];
-+ real_bdev = vr->vr_device;
-+
-+ vxdprintk(VXD_CBIT(misc, 0),
-+ "vroot[%d]_get_real_bdev: dev=" VXF_DEV,
-+ vr->vr_number, VXD_DEV(real_bdev));
-+
-+ if (vr->vr_state != Vr_bound)
-+ return ERR_PTR(-ENXIO);
++ if (vr->vr_state != Vr_bound)
++ return ERR_PTR(-ENXIO);
+
+ __iget(real_bdev->bd_inode);
+ return real_bdev;
+
+#endif
+
-diff -NurpP --minimal linux-2.6.32.6/drivers/char/sysrq.c linux-2.6.32.6-vs2.3.0.36.28/drivers/char/sysrq.c
---- linux-2.6.32.6/drivers/char/sysrq.c 2009-12-03 20:02:20.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/drivers/char/sysrq.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/drivers/char/sysrq.c linux-2.6.32.59-vs2.3.0.36.29.9/drivers/char/sysrq.c
+--- linux-2.6.32.59/drivers/char/sysrq.c 2009-12-03 20:02:20.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/char/sysrq.c 2011-06-10 13:03:02.000000000 +0200
@@ -38,6 +38,7 @@
#include <linux/workqueue.h>
#include <linux/hrtimer.h>
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-2.6.32.6/drivers/char/tty_io.c linux-2.6.32.6-vs2.3.0.36.28/drivers/char/tty_io.c
---- linux-2.6.32.6/drivers/char/tty_io.c 2010-01-26 19:31:22.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/drivers/char/tty_io.c 2010-01-26 20:35:35.000000000 +0100
-@@ -106,6 +106,7 @@
+diff -NurpP --minimal linux-2.6.32.59/drivers/char/tty_io.c linux-2.6.32.59-vs2.3.0.36.29.9/drivers/char/tty_io.c
+--- linux-2.6.32.59/drivers/char/tty_io.c 2012-03-20 11:26:08.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/char/tty_io.c 2012-01-10 09:18:12.000000000 +0100
+@@ -107,6 +107,7 @@
#include <linux/kmod.h>
#include <linux/nsproxy.h>
#undef TTY_DEBUG_HANGUP
-@@ -1966,7 +1967,8 @@ static int tiocsti(struct tty_struct *tt
+@@ -1971,7 +1972,8 @@ static int tiocsti(struct tty_struct *tt
char ch, mbz = 0;
struct tty_ldisc *ld;
- if ((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN))
-+ if (((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN)) ||
-+ !vx_ccaps(VXC_TIOCSTI))
++ if (((current->signal->tty != tty) &&
++ !vx_capable(CAP_SYS_ADMIN, VXC_TIOCSTI)))
return -EPERM;
if (get_user(ch, p))
return -EFAULT;
-@@ -2254,6 +2256,7 @@ static int tiocspgrp(struct tty_struct *
+@@ -2259,6 +2261,7 @@ static int tiocspgrp(struct tty_struct *
return -ENOTTY;
if (get_user(pgrp_nr, p))
return -EFAULT;
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-2.6.32.6/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.32.6-vs2.3.0.36.28/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-2.6.32.6/drivers/infiniband/hw/ipath/ipath_user_pages.c 2009-12-03 20:02:23.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/drivers/infiniband/hw/ipath/ipath_user_pages.c 2009-12-04 23:31:17.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.32.59-vs2.3.0.36.29.9/drivers/infiniband/hw/ipath/ipath_user_pages.c
+--- linux-2.6.32.59/drivers/infiniband/hw/ipath/ipath_user_pages.c 2009-12-03 20:02:23.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-06-10 13:03:02.000000000 +0200
@@ -34,6 +34,7 @@
#include <linux/mm.h>
#include <linux/device.h>
up_write(&work->mm->mmap_sem);
mmput(work->mm);
kfree(work);
-diff -NurpP --minimal linux-2.6.32.6/drivers/md/dm.c linux-2.6.32.6-vs2.3.0.36.28/drivers/md/dm.c
---- linux-2.6.32.6/drivers/md/dm.c 2009-12-03 20:02:25.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/drivers/md/dm.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/drivers/md/dm-ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/drivers/md/dm-ioctl.c
+--- linux-2.6.32.59/drivers/md/dm-ioctl.c 2012-03-20 11:26:14.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/md/dm-ioctl.c 2011-06-10 13:03:02.000000000 +0200
+@@ -16,6 +16,7 @@
+ #include <linux/dm-ioctl.h>
+ #include <linux/hdreg.h>
+ #include <linux/compat.h>
++#include <linux/vs_context.h>
+
+ #include <asm/uaccess.h>
+
+@@ -106,7 +107,8 @@ static struct hash_cell *__get_name_cell
+ unsigned int h = hash_str(str);
+
+ list_for_each_entry (hc, _name_buckets + h, name_list)
+- if (!strcmp(hc->name, str)) {
++ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
++ !strcmp(hc->name, str)) {
+ dm_get(hc->md);
+ return hc;
+ }
+@@ -120,7 +122,8 @@ static struct hash_cell *__get_uuid_cell
+ unsigned int h = hash_str(str);
+
+ list_for_each_entry (hc, _uuid_buckets + h, uuid_list)
+- if (!strcmp(hc->uuid, str)) {
++ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
++ !strcmp(hc->uuid, str)) {
+ dm_get(hc->md);
+ return hc;
+ }
+@@ -369,6 +372,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
+
+ static int remove_all(struct dm_ioctl *param, size_t param_size)
+ {
++ if (!vx_check(0, VS_ADMIN))
++ return -EPERM;
++
+ dm_hash_remove_all(1);
+ param->data_size = 0;
+ return 0;
+@@ -416,6 +422,8 @@ static int list_devices(struct dm_ioctl
+ */
+ for (i = 0; i < NUM_BUCKETS; i++) {
+ list_for_each_entry (hc, _name_buckets + i, name_list) {
++ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
++ continue;
+ needed += sizeof(struct dm_name_list);
+ needed += strlen(hc->name) + 1;
+ needed += ALIGN_MASK;
+@@ -439,6 +447,8 @@ static int list_devices(struct dm_ioctl
+ */
+ for (i = 0; i < NUM_BUCKETS; i++) {
+ list_for_each_entry (hc, _name_buckets + i, name_list) {
++ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
++ continue;
+ if (old_nl)
+ old_nl->next = (uint32_t) ((void *) nl -
+ (void *) old_nl);
+@@ -629,10 +639,11 @@ static struct hash_cell *__find_device_h
+ if (!md)
+ goto out;
+
+- mdptr = dm_get_mdptr(md);
++ if (vx_check(dm_get_xid(md), VS_WATCH_P | VS_IDENT))
++ mdptr = dm_get_mdptr(md);
++
+ if (!mdptr)
+ dm_put(md);
+-
+ out:
+ return mdptr;
+ }
+@@ -1462,8 +1473,8 @@ static int ctl_ioctl(uint command, struc
+ ioctl_fn fn = NULL;
+ size_t param_size;
+
+- /* only root can play with this */
+- if (!capable(CAP_SYS_ADMIN))
++ /* only root and certain contexts can play with this */
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_MAPPER))
+ return -EACCES;
+
+ if (_IOC_TYPE(command) != DM_IOCTL)
+diff -NurpP --minimal linux-2.6.32.59/drivers/md/dm.c linux-2.6.32.59-vs2.3.0.36.29.9/drivers/md/dm.c
+--- linux-2.6.32.59/drivers/md/dm.c 2012-03-20 11:26:15.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/md/dm.c 2011-11-17 12:18:26.000000000 +0100
@@ -19,6 +19,7 @@
#include <linux/slab.h>
#include <linux/idr.h>
#include <trace/events/block.h>
-@@ -119,6 +120,7 @@ struct mapped_device {
+@@ -121,6 +122,7 @@ struct mapped_device {
rwlock_t map_lock;
atomic_t holders;
atomic_t open_count;
unsigned long flags;
-@@ -323,6 +325,7 @@ static void __exit dm_exit(void)
+@@ -331,6 +333,7 @@ static void __exit dm_exit(void)
static int dm_blk_open(struct block_device *bdev, fmode_t mode)
{
struct mapped_device *md;
spin_lock(&_minor_lock);
-@@ -331,18 +334,19 @@ static int dm_blk_open(struct block_devi
+@@ -339,18 +342,19 @@ static int dm_blk_open(struct block_devi
goto out;
if (test_bit(DMF_FREEING, &md->flags) ||
}
static int dm_blk_close(struct gendisk *disk, fmode_t mode)
-@@ -553,6 +557,14 @@ int dm_set_geometry(struct mapped_device
+@@ -561,6 +565,14 @@ int dm_set_geometry(struct mapped_device
return 0;
}
/*-----------------------------------------------------------------
* CRUD START:
* A more elegant soln is in the works that uses the queue
-@@ -1762,6 +1774,7 @@ static struct mapped_device *alloc_dev(i
+@@ -1781,6 +1793,7 @@ static struct mapped_device *alloc_dev(i
INIT_LIST_HEAD(&md->uevent_list);
spin_lock_init(&md->uevent_lock);
md->queue = blk_init_queue(dm_request_fn, NULL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-2.6.32.6/drivers/md/dm.h linux-2.6.32.6-vs2.3.0.36.28/drivers/md/dm.h
---- linux-2.6.32.6/drivers/md/dm.h 2009-09-10 15:25:55.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/drivers/md/dm.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/drivers/md/dm.h linux-2.6.32.59-vs2.3.0.36.29.9/drivers/md/dm.h
+--- linux-2.6.32.59/drivers/md/dm.h 2009-09-10 15:25:55.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/md/dm.h 2011-06-10 13:03:02.000000000 +0200
@@ -41,6 +41,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-2.6.32.6/drivers/md/dm-ioctl.c linux-2.6.32.6-vs2.3.0.36.28/drivers/md/dm-ioctl.c
---- linux-2.6.32.6/drivers/md/dm-ioctl.c 2010-01-26 19:31:23.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/drivers/md/dm-ioctl.c 2009-12-29 00:36:25.000000000 +0100
-@@ -16,6 +16,7 @@
- #include <linux/dm-ioctl.h>
- #include <linux/hdreg.h>
- #include <linux/compat.h>
-+#include <linux/vs_context.h>
-
- #include <asm/uaccess.h>
-
-@@ -106,7 +107,8 @@ static struct hash_cell *__get_name_cell
- unsigned int h = hash_str(str);
-
- list_for_each_entry (hc, _name_buckets + h, name_list)
-- if (!strcmp(hc->name, str)) {
-+ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
-+ !strcmp(hc->name, str)) {
- dm_get(hc->md);
- return hc;
- }
-@@ -120,7 +122,8 @@ static struct hash_cell *__get_uuid_cell
- unsigned int h = hash_str(str);
-
- list_for_each_entry (hc, _uuid_buckets + h, uuid_list)
-- if (!strcmp(hc->uuid, str)) {
-+ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
-+ !strcmp(hc->uuid, str)) {
- dm_get(hc->md);
- return hc;
- }
-@@ -363,6 +366,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
-
- static int remove_all(struct dm_ioctl *param, size_t param_size)
- {
-+ if (!vx_check(0, VS_ADMIN))
-+ return -EPERM;
-+
- dm_hash_remove_all(1);
- param->data_size = 0;
- return 0;
-@@ -410,6 +416,8 @@ static int list_devices(struct dm_ioctl
- */
- for (i = 0; i < NUM_BUCKETS; i++) {
- list_for_each_entry (hc, _name_buckets + i, name_list) {
-+ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
-+ continue;
- needed += sizeof(struct dm_name_list);
- needed += strlen(hc->name) + 1;
- needed += ALIGN_MASK;
-@@ -433,6 +441,8 @@ static int list_devices(struct dm_ioctl
- */
- for (i = 0; i < NUM_BUCKETS; i++) {
- list_for_each_entry (hc, _name_buckets + i, name_list) {
-+ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
-+ continue;
- if (old_nl)
- old_nl->next = (uint32_t) ((void *) nl -
- (void *) old_nl);
-@@ -623,10 +633,11 @@ static struct hash_cell *__find_device_h
- if (!md)
- goto out;
-
-- mdptr = dm_get_mdptr(md);
-+ if (vx_check(dm_get_xid(md), VS_WATCH_P | VS_IDENT))
-+ mdptr = dm_get_mdptr(md);
-+
- if (!mdptr)
- dm_put(md);
--
- out:
- return mdptr;
- }
-@@ -1456,8 +1467,8 @@ static int ctl_ioctl(uint command, struc
- ioctl_fn fn = NULL;
- size_t param_size;
-
-- /* only root can play with this */
-- if (!capable(CAP_SYS_ADMIN))
-+ /* only root and certain contexts can play with this */
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_MAPPER))
- return -EACCES;
-
- if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-2.6.32.6/drivers/net/tun.c linux-2.6.32.6-vs2.3.0.36.28/drivers/net/tun.c
---- linux-2.6.32.6/drivers/net/tun.c 2009-12-03 20:02:32.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/drivers/net/tun.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/drivers/net/tun.c linux-2.6.32.59-vs2.3.0.36.29.9/drivers/net/tun.c
+--- linux-2.6.32.59/drivers/net/tun.c 2012-03-20 11:26:17.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/net/tun.c 2011-06-10 13:03:02.000000000 +0200
@@ -61,6 +61,7 @@
#include <linux/crc32.h>
#include <linux/nsproxy.h>
return -EPERM;
err = security_tun_dev_create();
if (err < 0)
-@@ -1013,6 +1016,9 @@ static int tun_set_iff(struct net *net,
+@@ -1014,6 +1017,9 @@ static int tun_set_iff(struct net *net,
sk->sk_destruct = tun_sock_destruct;
err = tun_attach(tun, file);
if (err < 0)
goto failed;
-@@ -1202,6 +1208,16 @@ static long tun_chr_ioctl(struct file *f
+@@ -1203,6 +1209,16 @@ static long tun_chr_ioctl(struct file *f
DBG(KERN_INFO "%s: group set to %d\n", tun->dev->name, tun->group);
break;
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-2.6.32.6/fs/attr.c linux-2.6.32.6-vs2.3.0.36.28/fs/attr.c
---- linux-2.6.32.6/fs/attr.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/attr.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/attr.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/attr.c
+--- linux-2.6.32.59/fs/attr.c 2009-12-03 20:02:51.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/attr.c 2011-06-10 13:03:02.000000000 +0200
@@ -14,6 +14,9 @@
#include <linux/fcntl.h>
#include <linux/quotaops.h>
error = vfs_dq_transfer(inode, attr) ?
-EDQUOT : 0;
if (!error)
-diff -NurpP --minimal linux-2.6.32.6/fs/binfmt_aout.c linux-2.6.32.6-vs2.3.0.36.28/fs/binfmt_aout.c
---- linux-2.6.32.6/fs/binfmt_aout.c 2009-03-24 14:22:24.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/binfmt_aout.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/binfmt_aout.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/binfmt_aout.c
+--- linux-2.6.32.59/fs/binfmt_aout.c 2012-03-20 11:26:26.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/binfmt_aout.c 2011-06-10 13:03:02.000000000 +0200
@@ -24,6 +24,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.32.6/fs/binfmt_elf.c linux-2.6.32.6-vs2.3.0.36.28/fs/binfmt_elf.c
---- linux-2.6.32.6/fs/binfmt_elf.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/binfmt_elf.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/binfmt_elf.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/binfmt_elf.c
+--- linux-2.6.32.59/fs/binfmt_elf.c 2012-03-20 11:26:26.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/binfmt_elf.c 2012-03-23 18:34:19.000000000 +0100
@@ -31,6 +31,7 @@
#include <linux/random.h>
#include <linux/elf.h>
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-2.6.32.6/fs/binfmt_flat.c linux-2.6.32.6-vs2.3.0.36.28/fs/binfmt_flat.c
---- linux-2.6.32.6/fs/binfmt_flat.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/binfmt_flat.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/binfmt_flat.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/binfmt_flat.c
+--- linux-2.6.32.59/fs/binfmt_flat.c 2012-03-20 11:26:26.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/binfmt_flat.c 2011-06-10 13:03:02.000000000 +0200
@@ -35,6 +35,7 @@
#include <linux/init.h>
#include <linux/flat.h>
#include <asm/byteorder.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.32.6/fs/binfmt_som.c linux-2.6.32.6-vs2.3.0.36.28/fs/binfmt_som.c
---- linux-2.6.32.6/fs/binfmt_som.c 2009-06-11 17:13:02.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/binfmt_som.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/binfmt_som.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/binfmt_som.c
+--- linux-2.6.32.59/fs/binfmt_som.c 2012-03-20 11:26:26.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/binfmt_som.c 2011-06-10 13:03:02.000000000 +0200
@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/personality.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.32.6/fs/block_dev.c linux-2.6.32.6-vs2.3.0.36.28/fs/block_dev.c
---- linux-2.6.32.6/fs/block_dev.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/block_dev.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/block_dev.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/block_dev.c
+--- linux-2.6.32.59/fs/block_dev.c 2012-03-20 11:26:26.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/block_dev.c 2011-11-17 12:18:26.000000000 +0100
@@ -26,6 +26,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
#include <asm/uaccess.h>
#include "internal.h"
-@@ -555,6 +556,7 @@ struct block_device *bdget(dev_t dev)
+@@ -557,6 +558,7 @@ struct block_device *bdget(dev_t dev)
bdev->bd_invalidated = 0;
inode->i_mode = S_IFBLK;
inode->i_rdev = dev;
inode->i_bdev = bdev;
inode->i_data.a_ops = &def_blk_aops;
mapping_set_gfp_mask(&inode->i_data, GFP_USER);
-@@ -601,6 +603,11 @@ EXPORT_SYMBOL(bdput);
+@@ -603,6 +605,11 @@ EXPORT_SYMBOL(bdput);
static struct block_device *bd_acquire(struct inode *inode)
{
struct block_device *bdev;
spin_lock(&bdev_lock);
bdev = inode->i_bdev;
-@@ -611,7 +618,7 @@ static struct block_device *bd_acquire(s
+@@ -613,7 +620,7 @@ static struct block_device *bd_acquire(s
}
spin_unlock(&bdev_lock);
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-2.6.32.6/fs/btrfs/ctree.h linux-2.6.32.6-vs2.3.0.36.28/fs/btrfs/ctree.h
---- linux-2.6.32.6/fs/btrfs/ctree.h 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/btrfs/ctree.h 2009-12-03 20:04:56.000000000 +0100
-@@ -544,11 +544,14 @@ struct btrfs_inode_item {
+diff -NurpP --minimal linux-2.6.32.59/fs/btrfs/ctree.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/ctree.h
+--- linux-2.6.32.59/fs/btrfs/ctree.h 2012-03-20 11:26:26.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/ctree.h 2011-06-10 13:03:02.000000000 +0200
+@@ -547,11 +547,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
struct btrfs_timespec atime;
struct btrfs_timespec ctime;
struct btrfs_timespec mtime;
-@@ -1155,6 +1158,8 @@ struct btrfs_root {
+@@ -1162,6 +1165,8 @@ struct btrfs_root {
#define BTRFS_MOUNT_NOSSD (1 << 9)
#define BTRFS_MOUNT_DISCARD (1 << 10)
#define btrfs_clear_opt(o, opt) ((o) &= ~BTRFS_MOUNT_##opt)
#define btrfs_set_opt(o, opt) ((o) |= BTRFS_MOUNT_##opt)
#define btrfs_test_opt(root, opt) ((root)->fs_info->mount_opt & \
-@@ -1174,6 +1179,10 @@ struct btrfs_root {
+@@ -1181,6 +1186,10 @@ struct btrfs_root {
#define BTRFS_INODE_NOATIME (1 << 9)
#define BTRFS_INODE_DIRSYNC (1 << 10)
+#define BTRFS_INODE_COW (1 << 26)
+
- /* some macros to generate set/get funcs for the struct fields. This
- * assumes there is a lefoo_to_cpu for every type, so lets make a simple
-@@ -1376,6 +1385,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
+ #define BTRFS_INODE_ROOT_ITEM_INIT (1 << 31)
+
+@@ -1385,6 +1394,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32);
BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32);
BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32);
BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32);
BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64);
BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64);
-@@ -2338,6 +2348,7 @@ extern const struct dentry_operations bt
+@@ -2360,6 +2370,7 @@ extern const struct dentry_operations bt
long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
void btrfs_update_iflags(struct inode *inode);
void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
/* file.c */
int btrfs_sync_file(struct file *file, struct dentry *dentry, int datasync);
-diff -NurpP --minimal linux-2.6.32.6/fs/btrfs/disk-io.c linux-2.6.32.6-vs2.3.0.36.28/fs/btrfs/disk-io.c
---- linux-2.6.32.6/fs/btrfs/disk-io.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/btrfs/disk-io.c 2009-12-03 20:04:56.000000000 +0100
-@@ -1723,6 +1723,9 @@ struct btrfs_root *open_ctree(struct sup
+diff -NurpP --minimal linux-2.6.32.59/fs/btrfs/disk-io.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/disk-io.c
+--- linux-2.6.32.59/fs/btrfs/disk-io.c 2012-03-20 11:26:26.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/disk-io.c 2011-06-10 13:03:02.000000000 +0200
+@@ -1728,6 +1728,9 @@ struct btrfs_root *open_ctree(struct sup
goto fail_iput;
}
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-2.6.32.6/fs/btrfs/inode.c linux-2.6.32.6-vs2.3.0.36.28/fs/btrfs/inode.c
---- linux-2.6.32.6/fs/btrfs/inode.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/btrfs/inode.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/btrfs/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/inode.c
+--- linux-2.6.32.59/fs/btrfs/inode.c 2012-03-20 11:26:26.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/inode.c 2011-06-10 13:03:02.000000000 +0200
@@ -36,6 +36,8 @@
#include <linux/xattr.h>
#include <linux/posix_acl.h>
#include "compat.h"
#include "ctree.h"
#include "disk-io.h"
-@@ -2242,6 +2244,8 @@ static void btrfs_read_locked_inode(stru
+@@ -2263,6 +2265,8 @@ static void btrfs_read_locked_inode(stru
int maybe_acls;
u64 alloc_group_block;
u32 rdev;
int ret;
path = btrfs_alloc_path();
-@@ -2258,8 +2262,13 @@ static void btrfs_read_locked_inode(stru
+@@ -2279,8 +2283,13 @@ static void btrfs_read_locked_inode(stru
inode->i_mode = btrfs_inode_mode(leaf, inode_item);
inode->i_nlink = btrfs_inode_nlink(leaf, inode_item);
btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
tspec = btrfs_inode_atime(inode_item);
-@@ -2341,8 +2350,15 @@ static void fill_inode_item(struct btrfs
+@@ -2362,8 +2371,15 @@ static void fill_inode_item(struct btrfs
struct btrfs_inode_item *item,
struct inode *inode)
{
btrfs_set_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size);
btrfs_set_inode_mode(leaf, item, inode->i_mode);
btrfs_set_inode_nlink(leaf, item, inode->i_nlink);
-@@ -4065,6 +4081,7 @@ static struct inode *btrfs_new_inode(str
+@@ -4153,6 +4169,7 @@ static struct inode *btrfs_new_inode(str
} else
inode->i_gid = current_fsgid();
inode->i_mode = mode;
inode->i_ino = objectid;
inode_set_bytes(inode, 0);
-@@ -5836,6 +5853,7 @@ static const struct inode_operations btr
+@@ -5954,6 +5971,7 @@ static const struct inode_operations btr
.listxattr = btrfs_listxattr,
.removexattr = btrfs_removexattr,
.permission = btrfs_permission,
};
static const struct inode_operations btrfs_dir_ro_inode_operations = {
.lookup = btrfs_lookup,
-@@ -5911,6 +5929,7 @@ static const struct inode_operations btr
+@@ -6029,6 +6047,7 @@ static const struct inode_operations btr
.permission = btrfs_permission,
.fallocate = btrfs_fallocate,
.fiemap = btrfs_fiemap,
};
static const struct inode_operations btrfs_special_inode_operations = {
.getattr = btrfs_getattr,
-diff -NurpP --minimal linux-2.6.32.6/fs/btrfs/ioctl.c linux-2.6.32.6-vs2.3.0.36.28/fs/btrfs/ioctl.c
---- linux-2.6.32.6/fs/btrfs/ioctl.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/btrfs/ioctl.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/btrfs/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/ioctl.c
+--- linux-2.6.32.59/fs/btrfs/ioctl.c 2012-03-20 11:26:26.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -67,10 +67,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-2.6.32.6/fs/btrfs/super.c linux-2.6.32.6-vs2.3.0.36.28/fs/btrfs/super.c
---- linux-2.6.32.6/fs/btrfs/super.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/btrfs/super.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/btrfs/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/super.c
+--- linux-2.6.32.59/fs/btrfs/super.c 2012-03-20 11:26:26.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/super.c 2011-06-10 13:03:02.000000000 +0200
@@ -67,7 +67,7 @@ enum {
Opt_max_extent, Opt_max_inline, Opt_alloc_start, Opt_nobarrier,
Opt_ssd, Opt_nossd, Opt_ssd_spread, Opt_thread_pool, Opt_noacl,
{Opt_err, NULL},
};
-@@ -262,6 +265,22 @@ int btrfs_parse_options(struct btrfs_roo
+@@ -264,6 +267,22 @@ int btrfs_parse_options(struct btrfs_roo
case Opt_discard:
btrfs_set_opt(info->mount_opt, DISCARD);
break;
+ btrfs_set_opt(info->mount_opt, TAGGED);
+ break;
+#endif
- default:
- break;
- }
-@@ -575,6 +594,12 @@ static int btrfs_remount(struct super_bl
+ case Opt_err:
+ printk(KERN_INFO "btrfs: unrecognized mount option "
+ "'%s'\n", p);
+@@ -585,6 +604,12 @@ static int btrfs_remount(struct super_bl
if (ret)
return -EINVAL;
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
-diff -NurpP --minimal linux-2.6.32.6/fs/char_dev.c linux-2.6.32.6-vs2.3.0.36.28/fs/char_dev.c
---- linux-2.6.32.6/fs/char_dev.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/char_dev.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/char_dev.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/char_dev.c
+--- linux-2.6.32.59/fs/char_dev.c 2012-03-20 11:26:26.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/char_dev.c 2011-06-10 13:03:02.000000000 +0200
@@ -20,6 +20,8 @@
#include <linux/cdev.h>
#include <linux/mutex.h>
#include "internal.h"
-@@ -368,14 +370,21 @@ static int chrdev_open(struct inode *ino
+@@ -370,14 +372,21 @@ static int chrdev_open(struct inode *ino
struct cdev *p;
struct cdev *new = NULL;
int ret = 0;
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-2.6.32.6/fs/dcache.c linux-2.6.32.6-vs2.3.0.36.28/fs/dcache.c
---- linux-2.6.32.6/fs/dcache.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/dcache.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/dcache.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/dcache.c
+--- linux-2.6.32.59/fs/dcache.c 2012-03-20 11:26:26.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/dcache.c 2011-06-10 13:03:02.000000000 +0200
@@ -33,6 +33,7 @@
#include <linux/bootmem.h>
#include <linux/fs_struct.h>
spin_unlock(&dcache_lock);
return dentry;
-@@ -1407,6 +1415,7 @@ struct dentry * __d_lookup(struct dentry
+@@ -1410,6 +1418,7 @@ struct dentry * __d_lookup(struct dentry
}
atomic_inc(&dentry->d_count);
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-2.6.32.6/fs/devpts/inode.c linux-2.6.32.6-vs2.3.0.36.28/fs/devpts/inode.c
---- linux-2.6.32.6/fs/devpts/inode.c 2010-01-26 19:31:26.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/devpts/inode.c 2009-12-29 00:36:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/devpts/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/devpts/inode.c
+--- linux-2.6.32.59/fs/devpts/inode.c 2012-03-20 11:26:26.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/devpts/inode.c 2011-06-10 13:03:02.000000000 +0200
@@ -24,6 +24,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
inode->i_private = tty;
tty->driver_data = inode;
-diff -NurpP --minimal linux-2.6.32.6/fs/exec.c linux-2.6.32.6-vs2.3.0.36.28/fs/exec.c
---- linux-2.6.32.6/fs/exec.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/exec.c 2009-12-30 00:58:19.000000000 +0100
-@@ -251,7 +251,9 @@ static int __bprm_mm_init(struct linux_b
+diff -NurpP --minimal linux-2.6.32.59/fs/exec.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/exec.c
+--- linux-2.6.32.59/fs/exec.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/exec.c 2011-08-08 22:40:36.000000000 +0200
+@@ -273,7 +273,9 @@ static int __bprm_mm_init(struct linux_b
if (err)
goto err;
up_write(&mm->mmap_sem);
bprm->p = vma->vm_end - sizeof(void *);
return 0;
-@@ -1474,7 +1476,7 @@ static int format_corename(char *corenam
+@@ -1534,7 +1536,7 @@ static int format_corename(char *corenam
/* UNIX time of coredump */
case 't': {
struct timeval tv;
rc = snprintf(out_ptr, out_end - out_ptr,
"%lu", tv.tv_sec);
if (rc > out_end - out_ptr)
-diff -NurpP --minimal linux-2.6.32.6/fs/ext2/balloc.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext2/balloc.c
---- linux-2.6.32.6/fs/ext2/balloc.c 2009-06-11 17:13:03.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext2/balloc.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext2/balloc.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/balloc.c
+--- linux-2.6.32.59/fs/ext2/balloc.c 2009-06-11 17:13:03.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/balloc.c 2011-06-10 13:03:02.000000000 +0200
@@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-2.6.32.6/fs/ext2/ext2.h linux-2.6.32.6-vs2.3.0.36.28/fs/ext2/ext2.h
---- linux-2.6.32.6/fs/ext2/ext2.h 2009-09-10 15:26:21.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext2/ext2.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext2/ext2.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/ext2.h
+--- linux-2.6.32.59/fs/ext2/ext2.h 2009-09-10 15:26:21.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/ext2.h 2011-06-10 13:03:02.000000000 +0200
@@ -131,6 +131,7 @@ extern int ext2_fiemap(struct inode *ino
int __ext2_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, unsigned flags,
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-2.6.32.6/fs/ext2/file.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext2/file.c
---- linux-2.6.32.6/fs/ext2/file.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext2/file.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext2/file.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/file.c
+--- linux-2.6.32.59/fs/ext2/file.c 2009-12-03 20:02:51.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/file.c 2011-06-10 13:03:02.000000000 +0200
@@ -87,4 +87,5 @@ const struct inode_operations ext2_file_
.setattr = ext2_setattr,
.check_acl = ext2_check_acl,
.fiemap = ext2_fiemap,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.32.6/fs/ext2/ialloc.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext2/ialloc.c
---- linux-2.6.32.6/fs/ext2/ialloc.c 2009-06-11 17:13:03.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext2/ialloc.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext2/ialloc.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/ialloc.c
+--- linux-2.6.32.59/fs/ext2/ialloc.c 2009-06-11 17:13:03.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/ialloc.c 2011-06-10 13:03:02.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
inode->i_ino = ino;
inode->i_blocks = 0;
-diff -NurpP --minimal linux-2.6.32.6/fs/ext2/inode.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext2/inode.c
---- linux-2.6.32.6/fs/ext2/inode.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext2/inode.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext2/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/inode.c
+--- linux-2.6.32.59/fs/ext2/inode.c 2009-12-03 20:02:51.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/inode.c 2011-06-10 18:47:35.000000000 +0200
@@ -33,6 +33,7 @@
#include <linux/mpage.h>
#include <linux/fiemap.h>
error = vfs_dq_transfer(inode, iattr) ? -EDQUOT : 0;
if (error)
return error;
-diff -NurpP --minimal linux-2.6.32.6/fs/ext2/ioctl.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext2/ioctl.c
---- linux-2.6.32.6/fs/ext2/ioctl.c 2009-09-10 15:26:21.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext2/ioctl.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext2/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/ioctl.c
+--- linux-2.6.32.59/fs/ext2/ioctl.c 2009-09-10 15:26:21.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/ioctl.c 2011-06-10 18:47:17.000000000 +0200
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
mutex_unlock(&inode->i_mutex);
-diff -NurpP --minimal linux-2.6.32.6/fs/ext2/namei.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext2/namei.c
---- linux-2.6.32.6/fs/ext2/namei.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext2/namei.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext2/namei.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/namei.c
+--- linux-2.6.32.59/fs/ext2/namei.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/namei.c 2011-06-10 13:03:02.000000000 +0200
@@ -31,6 +31,7 @@
*/
}
}
}
-@@ -401,6 +403,7 @@ const struct inode_operations ext2_dir_i
+@@ -396,6 +398,7 @@ const struct inode_operations ext2_dir_i
#endif
.setattr = ext2_setattr,
.check_acl = ext2_check_acl,
};
const struct inode_operations ext2_special_inode_operations = {
-diff -NurpP --minimal linux-2.6.32.6/fs/ext2/super.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext2/super.c
---- linux-2.6.32.6/fs/ext2/super.c 2009-09-10 15:26:21.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext2/super.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext2/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/super.c
+--- linux-2.6.32.59/fs/ext2/super.c 2009-09-10 15:26:21.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/super.c 2011-06-10 13:03:02.000000000 +0200
@@ -382,7 +382,8 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
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.32.6/fs/ext3/file.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext3/file.c
---- linux-2.6.32.6/fs/ext3/file.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext3/file.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext3/file.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/file.c
+--- linux-2.6.32.59/fs/ext3/file.c 2009-12-03 20:02:51.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/file.c 2011-06-10 13:03:02.000000000 +0200
@@ -80,5 +80,6 @@ const struct inode_operations ext3_file_
#endif
.check_acl = ext3_check_acl,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.32.6/fs/ext3/ialloc.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext3/ialloc.c
---- linux-2.6.32.6/fs/ext3/ialloc.c 2009-09-10 15:26:21.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext3/ialloc.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext3/ialloc.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/ialloc.c
+--- linux-2.6.32.59/fs/ext3/ialloc.c 2009-09-10 15:26:21.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/ialloc.c 2011-06-10 13:03:02.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/buffer_head.h>
#include <linux/random.h>
inode->i_ino = ino;
/* This is the optimal IO size (for stat), not the fs block size */
-diff -NurpP --minimal linux-2.6.32.6/fs/ext3/inode.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext3/inode.c
---- linux-2.6.32.6/fs/ext3/inode.c 2010-01-26 19:31:26.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext3/inode.c 2009-12-29 00:36:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext3/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/inode.c
+--- linux-2.6.32.59/fs/ext3/inode.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/inode.c 2011-06-10 13:03:02.000000000 +0200
@@ -38,6 +38,7 @@
#include <linux/bio.h>
#include <linux/fiemap.h>
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-2.6.32.6/fs/ext3/ioctl.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext3/ioctl.c
---- linux-2.6.32.6/fs/ext3/ioctl.c 2009-06-11 17:13:03.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext3/ioctl.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext3/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/ioctl.c
+--- linux-2.6.32.59/fs/ext3/ioctl.c 2009-06-11 17:13:03.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -8,6 +8,7 @@
*/
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-2.6.32.6/fs/ext3/namei.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext3/namei.c
---- linux-2.6.32.6/fs/ext3/namei.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext3/namei.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext3/namei.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/namei.c
+--- linux-2.6.32.59/fs/ext3/namei.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/namei.c 2011-08-08 22:40:36.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
}
if ((bh = bh_use[ra_ptr++]) == NULL)
goto next;
-@@ -2446,6 +2448,7 @@ const struct inode_operations ext3_dir_i
+@@ -2455,6 +2457,7 @@ const struct inode_operations ext3_dir_i
.removexattr = generic_removexattr,
#endif
.check_acl = ext3_check_acl,
};
const struct inode_operations ext3_special_inode_operations = {
-diff -NurpP --minimal linux-2.6.32.6/fs/ext3/super.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext3/super.c
---- linux-2.6.32.6/fs/ext3/super.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext3/super.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext3/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/super.c
+--- linux-2.6.32.59/fs/ext3/super.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/super.c 2011-06-10 13:03:02.000000000 +0200
@@ -789,7 +789,7 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
case Opt_nocheck:
clear_opt (sbi->s_mount_opt, CHECK);
break;
-@@ -1658,6 +1675,9 @@ static int ext3_fill_super (struct super
+@@ -1665,6 +1682,9 @@ static int ext3_fill_super (struct super
NULL, 0))
goto failed_mount;
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -2527,6 +2547,14 @@ static int ext3_remount (struct super_bl
+@@ -2534,6 +2554,14 @@ static int ext3_remount (struct super_bl
if (sbi->s_mount_opt & EXT3_MOUNT_ABORT)
ext3_abort(sb, __func__, "Abort forced by user");
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.32.6/fs/ext4/ext4.h linux-2.6.32.6-vs2.3.0.36.28/fs/ext4/ext4.h
---- linux-2.6.32.6/fs/ext4/ext4.h 2010-01-26 19:31:26.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext4/ext4.h 2010-01-13 14:33:47.000000000 +0100
-@@ -284,8 +284,12 @@ struct flex_groups {
- #define EXT4_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
- #define EXT4_HUGE_FILE_FL 0x00040000 /* Set to each huge file */
+diff -NurpP --minimal linux-2.6.32.59/fs/ext4/ext4.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/ext4.h
+--- linux-2.6.32.59/fs/ext4/ext4.h 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/ext4.h 2011-11-17 12:18:26.000000000 +0100
+@@ -289,8 +289,12 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
+ #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
+ #define EXT4_EOFBLOCKS_FL 0x00400000 /* Blocks allocated beyond EOF */
+#define EXT4_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */
#define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */
+#define EXT4_BARRIER_FL 0x04000000 /* Barrier for chroot() */
+#define EXT4_COW_FL 0x20000000 /* Copy on Write marker */
+
- #define EXT4_FL_USER_VISIBLE 0x000BDFFF /* User visible flags */
- #define EXT4_FL_USER_MODIFIABLE 0x000B80FF /* User modifiable flags */
+ #define EXT4_FL_USER_VISIBLE 0x004BDFFF /* User visible flags */
+ #define EXT4_FL_USER_MODIFIABLE 0x004B80FF /* User modifiable flags */
-@@ -469,7 +473,8 @@ struct ext4_inode {
+@@ -551,7 +555,8 @@ struct ext4_inode {
__le16 l_i_file_acl_high;
__le16 l_i_uid_high; /* these 2 fields */
__le16 l_i_gid_high; /* were reserved2[0] */
} linux2;
struct {
__le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */
-@@ -583,6 +588,7 @@ do { \
+@@ -665,6 +670,7 @@ do { \
#define i_gid_low i_gid
#define i_uid_high osd2.linux2.l_i_uid_high
#define i_gid_high osd2.linux2.l_i_gid_high
#define i_reserved2 osd2.linux2.l_i_reserved2
#elif defined(__GNU__)
-@@ -755,6 +761,7 @@ struct ext4_inode_info {
+@@ -839,6 +845,7 @@ struct ext4_inode_info {
#define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */
#define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
#define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
#define EXT4_MOUNT_JOURNAL_CHECKSUM 0x800000 /* Journal checksums */
#define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */
#define EXT4_MOUNT_I_VERSION 0x2000000 /* i_version support */
-@@ -1746,6 +1753,7 @@ extern int ext4_get_blocks(handle_t *han
+@@ -1864,6 +1871,7 @@ extern int ext4_get_blocks(handle_t *han
struct buffer_head *bh, int flags);
extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
__u64 start, __u64 len);
/* move_extent.c */
extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
__u64 start_orig, __u64 start_donor,
-diff -NurpP --minimal linux-2.6.32.6/fs/ext4/file.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext4/file.c
---- linux-2.6.32.6/fs/ext4/file.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext4/file.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext4/file.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/file.c
+--- linux-2.6.32.59/fs/ext4/file.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/file.c 2011-06-10 13:03:02.000000000 +0200
@@ -161,5 +161,6 @@ const struct inode_operations ext4_file_
.check_acl = ext4_check_acl,
.fallocate = ext4_fallocate,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-2.6.32.6/fs/ext4/ialloc.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext4/ialloc.c
---- linux-2.6.32.6/fs/ext4/ialloc.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext4/ialloc.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext4/ialloc.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/ialloc.c
+--- linux-2.6.32.59/fs/ext4/ialloc.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/ialloc.c 2011-06-10 13:03:02.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
#include <asm/byteorder.h>
#include "ext4.h"
-@@ -995,6 +996,7 @@ got:
+@@ -988,6 +989,7 @@ got:
} else
inode->i_gid = current_fsgid();
inode->i_mode = mode;
inode->i_ino = ino + group * EXT4_INODES_PER_GROUP(sb);
/* This is the optimal IO size (for stat), not the fs block size */
-diff -NurpP --minimal linux-2.6.32.6/fs/ext4/inode.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext4/inode.c
---- linux-2.6.32.6/fs/ext4/inode.c 2010-01-26 19:31:26.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext4/inode.c 2010-01-13 14:33:47.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext4/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/inode.c
+--- linux-2.6.32.59/fs/ext4/inode.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/inode.c 2012-01-10 09:18:12.000000000 +0100
@@ -38,6 +38,7 @@
#include <linux/uio.h>
#include <linux/bio.h>
#include "ext4_jbd2.h"
#include "xattr.h"
-@@ -4378,7 +4379,7 @@ static void ext4_free_branches(handle_t
+@@ -4446,7 +4447,7 @@ static void ext4_free_branches(handle_t
int ext4_can_truncate(struct inode *inode)
{
return 0;
if (S_ISREG(inode->i_mode))
return 1;
-@@ -4729,36 +4730,60 @@ void ext4_set_inode_flags(struct inode *
+@@ -4799,41 +4800,64 @@ void ext4_set_inode_flags(struct inode *
{
unsigned int flags = EXT4_I(inode)->i_flags;
/* Propagate flags from i_flags to EXT4_I(inode)->i_flags */
void ext4_get_inode_flags(struct ext4_inode_info *ei)
{
- unsigned int flags = ei->vfs_inode.i_flags;
-+ unsigned int vflags = ei->vfs_inode.i_vflags;
-+
-+ ei->i_flags &= ~(EXT4_SYNC_FL | EXT4_APPEND_FL |
-+ EXT4_IMMUTABLE_FL | EXT4_IXUNLINK_FL |
-+ EXT4_NOATIME_FL | EXT4_DIRSYNC_FL |
-+ EXT4_BARRIER_FL | EXT4_COW_FL);
-+
-+ if (flags & S_IMMUTABLE)
-+ ei->i_flags |= EXT4_IMMUTABLE_FL;
-+ if (flags & S_IXUNLINK)
-+ ei->i_flags |= EXT4_IXUNLINK_FL;
+- unsigned int vfs_fl;
++ unsigned int vfs_fl, vflags;
+ unsigned long old_fl, new_fl;
-- ei->i_flags &= ~(EXT4_SYNC_FL|EXT4_APPEND_FL|
-- EXT4_IMMUTABLE_FL|EXT4_NOATIME_FL|EXT4_DIRSYNC_FL);
- if (flags & S_SYNC)
- ei->i_flags |= EXT4_SYNC_FL;
- if (flags & S_APPEND)
- ei->i_flags |= EXT4_APPEND_FL;
-- if (flags & S_IMMUTABLE)
-- ei->i_flags |= EXT4_IMMUTABLE_FL;
- if (flags & S_NOATIME)
- ei->i_flags |= EXT4_NOATIME_FL;
- if (flags & S_DIRSYNC)
- ei->i_flags |= EXT4_DIRSYNC_FL;
-+
-+ if (vflags & V_BARRIER)
-+ ei->i_flags |= EXT4_BARRIER_FL;
-+ if (vflags & V_COW)
-+ ei->i_flags |= EXT4_COW_FL;
+ do {
+ vfs_fl = ei->vfs_inode.i_flags;
++ vflags = ei->vfs_inode.i_vflags;
+ old_fl = ei->i_flags;
+- new_fl = old_fl & ~(EXT4_SYNC_FL|EXT4_APPEND_FL|
+- EXT4_IMMUTABLE_FL|EXT4_NOATIME_FL|
+- EXT4_DIRSYNC_FL);
++ new_fl = old_fl & ~(EXT4_SYNC_FL | EXT4_APPEND_FL |
++ EXT4_IMMUTABLE_FL | EXT4_IXUNLINK_FL |
++ EXT4_NOATIME_FL | EXT4_DIRSYNC_FL |
++ EXT4_BARRIER_FL | EXT4_COW_FL);
++
++ if (vfs_fl & S_IMMUTABLE)
++ new_fl |= EXT4_IMMUTABLE_FL;
++ if (vfs_fl & S_IXUNLINK)
++ new_fl |= EXT4_IXUNLINK_FL;
++
+ if (vfs_fl & S_SYNC)
+ new_fl |= EXT4_SYNC_FL;
+ if (vfs_fl & S_APPEND)
+ new_fl |= EXT4_APPEND_FL;
+- if (vfs_fl & S_IMMUTABLE)
+- new_fl |= EXT4_IMMUTABLE_FL;
+ if (vfs_fl & S_NOATIME)
+ new_fl |= EXT4_NOATIME_FL;
+ if (vfs_fl & S_DIRSYNC)
+ new_fl |= EXT4_DIRSYNC_FL;
++
++ if (vflags & V_BARRIER)
++ new_fl |= EXT4_BARRIER_FL;
++ if (vflags & V_COW)
++ new_fl |= EXT4_COW_FL;
+ } while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
- static blkcnt_t ext4_inode_blocks(struct ext4_inode *raw_inode,
-@@ -4793,6 +4818,8 @@ struct inode *ext4_iget(struct super_blo
+@@ -4869,6 +4893,8 @@ struct inode *ext4_iget(struct super_blo
journal_t *journal = EXT4_SB(sb)->s_journal;
long ret;
int block;
inode = iget_locked(sb, ino);
if (!inode)
-@@ -4808,12 +4835,16 @@ struct inode *ext4_iget(struct super_blo
+@@ -4884,12 +4910,16 @@ struct inode *ext4_iget(struct super_blo
goto bad_inode;
raw_inode = ext4_raw_inode(&iloc);
inode->i_mode = le16_to_cpu(raw_inode->i_mode);
+ le16_to_cpu(raw_inode->i_raw_tag));
inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
- ei->i_state = 0;
-@@ -5035,6 +5066,8 @@ static int ext4_do_update_inode(handle_t
+ ei->i_state_flags = 0;
+@@ -5111,6 +5141,8 @@ static int ext4_do_update_inode(handle_t
struct ext4_inode *raw_inode = ext4_raw_inode(iloc);
struct ext4_inode_info *ei = EXT4_I(inode);
struct buffer_head *bh = iloc->bh;
int err = 0, rc, block;
/* For fields not not tracking in the in-memory inode,
-@@ -5045,29 +5078,32 @@ static int ext4_do_update_inode(handle_t
+@@ -5121,29 +5153,32 @@ static int ext4_do_update_inode(handle_t
ext4_get_inode_flags(ei);
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
if (!(test_opt(inode->i_sb, NO_UID32))) {
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -5252,7 +5288,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -5329,7 +5364,8 @@ int ext4_setattr(struct dentry *dentry,
return error;
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -5274,6 +5311,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -5351,6 +5387,8 @@ int ext4_setattr(struct dentry *dentry,
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-2.6.32.6/fs/ext4/ioctl.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext4/ioctl.c
---- linux-2.6.32.6/fs/ext4/ioctl.c 2010-01-26 19:31:26.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext4/ioctl.c 2009-12-14 22:20:55.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext4/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/ioctl.c
+--- linux-2.6.32.59/fs/ext4/ioctl.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -14,10 +14,39 @@
#include <linux/compat.h>
#include <linux/mount.h>
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-2.6.32.6/fs/ext4/namei.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext4/namei.c
---- linux-2.6.32.6/fs/ext4/namei.c 2010-01-26 19:31:26.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext4/namei.c 2009-12-14 22:20:55.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ext4/namei.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/namei.c
+--- linux-2.6.32.59/fs/ext4/namei.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/namei.c 2011-06-10 13:03:02.000000000 +0200
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
}
if ((bh = bh_use[ra_ptr++]) == NULL)
goto next;
-@@ -2533,6 +2535,7 @@ const struct inode_operations ext4_dir_i
+@@ -2543,6 +2545,7 @@ const struct inode_operations ext4_dir_i
#endif
.check_acl = ext4_check_acl,
.fiemap = ext4_fiemap,
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-2.6.32.6/fs/ext4/super.c linux-2.6.32.6-vs2.3.0.36.28/fs/ext4/super.c
---- linux-2.6.32.6/fs/ext4/super.c 2010-01-26 19:31:26.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ext4/super.c 2010-01-13 14:33:47.000000000 +0100
-@@ -1096,6 +1096,7 @@ enum {
+diff -NurpP --minimal linux-2.6.32.59/fs/ext4/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/super.c
+--- linux-2.6.32.59/fs/ext4/super.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/super.c 2012-02-09 10:33:19.000000000 +0100
+@@ -1100,6 +1100,7 @@ enum {
Opt_block_validity, Opt_noblock_validity,
Opt_inode_readahead_blks, Opt_journal_ioprio,
Opt_discard, Opt_nodiscard,
};
static const match_table_t tokens = {
-@@ -1163,6 +1164,9 @@ static const match_table_t tokens = {
+@@ -1167,6 +1168,9 @@ static const match_table_t tokens = {
{Opt_noauto_da_alloc, "noauto_da_alloc"},
{Opt_discard, "discard"},
{Opt_nodiscard, "nodiscard"},
{Opt_err, NULL},
};
-@@ -1260,6 +1264,20 @@ static int parse_options(char *options,
+@@ -1269,6 +1273,20 @@ static int parse_options(char *options,
case Opt_nouid32:
set_opt(sbi->s_mount_opt, NO_UID32);
break;
case Opt_debug:
set_opt(sbi->s_mount_opt, DEBUG);
break;
-@@ -2460,6 +2478,9 @@ static int ext4_fill_super(struct super_
+@@ -2470,6 +2488,9 @@ static int ext4_fill_super(struct super_
&journal_ioprio, NULL, 0))
goto failed_mount;
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT4_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -3517,6 +3538,14 @@ static int ext4_remount(struct super_blo
+@@ -3521,6 +3542,14 @@ static int ext4_remount(struct super_blo
if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
ext4_abort(sb, __func__, "Abort forced by user");
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT4_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-2.6.32.6/fs/fcntl.c linux-2.6.32.6-vs2.3.0.36.28/fs/fcntl.c
---- linux-2.6.32.6/fs/fcntl.c 2010-01-26 19:31:26.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/fcntl.c 2010-01-20 04:21:33.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/fcntl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/fcntl.c
+--- linux-2.6.32.59/fs/fcntl.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/fcntl.c 2011-06-10 13:03:02.000000000 +0200
@@ -19,6 +19,7 @@
#include <linux/signal.h>
#include <linux/rcupdate.h>
err = security_file_fcntl(filp, cmd, arg);
if (err) {
-diff -NurpP --minimal linux-2.6.32.6/fs/file.c linux-2.6.32.6-vs2.3.0.36.28/fs/file.c
---- linux-2.6.32.6/fs/file.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/file.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/file.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/file.c
+--- linux-2.6.32.59/fs/file.c 2009-12-03 20:02:51.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/file.c 2011-06-10 13:03:02.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
#if 1
/* Sanity check */
if (rcu_dereference(fdt->fd[fd]) != NULL) {
-diff -NurpP --minimal linux-2.6.32.6/fs/file_table.c linux-2.6.32.6-vs2.3.0.36.28/fs/file_table.c
---- linux-2.6.32.6/fs/file_table.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/file_table.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/file_table.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/file_table.c
+--- linux-2.6.32.59/fs/file_table.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/file_table.c 2011-06-10 13:03:02.000000000 +0200
@@ -22,6 +22,8 @@
#include <linux/fsnotify.h>
#include <linux/sysctl.h>
file_kill(file);
file_free(file);
}
-diff -NurpP --minimal linux-2.6.32.6/fs/fs_struct.c linux-2.6.32.6-vs2.3.0.36.28/fs/fs_struct.c
---- linux-2.6.32.6/fs/fs_struct.c 2009-06-11 17:13:04.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/fs_struct.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/fs_struct.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/fs_struct.c
+--- linux-2.6.32.59/fs/fs_struct.c 2009-06-11 17:13:04.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/fs_struct.c 2011-06-10 13:03:02.000000000 +0200
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
}
return fs;
}
-diff -NurpP --minimal linux-2.6.32.6/fs/gfs2/file.c linux-2.6.32.6-vs2.3.0.36.28/fs/gfs2/file.c
---- linux-2.6.32.6/fs/gfs2/file.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/gfs2/file.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/gfs2/file.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/gfs2/file.c
+--- linux-2.6.32.59/fs/gfs2/file.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/gfs2/file.c 2011-06-10 13:03:02.000000000 +0200
@@ -132,6 +132,9 @@ static const u32 fsflags_to_gfs2[32] = {
[7] = GFS2_DIF_NOATIME,
[12] = GFS2_DIF_EXHASH,
}
/* Flags that can be set by user space */
-@@ -286,6 +335,37 @@ static int gfs2_set_flags(struct file *f
+@@ -293,6 +342,37 @@ static int gfs2_set_flags(struct file *f
return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA);
}
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-2.6.32.6/fs/gfs2/inode.h linux-2.6.32.6-vs2.3.0.36.28/fs/gfs2/inode.h
---- linux-2.6.32.6/fs/gfs2/inode.h 2009-09-10 15:26:22.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/gfs2/inode.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/gfs2/inode.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/gfs2/inode.h
+--- linux-2.6.32.59/fs/gfs2/inode.h 2009-09-10 15:26:22.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/gfs2/inode.h 2011-06-10 13:03:02.000000000 +0200
@@ -109,6 +109,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-2.6.32.6/fs/gfs2/ops_inode.c linux-2.6.32.6-vs2.3.0.36.28/fs/gfs2/ops_inode.c
---- linux-2.6.32.6/fs/gfs2/ops_inode.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/gfs2/ops_inode.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/gfs2/ops_inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/gfs2/ops_inode.c
+--- linux-2.6.32.59/fs/gfs2/ops_inode.c 2009-12-03 20:02:52.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/gfs2/ops_inode.c 2011-06-10 13:03:02.000000000 +0200
@@ -1400,6 +1400,7 @@ const struct inode_operations gfs2_file_
.listxattr = gfs2_listxattr,
.removexattr = gfs2_removexattr,
};
const struct inode_operations gfs2_symlink_iops = {
-diff -NurpP --minimal linux-2.6.32.6/fs/hfsplus/ioctl.c linux-2.6.32.6-vs2.3.0.36.28/fs/hfsplus/ioctl.c
---- linux-2.6.32.6/fs/hfsplus/ioctl.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/hfsplus/ioctl.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/hfsplus/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/hfsplus/ioctl.c
+--- linux-2.6.32.59/fs/hfsplus/ioctl.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/hfsplus/ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/mount.h>
#include <linux/sched.h>
#include <asm/uaccess.h>
#include "hfsplus_fs.h"
-diff -NurpP --minimal linux-2.6.32.6/fs/inode.c linux-2.6.32.6-vs2.3.0.36.28/fs/inode.c
---- linux-2.6.32.6/fs/inode.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/inode.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/inode.c
+--- linux-2.6.32.59/fs/inode.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/inode.c 2011-08-08 22:40:36.000000000 +0200
@@ -133,6 +133,9 @@ int inode_init_always(struct super_block
struct address_space *const mapping = &inode->i_data;
inode->dirtied_when = 0;
if (security_inode_alloc(inode))
-@@ -307,6 +311,8 @@ void __iget(struct inode *inode)
+@@ -315,6 +319,8 @@ void __iget(struct inode *inode)
inodes_stat.nr_unused--;
}
/**
* clear_inode - clear an inode
* @inode: inode to clear
-@@ -1611,9 +1617,11 @@ void init_special_inode(struct inode *in
+@@ -1619,9 +1625,11 @@ void init_special_inode(struct inode *in
if (S_ISCHR(mode)) {
inode->i_fop = &def_chr_fops;
inode->i_rdev = rdev;
} else if (S_ISFIFO(mode))
inode->i_fop = &def_fifo_fops;
else if (S_ISSOCK(mode))
-diff -NurpP --minimal linux-2.6.32.6/fs/ioctl.c linux-2.6.32.6-vs2.3.0.36.28/fs/ioctl.c
---- linux-2.6.32.6/fs/ioctl.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ioctl.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ioctl.c
+--- linux-2.6.32.59/fs/ioctl.c 2009-12-03 20:02:52.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -16,6 +16,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-2.6.32.6/fs/ioprio.c linux-2.6.32.6-vs2.3.0.36.28/fs/ioprio.c
---- linux-2.6.32.6/fs/ioprio.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ioprio.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ioprio.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ioprio.c
+--- linux-2.6.32.59/fs/ioprio.c 2009-03-24 14:22:26.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ioprio.c 2011-06-10 13:03:02.000000000 +0200
@@ -26,6 +26,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-2.6.32.6/fs/jfs/acl.c linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/acl.c
---- linux-2.6.32.6/fs/jfs/acl.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/acl.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/jfs/acl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/acl.c
+--- linux-2.6.32.59/fs/jfs/acl.c 2009-12-03 20:02:52.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/acl.c 2011-06-10 13:03:02.000000000 +0200
@@ -216,7 +216,8 @@ int jfs_setattr(struct dentry *dentry, s
return rc;
if (vfs_dq_transfer(inode, iattr))
return -EDQUOT;
}
-diff -NurpP --minimal linux-2.6.32.6/fs/jfs/file.c linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/file.c
---- linux-2.6.32.6/fs/jfs/file.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/file.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/jfs/file.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/file.c
+--- linux-2.6.32.59/fs/jfs/file.c 2009-12-03 20:02:52.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/file.c 2011-06-10 13:03:02.000000000 +0200
@@ -98,6 +98,7 @@ const struct inode_operations jfs_file_i
.setattr = jfs_setattr,
.check_acl = jfs_check_acl,
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-2.6.32.6/fs/jfs/ioctl.c linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/ioctl.c
---- linux-2.6.32.6/fs/jfs/ioctl.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/ioctl.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/jfs/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/ioctl.c
+--- linux-2.6.32.59/fs/jfs/ioctl.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -11,6 +11,7 @@
#include <linux/mount.h>
#include <linux/time.h>
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-2.6.32.6/fs/jfs/jfs_dinode.h linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/jfs_dinode.h
---- linux-2.6.32.6/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/jfs_dinode.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/jfs/jfs_dinode.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_dinode.h
+--- linux-2.6.32.59/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_dinode.h 2011-06-10 13:03:02.000000000 +0200
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-2.6.32.6/fs/jfs/jfs_filsys.h linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/jfs_filsys.h
---- linux-2.6.32.6/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/jfs_filsys.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/jfs/jfs_filsys.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_filsys.h
+--- linux-2.6.32.59/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_filsys.h 2011-06-10 13:03:02.000000000 +0200
@@ -263,6 +263,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-2.6.32.6/fs/jfs/jfs_imap.c linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/jfs_imap.c
---- linux-2.6.32.6/fs/jfs/jfs_imap.c 2009-09-10 15:26:22.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/jfs_imap.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/jfs/jfs_imap.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_imap.c
+--- linux-2.6.32.59/fs/jfs/jfs_imap.c 2009-09-10 15:26:22.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_imap.c 2011-06-10 13:03:02.000000000 +0200
@@ -45,6 +45,7 @@
#include <linux/buffer_head.h>
#include <linux/pagemap.h>
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-2.6.32.6/fs/jfs/jfs_inode.c linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/jfs_inode.c
---- linux-2.6.32.6/fs/jfs/jfs_inode.c 2009-06-11 17:13:05.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/jfs_inode.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/jfs/jfs_inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_inode.c
+--- linux-2.6.32.59/fs/jfs/jfs_inode.c 2009-06-11 17:13:05.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_inode.c 2011-06-10 13:03:02.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/fs.h>
/*
* New inodes need to save sane values on disk when
-diff -NurpP --minimal linux-2.6.32.6/fs/jfs/jfs_inode.h linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/jfs_inode.h
---- linux-2.6.32.6/fs/jfs/jfs_inode.h 2009-06-11 17:13:05.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/jfs_inode.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/jfs/jfs_inode.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_inode.h
+--- linux-2.6.32.59/fs/jfs/jfs_inode.h 2009-06-11 17:13:05.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_inode.h 2011-06-10 13:03:02.000000000 +0200
@@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s
extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
int fh_len, int fh_type);
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern const struct address_space_operations jfs_aops;
-diff -NurpP --minimal linux-2.6.32.6/fs/jfs/namei.c linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/namei.c
---- linux-2.6.32.6/fs/jfs/namei.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/namei.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/jfs/namei.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/namei.c
+--- linux-2.6.32.59/fs/jfs/namei.c 2009-12-03 20:02:52.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/namei.c 2011-06-10 13:03:02.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-2.6.32.6/fs/jfs/super.c linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/super.c
---- linux-2.6.32.6/fs/jfs/super.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/jfs/super.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/jfs/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/super.c
+--- linux-2.6.32.59/fs/jfs/super.c 2009-12-03 20:02:52.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/super.c 2011-06-10 13:03:02.000000000 +0200
@@ -192,7 +192,8 @@ static void jfs_put_super(struct super_b
enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-2.6.32.6/fs/libfs.c linux-2.6.32.6-vs2.3.0.36.28/fs/libfs.c
---- linux-2.6.32.6/fs/libfs.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/libfs.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/libfs.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/libfs.c
+--- linux-2.6.32.59/fs/libfs.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/libfs.c 2011-06-10 13:03:02.000000000 +0200
@@ -127,7 +127,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
{
return -EISDIR;
-@@ -841,6 +856,7 @@ EXPORT_SYMBOL(dcache_dir_close);
+@@ -842,6 +857,7 @@ EXPORT_SYMBOL(dcache_dir_close);
EXPORT_SYMBOL(dcache_dir_lseek);
EXPORT_SYMBOL(dcache_dir_open);
EXPORT_SYMBOL(dcache_readdir);
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(get_sb_pseudo);
EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-2.6.32.6/fs/locks.c linux-2.6.32.6-vs2.3.0.36.28/fs/locks.c
---- linux-2.6.32.6/fs/locks.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/locks.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/locks.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/locks.c
+--- linux-2.6.32.59/fs/locks.c 2009-12-03 20:02:52.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/locks.c 2011-06-10 13:03:02.000000000 +0200
@@ -127,6 +127,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
f->private++;
return 0;
-diff -NurpP --minimal linux-2.6.32.6/fs/namei.c linux-2.6.32.6-vs2.3.0.36.28/fs/namei.c
---- linux-2.6.32.6/fs/namei.c 2010-01-26 19:31:26.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/namei.c 2010-01-13 14:33:47.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/namei.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/namei.c
+--- linux-2.6.32.59/fs/namei.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/namei.c 2011-06-10 18:44:08.000000000 +0200
@@ -33,6 +33,14 @@
#include <linux/fcntl.h>
#include <linux/device_cgroup.h>
need_lookup:
dentry = real_lookup(nd->path.dentry, name, nd);
-@@ -1390,7 +1491,7 @@ static int may_delete(struct inode *dir,
+@@ -1400,7 +1501,7 @@ static int may_delete(struct inode *dir,
if (IS_APPEND(dir))
return -EPERM;
if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)||
return -EPERM;
if (isdir) {
if (!S_ISDIR(victim->d_inode->i_mode))
-@@ -1530,6 +1631,14 @@ int may_open(struct path *path, int acc_
+@@ -1540,6 +1641,14 @@ int may_open(struct path *path, int acc_
break;
}
+ if (IS_COW(inode) && (flag & FMODE_WRITE)) {
+ if (IS_COW_LINK(inode))
+ return -EMLINK;
-+ inode->i_flags &= ~(S_IXUNLINK|S_IMMUTABLE);
++ inode->i_flags &= ~(S_IXUNLINK | S_IMMUTABLE);
+ mark_inode_dirty(inode);
+ }
+#endif
error = inode_permission(inode, acc_mode);
if (error)
return error;
-@@ -1678,7 +1787,11 @@ struct file *do_filp_open(int dfd, const
+@@ -1688,7 +1797,11 @@ struct file *do_filp_open(int dfd, const
int count = 0;
int will_write;
int flag = open_to_namei_flags(open_flag);
if (!acc_mode)
acc_mode = MAY_OPEN | ACC_MODE(flag);
-@@ -1826,6 +1939,25 @@ ok:
+@@ -1836,6 +1949,25 @@ ok:
goto exit;
}
error = may_open(&nd.path, acc_mode, flag);
if (error) {
if (will_write)
mnt_drop_write(nd.path.mnt);
-@@ -1988,9 +2120,17 @@ int vfs_mknod(struct inode *dir, struct
+@@ -1998,9 +2130,17 @@ int vfs_mknod(struct inode *dir, struct
if (error)
return error;
if (!dir->i_op->mknod)
return -EPERM;
-@@ -2457,7 +2597,7 @@ int vfs_link(struct dentry *old_dentry,
+@@ -2467,7 +2607,7 @@ int vfs_link(struct dentry *old_dentry,
/*
* A link to an append-only or immutable file cannot be created.
*/
return -EPERM;
if (!dir->i_op->link)
return -EPERM;
-@@ -2830,6 +2970,219 @@ int vfs_follow_link(struct nameidata *nd
+@@ -2840,6 +2980,219 @@ int vfs_follow_link(struct nameidata *nd
return __vfs_follow_link(nd, link);
}
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-diff -NurpP --minimal linux-2.6.32.6/fs/namespace.c linux-2.6.32.6-vs2.3.0.36.28/fs/namespace.c
---- linux-2.6.32.6/fs/namespace.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/namespace.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/namespace.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/namespace.c
+--- linux-2.6.32.59/fs/namespace.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/namespace.c 2011-06-10 13:03:02.000000000 +0200
@@ -29,6 +29,11 @@
#include <linux/log2.h>
#include <linux/idr.h>
/* file system type */
seq_puts(m, "with fstype ");
-@@ -1130,7 +1188,7 @@ SYSCALL_DEFINE2(umount, char __user *, n
+@@ -1137,7 +1195,7 @@ SYSCALL_DEFINE2(umount, char __user *, n
goto dput_and_out;
retval = -EPERM;
goto dput_and_out;
retval = do_umount(path.mnt, flags);
-@@ -1156,7 +1214,7 @@ SYSCALL_DEFINE1(oldumount, char __user *
+@@ -1163,7 +1221,7 @@ SYSCALL_DEFINE1(oldumount, char __user *
static int mount_is_safe(struct path *path)
{
return 0;
return -EPERM;
#ifdef notyet
-@@ -1420,7 +1478,7 @@ static int do_change_type(struct path *p
+@@ -1427,7 +1485,7 @@ static int do_change_type(struct path *p
int type = flag & ~MS_REC;
int err = 0;
return -EPERM;
if (path->dentry != path->mnt->mnt_root)
-@@ -1447,11 +1505,13 @@ static int do_change_type(struct path *p
+@@ -1454,11 +1512,13 @@ static int do_change_type(struct path *p
* do loopback mount.
*/
static int do_loopback(struct path *path, char *old_name,
if (err)
return err;
if (!old_name || !*old_name)
-@@ -1485,6 +1545,7 @@ static int do_loopback(struct path *path
+@@ -1492,6 +1552,7 @@ static int do_loopback(struct path *path
spin_unlock(&vfsmount_lock);
release_mounts(&umount_list);
}
out:
up_write(&namespace_sem);
-@@ -1515,12 +1576,12 @@ static int change_mount_flags(struct vfs
+@@ -1522,12 +1583,12 @@ static int change_mount_flags(struct vfs
* on it - tough luck.
*/
static int do_remount(struct path *path, int flags, int mnt_flags,
return -EPERM;
if (!check_mnt(path->mnt))
-@@ -1562,7 +1623,7 @@ static int do_move_mount(struct path *pa
+@@ -1569,7 +1630,7 @@ static int do_move_mount(struct path *pa
struct path old_path, parent_path;
struct vfsmount *p;
int err = 0;
return -EPERM;
if (!old_name || !*old_name)
return -EINVAL;
-@@ -1644,7 +1705,7 @@ static int do_new_mount(struct path *pat
+@@ -1651,7 +1712,7 @@ static int do_new_mount(struct path *pat
return -EINVAL;
/* we need capabilities... */
return -EPERM;
lock_kernel();
-@@ -1908,6 +1969,7 @@ long do_mount(char *dev_name, char *dir_
+@@ -1915,6 +1976,7 @@ long do_mount(char *dev_name, char *dir_
struct path path;
int retval = 0;
int mnt_flags = 0;
/* Discard magic */
if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-@@ -1925,6 +1987,12 @@ long do_mount(char *dev_name, char *dir_
+@@ -1932,6 +1994,12 @@ long do_mount(char *dev_name, char *dir_
if (!(flags & MS_NOATIME))
mnt_flags |= MNT_RELATIME;
/* Separate the per-mountpoint flags */
if (flags & MS_NOSUID)
mnt_flags |= MNT_NOSUID;
-@@ -1941,6 +2009,8 @@ long do_mount(char *dev_name, char *dir_
+@@ -1948,6 +2016,8 @@ long do_mount(char *dev_name, char *dir_
if (flags & MS_RDONLY)
mnt_flags |= MNT_READONLY;
flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE |
MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
MS_STRICTATIME);
-@@ -1957,9 +2027,9 @@ long do_mount(char *dev_name, char *dir_
+@@ -1964,9 +2034,9 @@ long do_mount(char *dev_name, char *dir_
if (flags & MS_REMOUNT)
retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
retval = do_change_type(&path, flags);
else if (flags & MS_MOVE)
-@@ -2038,6 +2108,7 @@ static struct mnt_namespace *dup_mnt_ns(
+@@ -2045,6 +2115,7 @@ static struct mnt_namespace *dup_mnt_ns(
q = next_mnt(q, new_ns->root);
}
up_write(&namespace_sem);
if (rootmnt)
mntput(rootmnt);
-@@ -2182,9 +2253,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -2189,9 +2260,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
down_write(&namespace_sem);
mutex_lock(&old.dentry->d_inode->i_mutex);
error = -EINVAL;
goto out2;
if (!check_mnt(root.mnt))
goto out2;
-@@ -2320,6 +2392,7 @@ void put_mnt_ns(struct mnt_namespace *ns
+@@ -2327,6 +2399,7 @@ void put_mnt_ns(struct mnt_namespace *ns
spin_unlock(&vfsmount_lock);
up_write(&namespace_sem);
release_mounts(&umount_list);
kfree(ns);
}
EXPORT_SYMBOL(put_mnt_ns);
-diff -NurpP --minimal linux-2.6.32.6/fs/nfs/client.c linux-2.6.32.6-vs2.3.0.36.28/fs/nfs/client.c
---- linux-2.6.32.6/fs/nfs/client.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/nfs/client.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/nfs/client.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/client.c
+--- linux-2.6.32.59/fs/nfs/client.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/client.c 2011-06-10 13:03:02.000000000 +0200
@@ -738,6 +738,9 @@ static int nfs_init_server_rpcclient(str
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
server->maxfilesize = fsinfo->maxfilesize;
/* We're airborne Set socket buffersize */
-diff -NurpP --minimal linux-2.6.32.6/fs/nfs/dir.c linux-2.6.32.6-vs2.3.0.36.28/fs/nfs/dir.c
---- linux-2.6.32.6/fs/nfs/dir.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/nfs/dir.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/nfs/dir.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/dir.c
+--- linux-2.6.32.59/fs/nfs/dir.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/dir.c 2011-06-10 13:03:02.000000000 +0200
@@ -33,6 +33,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
#include "nfs4_fs.h"
#include "delegation.h"
-@@ -949,6 +950,7 @@ static struct dentry *nfs_lookup(struct
+@@ -951,6 +952,7 @@ static struct dentry *nfs_lookup(struct
if (IS_ERR(res))
goto out_unblock_sillyrename;
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-2.6.32.6/fs/nfs/inode.c linux-2.6.32.6-vs2.3.0.36.28/fs/nfs/inode.c
---- linux-2.6.32.6/fs/nfs/inode.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/nfs/inode.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/nfs/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/inode.c
+--- linux-2.6.32.59/fs/nfs/inode.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/inode.c 2011-09-30 02:12:21.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/vfs.h>
#include <linux/inet.h>
inode->i_blocks = 0;
memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
-@@ -365,13 +368,13 @@ nfs_fhget(struct super_block *sb, struct
+@@ -365,17 +368,25 @@ nfs_fhget(struct super_block *sb, struct
else if (nfs_server_capable(inode, NFS_CAP_NLINK))
nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
if (fattr->valid & NFS_ATTR_FATTR_OWNER)
- inode->i_uid = fattr->uid;
+- else if (nfs_server_capable(inode, NFS_CAP_OWNER))
+- nfsi->cache_validity |= NFS_INO_INVALID_ATTR
+- | NFS_INO_INVALID_ACCESS
+- | NFS_INO_INVALID_ACL;
+ uid = fattr->uid;
- else if (nfs_server_capable(inode, NFS_CAP_OWNER))
- nfsi->cache_validity |= NFS_INO_INVALID_ATTR
- | NFS_INO_INVALID_ACCESS
- | NFS_INO_INVALID_ACL;
++ else {
++ uid = TAGINO_UID(DX_TAG(inode),
++ inode->i_uid, inode->i_tag);
++ if (nfs_server_capable(inode, NFS_CAP_OWNER))
++ nfsi->cache_validity |= NFS_INO_INVALID_ATTR
++ | NFS_INO_INVALID_ACCESS
++ | NFS_INO_INVALID_ACL;
++ }
if (fattr->valid & NFS_ATTR_FATTR_GROUP)
- inode->i_gid = fattr->gid;
+- else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP))
+- nfsi->cache_validity |= NFS_INO_INVALID_ATTR
+- | NFS_INO_INVALID_ACCESS
+- | NFS_INO_INVALID_ACL;
+ gid = fattr->gid;
- else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP))
- nfsi->cache_validity |= NFS_INO_INVALID_ATTR
- | NFS_INO_INVALID_ACCESS
-@@ -384,6 +387,11 @@ nfs_fhget(struct super_block *sb, struct
++ else {
++ gid = TAGINO_GID(DX_TAG(inode),
++ inode->i_gid, inode->i_tag);
++ if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP))
++ nfsi->cache_validity |= NFS_INO_INVALID_ATTR
++ | NFS_INO_INVALID_ACCESS
++ | NFS_INO_INVALID_ACL;
++ }
+ if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED)
+ inode->i_blocks = fattr->du.nfs2.blocks;
+ if (fattr->valid & NFS_ATTR_FATTR_SPACE_USED) {
+@@ -384,6 +395,11 @@ nfs_fhget(struct super_block *sb, struct
*/
inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
}
nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
nfsi->attrtimeo_timestamp = now;
nfsi->access_cache = RB_ROOT;
-@@ -496,6 +504,8 @@ void nfs_setattr_update_inode(struct ino
+@@ -393,11 +409,11 @@ nfs_fhget(struct super_block *sb, struct
+ unlock_new_inode(inode);
+ } else
+ nfs_refresh_inode(inode, fattr);
++
+ dprintk("NFS: nfs_fhget(%s/%Ld ct=%d)\n",
+ inode->i_sb->s_id,
+ (long long)NFS_FILEID(inode),
+ atomic_read(&inode->i_count));
+-
+ out:
+ return inode;
+
+@@ -496,6 +512,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;
NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
spin_unlock(&inode->i_lock);
}
-@@ -906,6 +916,9 @@ static int nfs_check_inode_attributes(st
+@@ -914,6 +932,9 @@ static int nfs_check_inode_attributes(st
struct nfs_inode *nfsi = NFS_I(inode);
loff_t cur_size, new_isize;
unsigned long invalid = 0;
/* Has the inode gone and changed behind our back? */
-@@ -929,13 +942,18 @@ static int nfs_check_inode_attributes(st
+@@ -937,13 +958,18 @@ static int nfs_check_inode_attributes(st
invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
}
/* Has the link count changed? */
if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
-@@ -1150,6 +1168,9 @@ static int nfs_update_inode(struct inode
+@@ -1158,6 +1184,9 @@ static int nfs_update_inode(struct inode
unsigned long invalid = 0;
unsigned long now = jiffies;
unsigned long save_cache_validity;
dfprintk(VFS, "NFS: %s(%s/%ld ct=%d info=0x%x)\n",
__func__, inode->i_sb->s_id, inode->i_ino,
-@@ -1252,6 +1273,9 @@ static int nfs_update_inode(struct inode
+@@ -1260,6 +1289,9 @@ static int nfs_update_inode(struct inode
| NFS_INO_REVAL_PAGECACHE
| NFS_INO_REVAL_FORCED);
-+ uid = INOTAG_UID(DX_TAG(inode), fattr->uid, fattr->gid);
-+ gid = INOTAG_GID(DX_TAG(inode), fattr->uid, fattr->gid);
-+ tag = INOTAG_TAG(DX_TAG(inode), fattr->uid, fattr->gid, 0);
++ uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
++ gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
++ tag = inode->i_tag;
if (fattr->valid & NFS_ATTR_FATTR_ATIME)
memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
-@@ -1271,9 +1295,9 @@ static int nfs_update_inode(struct inode
+@@ -1279,9 +1311,9 @@ static int nfs_update_inode(struct inode
| NFS_INO_REVAL_FORCED);
if (fattr->valid & NFS_ATTR_FATTR_OWNER) {
}
} else if (server->caps & NFS_CAP_OWNER)
invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
-@@ -1282,9 +1306,9 @@ static int nfs_update_inode(struct inode
+@@ -1290,9 +1322,9 @@ static int nfs_update_inode(struct inode
| NFS_INO_REVAL_FORCED);
if (fattr->valid & NFS_ATTR_FATTR_GROUP) {
}
} else if (server->caps & NFS_CAP_OWNER_GROUP)
invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
-@@ -1292,6 +1316,10 @@ static int nfs_update_inode(struct inode
+@@ -1300,6 +1332,10 @@ static int nfs_update_inode(struct inode
| NFS_INO_INVALID_ACL
| NFS_INO_REVAL_FORCED);
-+ inode->i_uid = uid;
-+ inode->i_gid = gid;
-+ inode->i_tag = tag;
++ inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
++ inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++ inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, tag);
+
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-2.6.32.6/fs/nfs/nfs3xdr.c linux-2.6.32.6-vs2.3.0.36.28/fs/nfs/nfs3xdr.c
---- linux-2.6.32.6/fs/nfs/nfs3xdr.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/nfs/nfs3xdr.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/nfs/nfs3xdr.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/nfs3xdr.c
+--- linux-2.6.32.59/fs/nfs/nfs3xdr.c 2009-12-03 20:02:52.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/nfs3xdr.c 2011-06-10 13:03:02.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
if (args->type == NF3CHR || args->type == NF3BLK) {
*p++ = htonl(MAJOR(args->rdev));
*p++ = htonl(MINOR(args->rdev));
-diff -NurpP --minimal linux-2.6.32.6/fs/nfs/nfsroot.c linux-2.6.32.6-vs2.3.0.36.28/fs/nfs/nfsroot.c
---- linux-2.6.32.6/fs/nfs/nfsroot.c 2009-09-10 15:26:23.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/nfs/nfsroot.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/nfs/nfsroot.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/nfsroot.c
+--- linux-2.6.32.59/fs/nfs/nfsroot.c 2009-09-10 15:26:23.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/nfsroot.c 2011-06-10 13:03:02.000000000 +0200
@@ -122,12 +122,12 @@ static int mount_port __initdata = 0; /
enum {
/* Options that take integer arguments */
default:
printk(KERN_WARNING "Root-NFS: unknown "
"option: %s\n", p);
-diff -NurpP --minimal linux-2.6.32.6/fs/nfs/super.c linux-2.6.32.6-vs2.3.0.36.28/fs/nfs/super.c
---- linux-2.6.32.6/fs/nfs/super.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/nfs/super.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/nfs/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/super.c
+--- linux-2.6.32.59/fs/nfs/super.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/super.c 2011-06-10 13:03:02.000000000 +0200
@@ -53,6 +53,7 @@
#include <linux/nfs_xdr.h>
#include <linux/magic.h>
#include <asm/system.h>
#include <asm/uaccess.h>
-@@ -551,6 +552,7 @@ static void nfs_show_mount_options(struc
+@@ -570,6 +571,7 @@ static void nfs_show_mount_options(struc
{ NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },
{ NFS_MOUNT_UNSHARED, ",nosharecache", "" },
{ NFS_MOUNT_NORESVPORT, ",noresvport", "" },
{ 0, NULL, NULL }
};
const struct proc_nfs_info *nfs_infop;
-diff -NurpP --minimal linux-2.6.32.6/fs/nfsd/auth.c linux-2.6.32.6-vs2.3.0.36.28/fs/nfsd/auth.c
---- linux-2.6.32.6/fs/nfsd/auth.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/nfsd/auth.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/nfsd/auth.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfsd/auth.c
+--- linux-2.6.32.59/fs/nfsd/auth.c 2009-12-03 20:02:52.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfsd/auth.c 2011-06-10 13:03:02.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/sunrpc/svcauth.h>
#include <linux/nfsd/nfsd.h>
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-2.6.32.6/fs/nfsd/nfs3xdr.c linux-2.6.32.6-vs2.3.0.36.28/fs/nfsd/nfs3xdr.c
---- linux-2.6.32.6/fs/nfsd/nfs3xdr.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/nfsd/nfs3xdr.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/nfsd/nfs3xdr.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfsd/nfs3xdr.c
+--- linux-2.6.32.59/fs/nfsd/nfs3xdr.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfsd/nfs3xdr.c 2011-06-10 13:03:02.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/nfsd/nfsd.h>
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-2.6.32.6/fs/nfsd/nfs4xdr.c linux-2.6.32.6-vs2.3.0.36.28/fs/nfsd/nfs4xdr.c
---- linux-2.6.32.6/fs/nfsd/nfs4xdr.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/nfsd/nfs4xdr.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/nfsd/nfs4xdr.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfsd/nfs4xdr.c
+--- linux-2.6.32.59/fs/nfsd/nfs4xdr.c 2012-03-20 11:26:27.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfsd/nfs4xdr.c 2011-06-10 13:03:02.000000000 +0200
@@ -57,6 +57,7 @@
#include <linux/nfs4_acl.h>
#include <linux/sunrpc/gss_api.h>
#define NFSDDBG_FACILITY NFSDDBG_XDR
-@@ -2050,14 +2051,18 @@ out_acl:
+@@ -2047,14 +2048,18 @@ out_acl:
WRITE32(stat.nlink);
}
if (bmval1 & FATTR4_WORD1_OWNER) {
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-2.6.32.6/fs/nfsd/nfsxdr.c linux-2.6.32.6-vs2.3.0.36.28/fs/nfsd/nfsxdr.c
---- linux-2.6.32.6/fs/nfsd/nfsxdr.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/nfsd/nfsxdr.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/nfsd/nfsxdr.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfsd/nfsxdr.c
+--- linux-2.6.32.59/fs/nfsd/nfsxdr.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfsd/nfsxdr.c 2011-06-10 13:03:02.000000000 +0200
@@ -15,6 +15,7 @@
#include <linux/nfsd/nfsd.h>
#include <linux/nfsd/xdr.h>
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-2.6.32.6/fs/ocfs2/dlm/dlmfs.c linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/dlm/dlmfs.c
---- linux-2.6.32.6/fs/ocfs2/dlm/dlmfs.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/dlm/dlmfs.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/dlm/dlmfs.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/dlm/dlmfs.c
+--- linux-2.6.32.59/fs/ocfs2/dlm/dlmfs.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/dlm/dlmfs.c 2011-06-10 13:03:02.000000000 +0200
@@ -43,6 +43,7 @@
#include <linux/init.h>
#include <linux/string.h>
inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-2.6.32.6/fs/ocfs2/dlmglue.c linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/dlmglue.c
---- linux-2.6.32.6/fs/ocfs2/dlmglue.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/dlmglue.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/dlmglue.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/dlmglue.c
+--- linux-2.6.32.59/fs/ocfs2/dlmglue.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/dlmglue.c 2011-06-10 13:03:02.000000000 +0200
@@ -1991,6 +1991,7 @@ static void __ocfs2_stuff_meta_lvb(struc
lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
lvb->lvb_iuid = cpu_to_be32(inode->i_uid);
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
inode->i_nlink = be16_to_cpu(lvb->lvb_inlink);
ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-2.6.32.6/fs/ocfs2/dlmglue.h linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/dlmglue.h
---- linux-2.6.32.6/fs/ocfs2/dlmglue.h 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/dlmglue.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/dlmglue.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/dlmglue.h
+--- linux-2.6.32.59/fs/ocfs2/dlmglue.h 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/dlmglue.h 2011-06-10 13:03:02.000000000 +0200
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-2.6.32.6/fs/ocfs2/file.c linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/file.c
---- linux-2.6.32.6/fs/ocfs2/file.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/file.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/file.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/file.c
+--- linux-2.6.32.59/fs/ocfs2/file.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/file.c 2011-06-10 13:03:02.000000000 +0200
@@ -960,13 +960,15 @@ int ocfs2_setattr(struct dentry *dentry,
mlog(0, "uid change: %d\n", attr->ia_uid);
if (attr->ia_valid & ATTR_GID)
if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) {
mlog(0, "can't handle attrs: 0x%x\n", attr->ia_valid);
return 0;
-diff -NurpP --minimal linux-2.6.32.6/fs/ocfs2/inode.c linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/inode.c
---- linux-2.6.32.6/fs/ocfs2/inode.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/inode.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/inode.c
+--- linux-2.6.32.59/fs/ocfs2/inode.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/inode.c 2011-06-10 13:03:02.000000000 +0200
@@ -29,6 +29,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
-diff -NurpP --minimal linux-2.6.32.6/fs/ocfs2/inode.h linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/inode.h
---- linux-2.6.32.6/fs/ocfs2/inode.h 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/inode.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/inode.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/inode.h
+--- linux-2.6.32.59/fs/ocfs2/inode.h 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/inode.h 2011-06-10 13:03:02.000000000 +0200
@@ -150,6 +150,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-2.6.32.6/fs/ocfs2/ioctl.c linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/ioctl.c
---- linux-2.6.32.6/fs/ocfs2/ioctl.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/ioctl.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/ioctl.c
+--- linux-2.6.32.59/fs/ocfs2/ioctl.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -42,7 +42,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = filp->f_path.dentry->d_inode;
-diff -NurpP --minimal linux-2.6.32.6/fs/ocfs2/namei.c linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/namei.c
---- linux-2.6.32.6/fs/ocfs2/namei.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/namei.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/namei.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/namei.c
+--- linux-2.6.32.59/fs/ocfs2/namei.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/namei.c 2011-06-10 13:03:02.000000000 +0200
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
fe->i_mode = cpu_to_le16(inode->i_mode);
if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
-diff -NurpP --minimal linux-2.6.32.6/fs/ocfs2/ocfs2_fs.h linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/ocfs2_fs.h
---- linux-2.6.32.6/fs/ocfs2/ocfs2_fs.h 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/ocfs2_fs.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/ocfs2.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/ocfs2.h
+--- linux-2.6.32.59/fs/ocfs2/ocfs2.h 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/ocfs2.h 2011-06-10 13:03:02.000000000 +0200
+@@ -248,6 +248,7 @@ enum ocfs2_mount_options
+ OCFS2_MOUNT_POSIX_ACL = 1 << 8, /* POSIX access control lists */
+ OCFS2_MOUNT_USRQUOTA = 1 << 9, /* We support user quotas */
+ OCFS2_MOUNT_GRPQUOTA = 1 << 10, /* We support group quotas */
++ OCFS2_MOUNT_TAGGED = 1 << 11, /* use tagging */
+ };
+
+ #define OCFS2_OSB_SOFT_RO 0x0001
+diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/ocfs2_fs.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/ocfs2_fs.h
+--- linux-2.6.32.59/fs/ocfs2/ocfs2_fs.h 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/ocfs2_fs.h 2011-06-10 13:03:02.000000000 +0200
@@ -231,18 +231,23 @@
#define OCFS2_HAS_REFCOUNT_FL (0x0010)
/*
* Extent record flags (e_node.leaf.flags)
-diff -NurpP --minimal linux-2.6.32.6/fs/ocfs2/ocfs2.h linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/ocfs2.h
---- linux-2.6.32.6/fs/ocfs2/ocfs2.h 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/ocfs2.h 2009-12-03 20:04:56.000000000 +0100
-@@ -248,6 +248,7 @@ enum ocfs2_mount_options
- OCFS2_MOUNT_POSIX_ACL = 1 << 8, /* POSIX access control lists */
- OCFS2_MOUNT_USRQUOTA = 1 << 9, /* We support user quotas */
- OCFS2_MOUNT_GRPQUOTA = 1 << 10, /* We support group quotas */
-+ OCFS2_MOUNT_TAGGED = 1 << 11, /* use tagging */
- };
-
- #define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-2.6.32.6/fs/ocfs2/super.c linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/super.c
---- linux-2.6.32.6/fs/ocfs2/super.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/ocfs2/super.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/super.c
+--- linux-2.6.32.59/fs/ocfs2/super.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/super.c 2011-06-10 13:03:02.000000000 +0200
@@ -173,6 +173,7 @@ enum {
Opt_noacl,
Opt_usrquota,
if ((osb->s_mount_opt & OCFS2_MOUNT_HB_LOCAL) !=
(parsed_options.mount_opt & OCFS2_MOUNT_HB_LOCAL)) {
ret = -EINVAL;
-@@ -1148,6 +1159,9 @@ static int ocfs2_fill_super(struct super
+@@ -1152,6 +1163,9 @@ static int ocfs2_fill_super(struct super
ocfs2_complete_mount_recovery(osb);
if (ocfs2_mount_local(osb))
snprintf(nodestr, sizeof(nodestr), "local");
else
-@@ -1426,6 +1440,20 @@ static int ocfs2_parse_options(struct su
+@@ -1430,6 +1444,20 @@ static int ocfs2_parse_options(struct su
printk(KERN_INFO "ocfs2 (no)acl options not supported\n");
break;
#endif
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-2.6.32.6/fs/open.c linux-2.6.32.6-vs2.3.0.36.28/fs/open.c
---- linux-2.6.32.6/fs/open.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/open.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/open.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/open.c
+--- linux-2.6.32.59/fs/open.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/open.c 2011-06-10 13:03:02.000000000 +0200
@@ -30,22 +30,30 @@
#include <linux/audit.h>
#include <linux/falloc.h>
}
void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-2.6.32.6/fs/proc/array.c linux-2.6.32.6-vs2.3.0.36.28/fs/proc/array.c
---- linux-2.6.32.6/fs/proc/array.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/proc/array.c 2009-12-03 20:04:56.000000000 +0100
-@@ -83,6 +83,8 @@
+diff -NurpP --minimal linux-2.6.32.59/fs/proc/array.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/array.c
+--- linux-2.6.32.59/fs/proc/array.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/array.c 2011-06-10 18:44:08.000000000 +0200
+@@ -82,6 +82,8 @@
+ #include <linux/pid_namespace.h>
#include <linux/ptrace.h>
#include <linux/tracehook.h>
- #include <linux/swapops.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-@@ -139,8 +141,9 @@ static const char *task_state_array[] =
- "D (disk sleep)", /* 2 */
- "T (stopped)", /* 4 */
- "T (tracing stop)", /* 8 */
-- "Z (zombie)", /* 16 */
-- "X (dead)" /* 32 */
-+ "H (on hold)", /* 16 */
-+ "Z (zombie)", /* 32 */
-+ "X (dead)", /* 64 */
- };
-
- static inline const char *get_task_state(struct task_struct *tsk)
-@@ -167,6 +170,9 @@ static inline void task_state(struct seq
+@@ -166,6 +168,9 @@ static inline void task_state(struct seq
rcu_read_lock();
ppid = pid_alive(p) ?
task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0;
tpid = 0;
if (pid_alive(p)) {
struct task_struct *tracer = tracehook_tracer_task(p);
-@@ -282,7 +288,7 @@ static inline void task_sig(struct seq_f
+@@ -281,7 +286,7 @@ static inline void task_sig(struct seq_f
}
static void render_cap_t(struct seq_file *m, const char *header,
{
unsigned __capi;
-@@ -307,10 +313,11 @@ static inline void task_cap(struct seq_f
+@@ -306,10 +311,11 @@ static inline void task_cap(struct seq_f
cap_bset = cred->cap_bset;
rcu_read_unlock();
}
static inline void task_context_switch_counts(struct seq_file *m,
-@@ -410,6 +417,42 @@ static void task_show_stack_usage(struct
+@@ -321,6 +327,43 @@ static inline void task_context_switch_c
+ p->nivcsw);
}
- #endif /* CONFIG_MMU */
++
+int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
+ struct pid *pid, struct task_struct *task)
+{
int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task)
{
-@@ -425,6 +468,7 @@ int proc_pid_status(struct seq_file *m,
+@@ -336,6 +379,7 @@ int proc_pid_status(struct seq_file *m,
task_sig(m, task);
task_cap(m, task);
cpuset_task_status_allowed(m, task);
+ task_vs_id(m, task);
- #if defined(CONFIG_S390)
- task_show_regs(m, task);
- #endif
-@@ -542,6 +586,17 @@ static int do_task_stat(struct seq_file
+ task_context_switch_counts(m, task);
+ return 0;
+ }
+@@ -446,6 +490,17 @@ static int do_task_stat(struct seq_file
/* convert nsec -> ticks */
start_time = nsec_to_clock_t(start_time);
seq_printf(m, "%d (%s) %c %d %d %d %d %d %u %lu \
%lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n",
-diff -NurpP --minimal linux-2.6.32.6/fs/proc/base.c linux-2.6.32.6-vs2.3.0.36.28/fs/proc/base.c
---- linux-2.6.32.6/fs/proc/base.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/proc/base.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/proc/base.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/base.c
+--- linux-2.6.32.59/fs/proc/base.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/base.c 2011-11-17 12:18:26.000000000 +0100
@@ -81,6 +81,8 @@
#include <linux/elf.h>
#include <linux/pid_namespace.h>
#include "internal.h"
/* NOTE:
-@@ -1047,12 +1049,17 @@ static ssize_t oom_adjust_write(struct f
+@@ -1075,12 +1077,17 @@ static ssize_t oom_adjust_write(struct f
return -ESRCH;
}
task->signal->oom_adj = oom_adjust;
unlock_task_sighand(task, &flags);
-@@ -1092,7 +1099,7 @@ static ssize_t proc_loginuid_write(struc
+@@ -1120,7 +1127,7 @@ static ssize_t proc_loginuid_write(struc
ssize_t length;
uid_t loginuid;
return -EPERM;
if (current != pid_task(proc_pid(inode), PIDTYPE_PID))
-@@ -1458,6 +1465,8 @@ static struct inode *proc_pid_make_inode
+@@ -1486,6 +1493,8 @@ static struct inode *proc_pid_make_inode
inode->i_gid = cred->egid;
rcu_read_unlock();
}
security_task_to_inode(task, inode);
out:
-@@ -2008,6 +2017,13 @@ static struct dentry *proc_pident_lookup
+@@ -2036,6 +2045,13 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2399,7 +2415,7 @@ out_iput:
+@@ -2441,7 +2457,7 @@ out_iput:
static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry)
{
struct dentry *error;
const struct pid_entry *p, *last;
error = ERR_PTR(-ENOENT);
-@@ -2489,6 +2505,9 @@ static int proc_pid_personality(struct s
+@@ -2538,6 +2554,9 @@ static int proc_pid_personality(struct s
static const struct file_operations proc_task_operations;
static const struct inode_operations proc_task_inode_operations;
static const struct pid_entry tgid_base_stuff[] = {
DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
-@@ -2547,6 +2566,8 @@ static const struct pid_entry tgid_base_
+@@ -2596,6 +2615,8 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_CGROUPS
REG("cgroup", S_IRUGO, proc_cgroup_operations),
#endif
INF("oom_score", S_IRUGO, proc_oom_score),
REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adjust_operations),
#ifdef CONFIG_AUDITSYSCALL
-@@ -2562,6 +2583,7 @@ static const struct pid_entry tgid_base_
+@@ -2611,6 +2632,7 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_TASK_IO_ACCOUNTING
- INF("io", S_IRUGO, proc_tgid_io_accounting),
+ INF("io", S_IRUSR, proc_tgid_io_accounting),
#endif
+ ONE("nsproxy", S_IRUGO, proc_pid_nsproxy),
};
static int proc_tgid_base_readdir(struct file * filp,
-@@ -2753,7 +2775,7 @@ retry:
+@@ -2802,7 +2824,7 @@ retry:
iter.task = NULL;
pid = find_ge_pid(iter.tgid, ns);
if (pid) {
iter.task = pid_task(pid, PIDTYPE_PID);
/* What we to know is if the pid we have find is the
* pid of a thread_group_leader. Testing for task
-@@ -2783,7 +2805,7 @@ static int proc_pid_fill_cache(struct fi
+@@ -2832,7 +2854,7 @@ static int proc_pid_fill_cache(struct fi
struct tgid_iter iter)
{
char name[PROC_NUMBUF];
return proc_fill_cache(filp, dirent, filldir, name, len,
proc_pid_instantiate, iter.task, NULL);
}
-@@ -2792,7 +2814,7 @@ static int proc_pid_fill_cache(struct fi
- int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
- {
- unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;
-- struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode);
-+ struct task_struct *reaper = get_proc_task_real(filp->f_path.dentry->d_inode);
- struct tgid_iter iter;
- struct pid_namespace *ns;
+@@ -2849,7 +2871,7 @@ int proc_pid_readdir(struct file * filp,
+ goto out_no_task;
+ nr = filp->f_pos - FIRST_PROCESS_ENTRY;
-@@ -2812,6 +2834,8 @@ int proc_pid_readdir(struct file * filp,
+- reaper = get_proc_task(filp->f_path.dentry->d_inode);
++ reaper = get_proc_task_real(filp->f_path.dentry->d_inode);
+ if (!reaper)
+ goto out_no_task;
+
+@@ -2866,6 +2888,8 @@ int proc_pid_readdir(struct file * filp,
iter.task;
iter.tgid += 1, iter = next_tgid(ns, iter)) {
filp->f_pos = iter.tgid + TGID_OFFSET;
if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) {
put_task_struct(iter.task);
goto out;
-@@ -2958,6 +2982,8 @@ static struct dentry *proc_task_lookup(s
+@@ -3012,6 +3036,8 @@ static struct dentry *proc_task_lookup(s
tid = name_to_int(dentry);
if (tid == ~0U)
goto out;
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-2.6.32.6/fs/proc/generic.c linux-2.6.32.6-vs2.3.0.36.28/fs/proc/generic.c
---- linux-2.6.32.6/fs/proc/generic.c 2009-06-11 17:13:07.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/proc/generic.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/proc/generic.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/generic.c
+--- linux-2.6.32.59/fs/proc/generic.c 2009-06-11 17:13:07.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/generic.c 2011-06-10 13:03:02.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-2.6.32.6/fs/proc/inode.c linux-2.6.32.6-vs2.3.0.36.28/fs/proc/inode.c
---- linux-2.6.32.6/fs/proc/inode.c 2009-06-11 17:13:07.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/proc/inode.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/proc/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/inode.c
+--- linux-2.6.32.59/fs/proc/inode.c 2009-06-11 17:13:07.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/inode.c 2011-06-10 13:03:02.000000000 +0200
@@ -459,6 +459,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-2.6.32.6/fs/proc/internal.h linux-2.6.32.6-vs2.3.0.36.28/fs/proc/internal.h
---- linux-2.6.32.6/fs/proc/internal.h 2009-09-10 15:26:23.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/proc/internal.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/proc/internal.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/internal.h
+--- linux-2.6.32.59/fs/proc/internal.h 2009-09-10 15:26:23.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/internal.h 2011-06-10 13:03:02.000000000 +0200
@@ -10,6 +10,7 @@
*/
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-2.6.32.6/fs/proc/loadavg.c linux-2.6.32.6-vs2.3.0.36.28/fs/proc/loadavg.c
---- linux-2.6.32.6/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/proc/loadavg.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/proc/loadavg.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/loadavg.c
+--- linux-2.6.32.59/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/loadavg.c 2011-06-10 13:03:02.000000000 +0200
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-2.6.32.6/fs/proc/meminfo.c linux-2.6.32.6-vs2.3.0.36.28/fs/proc/meminfo.c
---- linux-2.6.32.6/fs/proc/meminfo.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/proc/meminfo.c 2009-12-03 20:04:56.000000000 +0100
-@@ -41,7 +41,7 @@ static int meminfo_proc_show(struct seq_
-
- cached = global_page_state(NR_FILE_PAGES) -
+diff -NurpP --minimal linux-2.6.32.59/fs/proc/meminfo.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/meminfo.c
+--- linux-2.6.32.59/fs/proc/meminfo.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/meminfo.c 2011-06-10 13:03:02.000000000 +0200
+@@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_
+ allowed = ((totalram_pages - hugetlb_total_pages())
+ * sysctl_overcommit_ratio / 100) + total_swap_pages;
+
+- cached = global_page_state(NR_FILE_PAGES) -
++ cached = vx_flags(VXF_VIRT_MEM, 0) ?
++ vx_vsi_cached(&i) : global_page_state(NR_FILE_PAGES) -
total_swapcache_pages - i.bufferram;
-- if (cached < 0)
-+ if (cached < 0 || vx_flags(VXF_VIRT_MEM, 0))
+ if (cached < 0)
cached = 0;
-
- get_vmalloc_info(&vmi);
-diff -NurpP --minimal linux-2.6.32.6/fs/proc/root.c linux-2.6.32.6-vs2.3.0.36.28/fs/proc/root.c
---- linux-2.6.32.6/fs/proc/root.c 2009-06-11 17:13:07.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/proc/root.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/proc/root.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/root.c
+--- linux-2.6.32.59/fs/proc/root.c 2009-06-11 17:13:07.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/root.c 2011-06-10 13:03:02.000000000 +0200
@@ -18,9 +18,14 @@
#include <linux/bitops.h>
#include <linux/mount.h>
};
int pid_ns_prepare_proc(struct pid_namespace *ns)
-diff -NurpP --minimal linux-2.6.32.6/fs/proc/uptime.c linux-2.6.32.6-vs2.3.0.36.28/fs/proc/uptime.c
---- linux-2.6.32.6/fs/proc/uptime.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/proc/uptime.c 2009-12-03 20:04:56.000000000 +0100
-@@ -4,22 +4,22 @@
- #include <linux/sched.h>
+diff -NurpP --minimal linux-2.6.32.59/fs/proc/uptime.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/uptime.c
+--- linux-2.6.32.59/fs/proc/uptime.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/uptime.c 2012-02-09 10:58:46.000000000 +0100
+@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
--#include <linux/kernel_stat.h>
+ #include <linux/kernel_stat.h>
+#include <linux/vserver/cvirt.h>
#include <asm/cputime.h>
static int uptime_proc_show(struct seq_file *m, void *v)
- {
- struct timespec uptime;
- struct timespec idle;
-- int i;
-- cputime_t idletime = cputime_zero;
--
-- for_each_possible_cpu(i)
-- idletime = cputime64_add(idletime, kstat_cpu(i).cpustat.idle);
-+ cputime_t idletime = cputime_add(init_task.utime, init_task.stime);
-
- do_posix_clock_monotonic_gettime(&uptime);
- monotonic_to_bootbased(&uptime);
- cputime_to_timespec(idletime, &idle);
+@@ -25,6 +26,10 @@ static int uptime_proc_show(struct seq_f
+ nsec = cputime64_to_jiffies64(idletime) * TICK_NSEC;
+ idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
+ idle.tv_nsec = rem;
+
+ if (vx_flags(VXF_VIRT_UPTIME, 0))
+ vx_vsi_uptime(&uptime, &idle);
seq_printf(m, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-2.6.32.6/fs/quota/quota.c linux-2.6.32.6-vs2.3.0.36.28/fs/quota/quota.c
---- linux-2.6.32.6/fs/quota/quota.c 2009-09-10 15:26:24.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/quota/quota.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/quota/quota.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/quota/quota.c
+--- linux-2.6.32.59/fs/quota/quota.c 2009-09-10 15:26:24.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/quota/quota.c 2011-06-10 13:03:02.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/capability.h>
#include <linux/quotaops.h>
sb = get_super(bdev);
bdput(bdev);
if (!sb)
-diff -NurpP --minimal linux-2.6.32.6/fs/reiserfs/file.c linux-2.6.32.6-vs2.3.0.36.28/fs/reiserfs/file.c
---- linux-2.6.32.6/fs/reiserfs/file.c 2009-06-11 17:13:08.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/reiserfs/file.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/reiserfs/file.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/file.c
+--- linux-2.6.32.59/fs/reiserfs/file.c 2009-06-11 17:13:08.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/file.c 2011-06-10 13:03:02.000000000 +0200
@@ -307,4 +307,5 @@ const struct inode_operations reiserfs_f
.listxattr = reiserfs_listxattr,
.removexattr = reiserfs_removexattr,
.permission = reiserfs_permission,
+ .sync_flags = reiserfs_sync_flags,
};
-diff -NurpP --minimal linux-2.6.32.6/fs/reiserfs/inode.c linux-2.6.32.6-vs2.3.0.36.28/fs/reiserfs/inode.c
---- linux-2.6.32.6/fs/reiserfs/inode.c 2010-01-26 19:31:27.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/reiserfs/inode.c 2010-01-26 20:35:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/reiserfs/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/inode.c
+--- linux-2.6.32.59/fs/reiserfs/inode.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/inode.c 2011-06-10 13:03:02.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/writeback.h>
#include <linux/quotaops.h>
mark_inode_dirty(inode);
error =
journal_end(&th, inode->i_sb, jbegin_count);
-diff -NurpP --minimal linux-2.6.32.6/fs/reiserfs/ioctl.c linux-2.6.32.6-vs2.3.0.36.28/fs/reiserfs/ioctl.c
---- linux-2.6.32.6/fs/reiserfs/ioctl.c 2009-06-11 17:13:08.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/reiserfs/ioctl.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/reiserfs/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/ioctl.c
+--- linux-2.6.32.59/fs/reiserfs/ioctl.c 2009-06-11 17:13:08.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -7,11 +7,27 @@
#include <linux/mount.h>
#include <linux/reiserfs_fs.h>
sd_attrs_to_i_attrs(flags, inode);
REISERFS_I(inode)->i_attrs = flags;
inode->i_ctime = CURRENT_TIME_SEC;
-diff -NurpP --minimal linux-2.6.32.6/fs/reiserfs/namei.c linux-2.6.32.6-vs2.3.0.36.28/fs/reiserfs/namei.c
---- linux-2.6.32.6/fs/reiserfs/namei.c 2009-06-11 17:13:08.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/reiserfs/namei.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/reiserfs/namei.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/namei.c
+--- linux-2.6.32.59/fs/reiserfs/namei.c 2009-06-11 17:13:08.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/namei.c 2011-06-10 13:03:02.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/reiserfs_acl.h>
#include <linux/reiserfs_xattr.h>
};
/*
-diff -NurpP --minimal linux-2.6.32.6/fs/reiserfs/super.c linux-2.6.32.6-vs2.3.0.36.28/fs/reiserfs/super.c
---- linux-2.6.32.6/fs/reiserfs/super.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/reiserfs/super.c 2009-12-03 20:04:56.000000000 +0100
-@@ -884,6 +884,14 @@ static int reiserfs_parse_options(struct
+diff -NurpP --minimal linux-2.6.32.59/fs/reiserfs/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/super.c
+--- linux-2.6.32.59/fs/reiserfs/super.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/super.c 2012-02-09 10:33:19.000000000 +0100
+@@ -888,6 +888,14 @@ static int reiserfs_parse_options(struct
{"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
{"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
#endif
#ifdef CONFIG_REISERFS_FS_POSIX_ACL
{"acl",.setmask = 1 << REISERFS_POSIXACL},
{"noacl",.clrmask = 1 << REISERFS_POSIXACL},
-@@ -1190,6 +1198,14 @@ static int reiserfs_remount(struct super
+@@ -1195,6 +1203,14 @@ static int reiserfs_remount(struct super
handle_quota_files(s, qf_names, &qfmt);
#endif
handle_attrs(s);
/* Add options that are safe here */
-@@ -1652,6 +1668,10 @@ static int reiserfs_fill_super(struct su
+@@ -1657,6 +1673,10 @@ static int reiserfs_fill_super(struct su
goto error;
}
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.32.6/fs/reiserfs/xattr.c linux-2.6.32.6-vs2.3.0.36.28/fs/reiserfs/xattr.c
---- linux-2.6.32.6/fs/reiserfs/xattr.c 2009-09-10 15:26:24.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/reiserfs/xattr.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/reiserfs/xattr.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/xattr.c
+--- linux-2.6.32.59/fs/reiserfs/xattr.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/xattr.c 2011-06-10 13:03:02.000000000 +0200
@@ -39,6 +39,7 @@
#include <linux/namei.h>
#include <linux/errno.h>
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/xattr.h>
-diff -NurpP --minimal linux-2.6.32.6/fs/stat.c linux-2.6.32.6-vs2.3.0.36.28/fs/stat.c
---- linux-2.6.32.6/fs/stat.c 2010-01-26 19:31:27.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/stat.c 2010-01-13 14:33:47.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/stat.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/stat.c
+--- linux-2.6.32.59/fs/stat.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/stat.c 2011-06-10 13:03:02.000000000 +0200
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
stat->rdev = inode->i_rdev;
stat->atime = inode->i_atime;
stat->mtime = inode->i_mtime;
-diff -NurpP --minimal linux-2.6.32.6/fs/super.c linux-2.6.32.6-vs2.3.0.36.28/fs/super.c
---- linux-2.6.32.6/fs/super.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/super.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/super.c
+--- linux-2.6.32.59/fs/super.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/super.c 2011-06-10 13:03:02.000000000 +0200
@@ -37,6 +37,9 @@
#include <linux/kobject.h>
#include <linux/mutex.h>
#include <asm/uaccess.h>
#include "internal.h"
-@@ -913,12 +916,18 @@ struct vfsmount *
+@@ -914,12 +917,18 @@ struct vfsmount *
vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void *data)
{
struct vfsmount *mnt;
error = -ENOMEM;
mnt = alloc_vfsmnt(name);
if (!mnt)
-@@ -937,9 +946,17 @@ vfs_kern_mount(struct file_system_type *
+@@ -938,9 +947,17 @@ vfs_kern_mount(struct file_system_type *
error = type->get_sb(type, flags, name, data, mnt);
if (error < 0)
goto out_free_secdata;
if (error)
goto out_sb;
-diff -NurpP --minimal linux-2.6.32.6/fs/sysfs/mount.c linux-2.6.32.6-vs2.3.0.36.28/fs/sysfs/mount.c
---- linux-2.6.32.6/fs/sysfs/mount.c 2009-06-11 17:13:08.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/sysfs/mount.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/sysfs/mount.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/sysfs/mount.c
+--- linux-2.6.32.59/fs/sysfs/mount.c 2009-06-11 17:13:08.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/sysfs/mount.c 2011-06-10 13:03:02.000000000 +0200
@@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super
sb->s_blocksize = PAGE_CACHE_SIZE;
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
sysfs_sb = sb;
-diff -NurpP --minimal linux-2.6.32.6/fs/utimes.c linux-2.6.32.6-vs2.3.0.36.28/fs/utimes.c
---- linux-2.6.32.6/fs/utimes.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/utimes.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/utimes.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/utimes.c
+--- linux-2.6.32.59/fs/utimes.c 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/utimes.c 2011-06-10 13:03:02.000000000 +0200
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
-diff -NurpP --minimal linux-2.6.32.6/fs/xattr.c linux-2.6.32.6-vs2.3.0.36.28/fs/xattr.c
---- linux-2.6.32.6/fs/xattr.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/xattr.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/xattr.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xattr.c
+--- linux-2.6.32.59/fs/xattr.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xattr.c 2011-06-10 13:03:02.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/module.h>
#include <linux/fsnotify.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.32.6/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.32.6/fs/xfs/linux-2.6/xfs_ioctl.c 2009-09-10 15:26:24.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/linux-2.6/xfs_ioctl.c 2009-12-03 20:04:56.000000000 +0100
+@@ -49,7 +50,7 @@ xattr_permission(struct inode *inode, co
+ * The trusted.* namespace can only be accessed by a privileged user.
+ */
+ if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN))
+- return (capable(CAP_SYS_ADMIN) ? 0 : -EPERM);
++ return (vx_capable(CAP_SYS_ADMIN, VXC_FS_TRUSTED) ? 0 : -EPERM);
+
+ /* In user.* namespace, only regular files and directories can have
+ * extended attributes. For sticky directories, only the owner and
+diff -NurpP --minimal linux-2.6.32.59/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.32.59/fs/xfs/linux-2.6/xfs_ioctl.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -34,7 +34,6 @@
#include "xfs_dir2_sf.h"
#include "xfs_dinode.h"
#include "xfs_btree.h"
#include "xfs_ialloc.h"
#include "xfs_rtalloc.h"
-@@ -742,6 +741,10 @@ xfs_merge_ioc_xflags(
+@@ -746,6 +745,10 @@ xfs_merge_ioc_xflags(
xflags |= XFS_XFLAG_IMMUTABLE;
else
xflags &= ~XFS_XFLAG_IMMUTABLE;
if (flags & FS_APPEND_FL)
xflags |= XFS_XFLAG_APPEND;
else
-@@ -770,6 +773,8 @@ xfs_di2lxflags(
+@@ -774,6 +777,8 @@ xfs_di2lxflags(
if (di_flags & XFS_DIFLAG_IMMUTABLE)
flags |= FS_IMMUTABLE_FL;
if (di_flags & XFS_DIFLAG_APPEND)
flags |= FS_APPEND_FL;
if (di_flags & XFS_DIFLAG_SYNC)
-@@ -828,6 +833,8 @@ xfs_set_diflags(
+@@ -834,6 +839,8 @@ xfs_set_diflags(
di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC);
if (xflags & XFS_XFLAG_IMMUTABLE)
di_flags |= XFS_DIFLAG_IMMUTABLE;
if (xflags & XFS_XFLAG_APPEND)
di_flags |= XFS_DIFLAG_APPEND;
if (xflags & XFS_XFLAG_SYNC)
-@@ -870,6 +877,10 @@ xfs_diflags_to_linux(
+@@ -876,6 +883,10 @@ xfs_diflags_to_linux(
inode->i_flags |= S_IMMUTABLE;
else
inode->i_flags &= ~S_IMMUTABLE;
if (xflags & XFS_XFLAG_APPEND)
inode->i_flags |= S_APPEND;
else
-@@ -1346,10 +1357,18 @@ xfs_file_ioctl(
+@@ -1352,10 +1363,18 @@ xfs_file_ioctl(
case XFS_IOC_FSGETXATTRA:
return xfs_ioc_fsgetxattr(ip, 1, arg);
case XFS_IOC_FSSETXATTR:
return xfs_ioc_setxflags(ip, filp, arg);
case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-2.6.32.6/fs/xfs/linux-2.6/xfs_ioctl.h linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/linux-2.6/xfs_ioctl.h
---- linux-2.6.32.6/fs/xfs/linux-2.6/xfs_ioctl.h 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/linux-2.6/xfs_ioctl.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/xfs/linux-2.6/xfs_ioctl.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_ioctl.h
+--- linux-2.6.32.59/fs/xfs/linux-2.6/xfs_ioctl.h 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_ioctl.h 2011-06-10 13:03:02.000000000 +0200
@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
void __user *uhandle,
u32 hlen);
extern long
xfs_file_ioctl(
struct file *filp,
-diff -NurpP --minimal linux-2.6.32.6/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.32.6/fs/xfs/linux-2.6/xfs_iops.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/linux-2.6/xfs_iops.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.32.59/fs/xfs/linux-2.6/xfs_iops.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_iops.c 2011-06-10 13:03:02.000000000 +0200
@@ -36,6 +36,7 @@
#include "xfs_attr_sf.h"
#include "xfs_dinode.h"
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-2.6.32.6/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/linux-2.6/xfs_linux.h
---- linux-2.6.32.6/fs/xfs/linux-2.6/xfs_linux.h 2009-09-10 15:26:24.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/linux-2.6/xfs_linux.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_linux.h
+--- linux-2.6.32.59/fs/xfs/linux-2.6/xfs_linux.h 2009-09-10 15:26:24.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_linux.h 2011-06-10 13:03:02.000000000 +0200
@@ -119,6 +119,7 @@
#define current_cpu() (raw_smp_processor_id())
#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.32.6/fs/xfs/linux-2.6/xfs_super.c linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/linux-2.6/xfs_super.c
---- linux-2.6.32.6/fs/xfs/linux-2.6/xfs_super.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/linux-2.6/xfs_super.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/xfs/linux-2.6/xfs_super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_super.c
+--- linux-2.6.32.59/fs/xfs/linux-2.6/xfs_super.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_super.c 2011-06-10 13:03:02.000000000 +0200
@@ -117,6 +117,9 @@ mempool_t *xfs_ioend_pool;
#define MNTOPT_DMAPI "dmapi" /* DMI enabled (DMAPI / XDSM) */
#define MNTOPT_XDSM "xdsm" /* DMI enabled (DMAPI / XDSM) */
} else {
cmn_err(CE_WARN,
"XFS: unknown mount option [%s].", this_char);
-@@ -1270,6 +1290,16 @@ xfs_fs_remount(
+@@ -1295,6 +1315,16 @@ xfs_fs_remount(
case Opt_nobarrier:
mp->m_flags &= ~XFS_MOUNT_BARRIER;
break;
default:
/*
* Logically we would return an error here to prevent
-@@ -1477,6 +1507,9 @@ xfs_fs_fill_super(
+@@ -1530,6 +1560,9 @@ xfs_fs_fill_super(
XFS_SEND_MOUNT(mp, DM_RIGHT_NULL, mtpt, mp->m_fsname);
sb->s_magic = XFS_SB_MAGIC;
sb->s_blocksize = mp->m_sb.sb_blocksize;
sb->s_blocksize_bits = ffs(sb->s_blocksize) - 1;
-diff -NurpP --minimal linux-2.6.32.6/fs/xfs/xfs_dinode.h linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_dinode.h
---- linux-2.6.32.6/fs/xfs/xfs_dinode.h 2009-06-11 17:13:09.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_dinode.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_dinode.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_dinode.h
+--- linux-2.6.32.59/fs/xfs/xfs_dinode.h 2009-06-11 17:13:09.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_dinode.h 2011-06-10 13:03:02.000000000 +0200
@@ -50,7 +50,9 @@ typedef struct xfs_dinode {
__be32 di_gid; /* owner's group id */
__be32 di_nlink; /* number of links to file */
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-2.6.32.6/fs/xfs/xfs_fs.h linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_fs.h
---- linux-2.6.32.6/fs/xfs/xfs_fs.h 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_fs.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_fs.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_fs.h
+--- linux-2.6.32.59/fs/xfs/xfs_fs.h 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_fs.h 2011-06-10 13:03:02.000000000 +0200
@@ -67,6 +67,9 @@ struct fsxattr {
#define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
#define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
__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.32.6/fs/xfs/xfs_ialloc.c linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_ialloc.c
---- linux-2.6.32.6/fs/xfs/xfs_ialloc.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_ialloc.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_ialloc.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_ialloc.c
+--- linux-2.6.32.59/fs/xfs/xfs_ialloc.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_ialloc.c 2011-06-10 13:03:02.000000000 +0200
@@ -41,7 +41,6 @@
#include "xfs_error.h"
#include "xfs_bmap.h"
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-2.6.32.6/fs/xfs/xfs_inode.c linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_inode.c
---- linux-2.6.32.6/fs/xfs/xfs_inode.c 2009-12-03 20:02:54.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_inode.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_inode.c
+--- linux-2.6.32.59/fs/xfs/xfs_inode.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_inode.c 2011-06-10 13:03:02.000000000 +0200
@@ -249,6 +249,7 @@ xfs_inotobp(
return 0;
}
(XFS_DFORK_Q(dip) ? XFS_XFLAG_HASATTR : 0);
}
-@@ -811,7 +836,6 @@ xfs_iread(
+@@ -808,7 +833,6 @@ xfs_iread(
if (error)
return error;
dip = (xfs_dinode_t *)xfs_buf_offset(bp, ip->i_imap.im_boffset);
/*
* If we got something that isn't an inode it means someone
* (nfs or dmi) has a stale handle.
-@@ -836,7 +860,8 @@ xfs_iread(
+@@ -833,7 +857,8 @@ xfs_iread(
* Otherwise, just get the truly permanent information.
*/
if (dip->di_mode) {
error = xfs_iformat(ip, dip);
if (error) {
#ifdef DEBUG
-@@ -1036,6 +1061,7 @@ xfs_ialloc(
+@@ -1033,6 +1058,7 @@ xfs_ialloc(
ASSERT(ip->i_d.di_nlink == nlink);
ip->i_d.di_uid = current_fsuid();
ip->i_d.di_gid = current_fsgid();
ip->i_d.di_projid = prid;
memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
-@@ -1096,6 +1122,7 @@ xfs_ialloc(
+@@ -1093,6 +1119,7 @@ xfs_ialloc(
ip->i_d.di_dmevmask = 0;
ip->i_d.di_dmstate = 0;
ip->i_d.di_flags = 0;
flags = XFS_ILOG_CORE;
switch (mode & S_IFMT) {
case S_IFIFO:
-@@ -2172,6 +2199,7 @@ xfs_ifree(
+@@ -2169,6 +2196,7 @@ xfs_ifree(
}
ip->i_d.di_mode = 0; /* mark incore inode as free */
ip->i_d.di_flags = 0;
ip->i_d.di_dmevmask = 0;
ip->i_d.di_forkoff = 0; /* mark the attr fork not in use */
ip->i_df.if_ext_max =
-@@ -3139,7 +3167,8 @@ xfs_iflush_int(
+@@ -3149,7 +3177,8 @@ xfs_iflush_int(
* because if the inode is dirty at all the core must
* be.
*/
/* Wrap, we never let the log put out DI_MAX_FLUSH */
if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
-diff -NurpP --minimal linux-2.6.32.6/fs/xfs/xfs_inode.h linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_inode.h
---- linux-2.6.32.6/fs/xfs/xfs_inode.h 2009-12-03 20:02:54.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_inode.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_inode.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_inode.h
+--- linux-2.6.32.59/fs/xfs/xfs_inode.h 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_inode.h 2011-06-10 13:03:02.000000000 +0200
@@ -135,7 +135,9 @@ typedef struct xfs_icdinode {
__uint32_t di_gid; /* owner's group id */
__uint32_t di_nlink; /* number of links to file */
xfs_ictimestamp_t di_mtime; /* time last modified */
@@ -569,7 +571,7 @@ int xfs_itobp(struct xfs_mount *, struc
int xfs_iread(struct xfs_mount *, struct xfs_trans *,
- struct xfs_inode *, xfs_daddr_t, uint);
+ struct xfs_inode *, uint);
void xfs_dinode_to_disk(struct xfs_dinode *,
- struct xfs_icdinode *);
+ struct xfs_icdinode *, int);
void xfs_idestroy_fork(struct xfs_inode *, int);
void xfs_idata_realloc(struct xfs_inode *, int, int);
void xfs_iroot_realloc(struct xfs_inode *, int, int);
-diff -NurpP --minimal linux-2.6.32.6/fs/xfs/xfs_itable.c linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_itable.c
---- linux-2.6.32.6/fs/xfs/xfs_itable.c 2009-12-03 20:02:54.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_itable.c 2009-12-03 20:04:56.000000000 +0100
-@@ -84,6 +84,7 @@ xfs_bulkstat_one_iget(
+diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_itable.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_itable.c
+--- linux-2.6.32.59/fs/xfs/xfs_itable.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_itable.c 2011-06-10 13:03:02.000000000 +0200
+@@ -100,6 +100,7 @@ xfs_bulkstat_one_int(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
buf->bs_gid = dic->di_gid;
buf->bs_size = dic->di_size;
/*
-diff -NurpP --minimal linux-2.6.32.6/fs/xfs/xfs_log_recover.c linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_log_recover.c
---- linux-2.6.32.6/fs/xfs/xfs_log_recover.c 2009-12-03 20:02:54.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_log_recover.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_log_recover.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_log_recover.c
+--- linux-2.6.32.59/fs/xfs/xfs_log_recover.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_log_recover.c 2011-06-10 13:03:02.000000000 +0200
@@ -2467,7 +2467,8 @@ xlog_recover_do_inode_trans(
}
/* the rest is in on-disk format */
if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
-diff -NurpP --minimal linux-2.6.32.6/fs/xfs/xfs_mount.h linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_mount.h
---- linux-2.6.32.6/fs/xfs/xfs_mount.h 2009-12-03 20:02:54.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_mount.h 2009-12-03 20:04:56.000000000 +0100
-@@ -283,6 +283,7 @@ typedef struct xfs_mount {
+diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_mount.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_mount.h
+--- linux-2.6.32.59/fs/xfs/xfs_mount.h 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_mount.h 2011-06-10 13:03:02.000000000 +0200
+@@ -285,6 +285,7 @@ typedef struct xfs_mount {
allocator */
#define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-2.6.32.6/fs/xfs/xfs_vnodeops.c linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_vnodeops.c
---- linux-2.6.32.6/fs/xfs/xfs_vnodeops.c 2009-12-03 20:02:54.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_vnodeops.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_vnodeops.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_vnodeops.c
+--- linux-2.6.32.59/fs/xfs/xfs_vnodeops.c 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_vnodeops.c 2011-06-10 13:03:02.000000000 +0200
@@ -54,6 +54,80 @@
#include "xfs_filestream.h"
#include "xfs_vnodeops.h"
uid_t uid=0, iuid=0;
gid_t gid=0, igid=0;
+ tag_t tag=0, itag=0;
- int timeflags = 0;
struct xfs_dquot *udqp, *gdqp, *olddquot1, *olddquot2;
int need_iolock = 1;
-@@ -165,7 +240,7 @@ xfs_setattr(
+
+@@ -161,7 +236,7 @@ xfs_setattr(
/*
* Change file ownership. Must be the owner or privileged.
*/
/*
* These IDs could have changed since we last looked at them.
* But, we're assured that if the ownership did change
-@@ -174,8 +249,10 @@ xfs_setattr(
+@@ -170,8 +245,10 @@ xfs_setattr(
*/
iuid = ip->i_d.di_uid;
igid = ip->i_d.di_gid;
/*
* Do a quota reservation only if uid/gid is actually
-@@ -183,7 +260,8 @@ xfs_setattr(
+@@ -179,7 +256,8 @@ xfs_setattr(
*/
if (XFS_IS_QUOTA_RUNNING(mp) &&
((XFS_IS_UQUOTA_ON(mp) && iuid != uid) ||
ASSERT(tp);
code = xfs_qm_vop_chown_reserve(tp, ip, udqp, gdqp,
capable(CAP_FOWNER) ?
-@@ -336,7 +414,7 @@ xfs_setattr(
+@@ -340,7 +418,7 @@ xfs_setattr(
/*
* Change file ownership. Must be the owner or privileged.
*/
/*
* CAP_FSETID overrides the following restrictions:
*
-@@ -352,6 +430,10 @@ xfs_setattr(
+@@ -356,6 +434,10 @@ xfs_setattr(
* Change the ownerships and register quota modifications
* in the transaction.
*/
if (iuid != uid) {
if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_UQUOTA_ON(mp)) {
ASSERT(mask & ATTR_UID);
-diff -NurpP --minimal linux-2.6.32.6/fs/xfs/xfs_vnodeops.h linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_vnodeops.h
---- linux-2.6.32.6/fs/xfs/xfs_vnodeops.h 2009-09-10 15:26:24.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/fs/xfs/xfs_vnodeops.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_vnodeops.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_vnodeops.h
+--- linux-2.6.32.59/fs/xfs/xfs_vnodeops.h 2012-03-20 11:26:28.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_vnodeops.h 2011-06-10 13:03:02.000000000 +0200
@@ -14,6 +14,7 @@ struct xfs_inode;
struct xfs_iomap;
int xfs_setattr(struct xfs_inode *ip, struct iattr *vap, int flags);
#define XFS_ATTR_DMI 0x01 /* invocation from a DMI function */
#define XFS_ATTR_NONBLOCK 0x02 /* return EAGAIN if operation would block */
-diff -NurpP --minimal linux-2.6.32.6/include/asm-generic/tlb.h linux-2.6.32.6-vs2.3.0.36.28/include/asm-generic/tlb.h
---- linux-2.6.32.6/include/asm-generic/tlb.h 2009-09-10 15:26:24.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/asm-generic/tlb.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/asm-generic/tlb.h linux-2.6.32.59-vs2.3.0.36.29.9/include/asm-generic/tlb.h
+--- linux-2.6.32.59/include/asm-generic/tlb.h 2009-09-10 15:26:24.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/asm-generic/tlb.h 2011-06-10 13:03:02.000000000 +0200
@@ -14,6 +14,7 @@
#define _ASM_GENERIC__TLB_H
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.32.6/include/linux/capability.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/capability.h
---- linux-2.6.32.6/include/linux/capability.h 2009-12-03 20:02:54.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/capability.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/Kbuild linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/Kbuild
+--- linux-2.6.32.59/include/linux/Kbuild 2009-12-03 20:02:54.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/Kbuild 2011-06-10 13:03:02.000000000 +0200
+@@ -382,5 +382,8 @@ unifdef-y += xattr.h
+ unifdef-y += xfrm.h
+
+ objhdr-y += version.h
++
++header-y += vserver/
+ header-y += wimax.h
+ header-y += wimax/
++
+diff -NurpP --minimal linux-2.6.32.59/include/linux/capability.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/capability.h
+--- linux-2.6.32.59/include/linux/capability.h 2009-12-03 20:02:54.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/capability.h 2011-06-10 13:03:02.000000000 +0200
@@ -285,6 +285,7 @@ struct cpu_vfs_cap_data {
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
-diff -NurpP --minimal linux-2.6.32.6/include/linux/devpts_fs.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/devpts_fs.h
---- linux-2.6.32.6/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/devpts_fs.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/devpts_fs.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/devpts_fs.h
+--- linux-2.6.32.59/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/devpts_fs.h 2011-06-10 13:03:02.000000000 +0200
@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/ext2_fs.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/ext2_fs.h
---- linux-2.6.32.6/include/linux/ext2_fs.h 2009-03-24 14:22:41.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/ext2_fs.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/ext2_fs.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/ext2_fs.h
+--- linux-2.6.32.59/include/linux/ext2_fs.h 2012-03-20 11:26:29.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/ext2_fs.h 2011-11-17 12:18:26.000000000 +0100
@@ -189,8 +189,12 @@ struct ext2_group_desc
#define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
#define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-2.6.32.6/include/linux/ext3_fs.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/ext3_fs.h
---- linux-2.6.32.6/include/linux/ext3_fs.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/ext3_fs.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/ext3_fs.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/ext3_fs.h
+--- linux-2.6.32.59/include/linux/ext3_fs.h 2012-03-20 11:26:29.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/ext3_fs.h 2011-11-17 12:18:26.000000000 +0100
@@ -173,10 +173,14 @@ struct ext3_group_desc
#define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
#define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-2.6.32.6/include/linux/fs.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/fs.h
---- linux-2.6.32.6/include/linux/fs.h 2010-01-26 19:31:27.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/fs.h 2010-01-13 14:33:47.000000000 +0100
-@@ -205,6 +205,9 @@ struct inodes_stat_t {
+diff -NurpP --minimal linux-2.6.32.59/include/linux/fs.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/fs.h
+--- linux-2.6.32.59/include/linux/fs.h 2012-03-20 11:26:29.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/fs.h 2011-08-08 22:40:36.000000000 +0200
+@@ -208,6 +208,9 @@ struct inodes_stat_t {
#define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */
#define MS_I_VERSION (1<<23) /* Update inode I_version field */
#define MS_STRICTATIME (1<<24) /* Always perform atime updates */
#define MS_ACTIVE (1<<30)
#define MS_NOUSER (1<<31)
-@@ -231,6 +234,14 @@ struct inodes_stat_t {
+@@ -234,6 +237,14 @@ struct inodes_stat_t {
#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 */
/*
* Note that nosuid etc flags are inode-specific: setting some file-system
-@@ -253,12 +264,15 @@ struct inodes_stat_t {
+@@ -256,12 +267,15 @@ struct inodes_stat_t {
#define IS_DIRSYNC(inode) (__IS_FLG(inode, MS_SYNCHRONOUS|MS_DIRSYNC) || \
((inode)->i_flags & (S_SYNC|S_DIRSYNC)))
#define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK)
#define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
#define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
-@@ -266,6 +280,16 @@ struct inodes_stat_t {
+@@ -269,6 +283,16 @@ struct inodes_stat_t {
#define IS_SWAPFILE(inode) ((inode)->i_flags & S_SWAPFILE)
#define IS_PRIVATE(inode) ((inode)->i_flags & S_PRIVATE)
/* the read-only stuff doesn't really belong here, but any other place is
probably as bad and I don't want to create yet another include file. */
-@@ -347,11 +371,14 @@ struct inodes_stat_t {
+@@ -350,11 +374,14 @@ struct inodes_stat_t {
#define FS_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
#define FS_EXTENT_FL 0x00080000 /* Extents */
#define FS_DIRECTIO_FL 0x00100000 /* Use direct i/o */
#define SYNC_FILE_RANGE_WAIT_BEFORE 1
#define SYNC_FILE_RANGE_WRITE 2
-@@ -433,6 +460,7 @@ typedef void (dio_iodone_t)(struct kiocb
+@@ -436,6 +463,7 @@ typedef void (dio_iodone_t)(struct kiocb
#define ATTR_KILL_PRIV (1 << 14)
#define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
#define ATTR_TIMES_SET (1 << 16)
/*
* This is the Inode Attributes structure, used for notify_change(). It
-@@ -448,6 +476,7 @@ struct iattr {
+@@ -451,6 +479,7 @@ struct iattr {
umode_t ia_mode;
uid_t ia_uid;
gid_t ia_gid;
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-@@ -461,6 +490,9 @@ struct iattr {
+@@ -464,6 +493,9 @@ struct iattr {
struct file *ia_file;
};
/*
* Includes for diskquotas.
*/
-@@ -726,7 +758,9 @@ struct inode {
+@@ -730,7 +762,9 @@ struct inode {
unsigned int i_nlink;
uid_t i_uid;
gid_t i_gid;
u64 i_version;
loff_t i_size;
#ifdef __NEED_I_SIZE_ORDERED
-@@ -773,7 +807,8 @@ struct inode {
+@@ -777,7 +811,8 @@ struct inode {
unsigned long i_state;
unsigned long dirtied_when; /* jiffies of first dirtying */
atomic_t i_writecount;
#ifdef CONFIG_SECURITY
-@@ -861,12 +896,12 @@ static inline void i_size_write(struct i
+@@ -865,12 +900,12 @@ static inline void i_size_write(struct i
static inline unsigned iminor(const struct inode *inode)
{
}
extern struct block_device *I_BDEV(struct inode *inode);
-@@ -925,6 +960,7 @@ struct file {
+@@ -929,6 +964,7 @@ struct file {
loff_t f_pos;
struct fown_struct f_owner;
const struct cred *f_cred;
struct file_ra_state f_ra;
u64 f_version;
-@@ -1066,6 +1102,7 @@ struct file_lock {
+@@ -1070,6 +1106,7 @@ struct file_lock {
struct file *fl_file;
loff_t fl_start;
loff_t fl_end;
struct fasync_struct * fl_fasync; /* for lease break notifications */
unsigned long fl_break_time; /* for nonblocking lease breaks */
-@@ -1531,6 +1568,7 @@ struct inode_operations {
+@@ -1537,6 +1574,7 @@ struct inode_operations {
ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
ssize_t (*listxattr) (struct dentry *, char *, size_t);
int (*removexattr) (struct dentry *, const char *);
void (*truncate_range)(struct inode *, loff_t, loff_t);
long (*fallocate)(struct inode *inode, int mode, loff_t offset,
loff_t len);
-@@ -1551,6 +1589,7 @@ extern ssize_t vfs_readv(struct file *,
+@@ -1557,6 +1595,7 @@ extern ssize_t vfs_readv(struct file *,
unsigned long, loff_t *);
extern ssize_t vfs_writev(struct file *, const struct iovec __user *,
unsigned long, loff_t *);
struct super_operations {
struct inode *(*alloc_inode)(struct super_block *sb);
-@@ -2348,6 +2387,7 @@ extern int dcache_dir_open(struct inode
+@@ -2356,6 +2395,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 simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
extern int simple_link(struct dentry *, struct inode *, struct dentry *);
-diff -NurpP --minimal linux-2.6.32.6/include/linux/gfs2_ondisk.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/gfs2_ondisk.h
---- linux-2.6.32.6/include/linux/gfs2_ondisk.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/gfs2_ondisk.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/gfs2_ondisk.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/gfs2_ondisk.h
+--- linux-2.6.32.59/include/linux/gfs2_ondisk.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/gfs2_ondisk.h 2011-06-10 13:03:02.000000000 +0200
@@ -235,6 +235,9 @@ enum {
gfs2fl_NoAtime = 7,
gfs2fl_Sync = 8,
#define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */
#define GFS2_DIF_INHERIT_DIRECTIO 0x40000000
#define GFS2_DIF_INHERIT_JDATA 0x80000000
-diff -NurpP --minimal linux-2.6.32.6/include/linux/if_tun.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/if_tun.h
---- linux-2.6.32.6/include/linux/if_tun.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/if_tun.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/if_tun.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/if_tun.h
+--- linux-2.6.32.59/include/linux/if_tun.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/if_tun.h 2011-06-10 13:03:02.000000000 +0200
@@ -48,6 +48,7 @@
#define TUNGETIFF _IOR('T', 210, unsigned int)
#define TUNGETSNDBUF _IOR('T', 211, int)
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-2.6.32.6/include/linux/init_task.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/init_task.h
---- linux-2.6.32.6/include/linux/init_task.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/init_task.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/init_task.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/init_task.h
+--- linux-2.6.32.59/include/linux/init_task.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/init_task.h 2011-06-10 13:03:02.000000000 +0200
@@ -184,6 +184,10 @@ extern struct cred init_cred;
INIT_FTRACE_GRAPH \
INIT_TRACE_RECURSION \
}
-diff -NurpP --minimal linux-2.6.32.6/include/linux/ipc.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/ipc.h
---- linux-2.6.32.6/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/ipc.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/ipc.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/ipc.h
+--- linux-2.6.32.59/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/ipc.h 2011-06-10 13:03:02.000000000 +0200
@@ -91,6 +91,7 @@ struct kern_ipc_perm
key_t key;
uid_t uid;
uid_t cuid;
gid_t cgid;
mode_t mode;
-diff -NurpP --minimal linux-2.6.32.6/include/linux/Kbuild linux-2.6.32.6-vs2.3.0.36.28/include/linux/Kbuild
---- linux-2.6.32.6/include/linux/Kbuild 2009-12-03 20:02:54.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/Kbuild 2009-12-03 20:04:56.000000000 +0100
-@@ -382,5 +382,8 @@ unifdef-y += xattr.h
- unifdef-y += xfrm.h
-
- objhdr-y += version.h
-+
-+header-y += vserver/
- header-y += wimax.h
- header-y += wimax/
-+
-diff -NurpP --minimal linux-2.6.32.6/include/linux/loop.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/loop.h
---- linux-2.6.32.6/include/linux/loop.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/loop.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/loop.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/loop.h
+--- linux-2.6.32.59/include/linux/loop.h 2009-09-10 15:26:25.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/loop.h 2011-06-10 13:03:02.000000000 +0200
@@ -45,6 +45,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-2.6.32.6/include/linux/magic.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/magic.h
---- linux-2.6.32.6/include/linux/magic.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/magic.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/magic.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/magic.h
+--- linux-2.6.32.59/include/linux/magic.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/magic.h 2011-06-10 13:03:02.000000000 +0200
@@ -3,7 +3,7 @@
#define ADFS_SUPER_MAGIC 0xadf5
#define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */
#define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/major.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/major.h
---- linux-2.6.32.6/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/major.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/major.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/major.h
+--- linux-2.6.32.59/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/major.h 2011-06-10 13:03:02.000000000 +0200
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-2.6.32.6/include/linux/mm_types.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/mm_types.h
---- linux-2.6.32.6/include/linux/mm_types.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/mm_types.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/memcontrol.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/memcontrol.h
+--- linux-2.6.32.59/include/linux/memcontrol.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/memcontrol.h 2011-06-10 13:03:02.000000000 +0200
+@@ -70,6 +70,13 @@ int task_in_mem_cgroup(struct task_struc
+
+ extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p);
+
++extern u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member);
++extern u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member);
++
++extern s64 mem_cgroup_stat_read_cache(struct mem_cgroup *mem);
++extern s64 mem_cgroup_stat_read_anon(struct mem_cgroup *mem);
++extern s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem);
++
+ static inline
+ int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
+ {
+diff -NurpP --minimal linux-2.6.32.59/include/linux/mm_types.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/mm_types.h
+--- linux-2.6.32.59/include/linux/mm_types.h 2012-03-20 11:26:29.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/mm_types.h 2011-06-10 13:03:02.000000000 +0200
@@ -246,6 +246,7 @@ struct mm_struct {
/* Architecture-specific MM context */
/* Swap token stuff */
/*
-diff -NurpP --minimal linux-2.6.32.6/include/linux/mount.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/mount.h
---- linux-2.6.32.6/include/linux/mount.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/mount.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/mount.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/mount.h
+--- linux-2.6.32.59/include/linux/mount.h 2009-09-10 15:26:25.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/mount.h 2011-06-10 13:03:02.000000000 +0200
@@ -36,6 +36,9 @@ struct mnt_namespace;
#define MNT_UNBINDABLE 0x2000 /* if the vfsmount is a unbindable mount */
#define MNT_PNODE_MASK 0x3000 /* propagation flag mask */
};
static inline int *get_mnt_writers_ptr(struct vfsmount *mnt)
-diff -NurpP --minimal linux-2.6.32.6/include/linux/net.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/net.h
---- linux-2.6.32.6/include/linux/net.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/net.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/net.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/net.h
+--- linux-2.6.32.59/include/linux/net.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/net.h 2011-06-10 13:03:02.000000000 +0200
@@ -69,6 +69,7 @@ struct net;
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-2.6.32.6/include/linux/nfs_mount.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/nfs_mount.h
---- linux-2.6.32.6/include/linux/nfs_mount.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/nfs_mount.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/nfs_mount.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/nfs_mount.h
+--- linux-2.6.32.59/include/linux/nfs_mount.h 2009-03-24 14:22:43.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/nfs_mount.h 2011-06-10 13:03:02.000000000 +0200
@@ -63,7 +63,8 @@ struct nfs_mount_data {
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
#define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-2.6.32.6/include/linux/nsproxy.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/nsproxy.h
---- linux-2.6.32.6/include/linux/nsproxy.h 2009-06-11 17:13:17.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/nsproxy.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/nsproxy.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/nsproxy.h
+--- linux-2.6.32.59/include/linux/nsproxy.h 2009-06-11 17:13:17.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/nsproxy.h 2011-06-10 13:03:02.000000000 +0200
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
}
#ifdef CONFIG_CGROUP_NS
-diff -NurpP --minimal linux-2.6.32.6/include/linux/pid.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/pid.h
---- linux-2.6.32.6/include/linux/pid.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/pid.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/pid.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/pid.h
+--- linux-2.6.32.59/include/linux/pid.h 2012-03-20 11:26:29.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/pid.h 2011-06-10 13:03:02.000000000 +0200
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-2.6.32.6/include/linux/proc_fs.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/proc_fs.h
---- linux-2.6.32.6/include/linux/proc_fs.h 2009-12-03 20:02:56.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/proc_fs.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/proc_fs.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/proc_fs.h
+--- linux-2.6.32.59/include/linux/proc_fs.h 2009-12-03 20:02:56.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/proc_fs.h 2011-06-10 13:03:02.000000000 +0200
@@ -56,6 +56,7 @@ struct proc_dir_entry {
nlink_t nlink;
uid_t uid;
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-2.6.32.6/include/linux/quotaops.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/quotaops.h
---- linux-2.6.32.6/include/linux/quotaops.h 2009-12-03 20:02:56.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/quotaops.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/quotaops.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/quotaops.h
+--- linux-2.6.32.59/include/linux/quotaops.h 2012-03-20 11:26:29.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/quotaops.h 2011-06-10 13:03:02.000000000 +0200
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
static inline struct quota_info *sb_dqopt(struct super_block *sb)
{
-@@ -154,10 +155,14 @@ static inline void vfs_dq_init(struct in
+@@ -157,10 +158,14 @@ static inline void vfs_dq_init(struct in
* a transaction (deadlocks possible otherwise) */
static inline int vfs_dq_prealloc_space_nodirty(struct inode *inode, qsize_t nr)
{
}
else
inode_add_bytes(inode, nr);
-@@ -174,10 +179,14 @@ static inline int vfs_dq_prealloc_space(
+@@ -177,10 +182,14 @@ static inline int vfs_dq_prealloc_space(
static inline int vfs_dq_alloc_space_nodirty(struct inode *inode, qsize_t nr)
{
}
else
inode_add_bytes(inode, nr);
-@@ -194,20 +203,28 @@ static inline int vfs_dq_alloc_space(str
+@@ -197,10 +206,14 @@ static inline int vfs_dq_alloc_space(str
static inline int vfs_dq_reserve_space(struct inode *inode, qsize_t nr)
{
return 1;
+ }
}
- return 0;
- }
+ else
+ inode_add_rsv_space(inode, nr);
+@@ -209,10 +222,14 @@ static inline int vfs_dq_reserve_space(s
static inline int vfs_dq_alloc_inode(struct inode *inode)
{
}
return 0;
}
-@@ -217,9 +234,13 @@ static inline int vfs_dq_alloc_inode(str
+@@ -222,9 +239,13 @@ static inline int vfs_dq_alloc_inode(str
*/
static inline int vfs_dq_claim_space(struct inode *inode, qsize_t nr)
{
return 1;
+ }
} else
- inode_add_bytes(inode, nr);
+ inode_claim_rsv_space(inode, nr);
-@@ -235,6 +256,7 @@ void vfs_dq_release_reservation_space(st
- {
- if (sb_any_quota_active(inode->i_sb))
+@@ -242,6 +263,7 @@ void vfs_dq_release_reservation_space(st
inode->i_sb->dq_op->release_rsv(inode, nr);
+ else
+ inode_sub_rsv_space(inode, nr);
+ dl_release_space(inode, nr);
}
static inline void vfs_dq_free_space_nodirty(struct inode *inode, qsize_t nr)
-@@ -243,6 +265,7 @@ static inline void vfs_dq_free_space_nod
+@@ -250,6 +272,7 @@ static inline void vfs_dq_free_space_nod
inode->i_sb->dq_op->free_space(inode, nr);
else
inode_sub_bytes(inode, nr);
}
static inline void vfs_dq_free_space(struct inode *inode, qsize_t nr)
-@@ -255,6 +278,7 @@ static inline void vfs_dq_free_inode(str
+@@ -262,6 +285,7 @@ static inline void vfs_dq_free_inode(str
{
if (sb_any_quota_active(inode->i_sb))
inode->i_sb->dq_op->free_inode(inode, 1);
}
/* Cannot be called inside a transaction */
-@@ -358,6 +382,8 @@ static inline int vfs_dq_transfer(struct
+@@ -365,6 +389,8 @@ static inline int vfs_dq_transfer(struct
static inline int vfs_dq_prealloc_space_nodirty(struct inode *inode, qsize_t nr)
{
inode_add_bytes(inode, nr);
return 0;
}
-@@ -371,6 +397,8 @@ static inline int vfs_dq_prealloc_space(
+@@ -378,6 +404,8 @@ static inline int vfs_dq_prealloc_space(
static inline int vfs_dq_alloc_space_nodirty(struct inode *inode, qsize_t nr)
{
inode_add_bytes(inode, nr);
return 0;
}
-@@ -384,22 +412,28 @@ static inline int vfs_dq_alloc_space(str
+@@ -391,22 +419,28 @@ static inline int vfs_dq_alloc_space(str
static inline int vfs_dq_reserve_space(struct inode *inode, qsize_t nr)
{
inode_sub_bytes(inode, nr);
}
-diff -NurpP --minimal linux-2.6.32.6/include/linux/reboot.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/reboot.h
---- linux-2.6.32.6/include/linux/reboot.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/reboot.h 2009-12-03 22:06:59.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/reboot.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/reboot.h
+--- linux-2.6.32.59/include/linux/reboot.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/reboot.h 2011-06-10 13:03:02.000000000 +0200
@@ -33,6 +33,7 @@
#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
#ifdef __KERNEL__
-diff -NurpP --minimal linux-2.6.32.6/include/linux/reiserfs_fs.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/reiserfs_fs.h
---- linux-2.6.32.6/include/linux/reiserfs_fs.h 2009-09-10 15:26:26.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/reiserfs_fs.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/reiserfs_fs.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/reiserfs_fs.h
+--- linux-2.6.32.59/include/linux/reiserfs_fs.h 2009-09-10 15:26:26.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/reiserfs_fs.h 2011-06-10 13:03:02.000000000 +0200
@@ -899,6 +899,11 @@ struct stat_data_v1 {
#define REISERFS_COMPR_FL FS_COMPR_FL
#define REISERFS_NOTAIL_FL FS_NOTAIL_FL
/* namei.c */
void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
-diff -NurpP --minimal linux-2.6.32.6/include/linux/reiserfs_fs_sb.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/reiserfs_fs_sb.h
---- linux-2.6.32.6/include/linux/reiserfs_fs_sb.h 2009-09-10 15:26:26.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/reiserfs_fs_sb.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/reiserfs_fs_sb.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.32.59/include/linux/reiserfs_fs_sb.h 2009-09-10 15:26:26.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/reiserfs_fs_sb.h 2011-06-10 13:03:02.000000000 +0200
@@ -456,6 +456,7 @@ enum reiserfs_mount_options {
REISERFS_EXPOSE_PRIVROOT,
REISERFS_BARRIER_NONE,
/* Actions on error */
REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-2.6.32.6/include/linux/sched.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/sched.h
---- linux-2.6.32.6/include/linux/sched.h 2010-01-26 19:31:27.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/sched.h 2009-12-14 22:20:55.000000000 +0100
-@@ -390,25 +390,28 @@ extern void arch_unmap_area_topdown(stru
+diff -NurpP --minimal linux-2.6.32.59/include/linux/sched.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sched.h
+--- linux-2.6.32.59/include/linux/sched.h 2012-03-20 11:26:29.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sched.h 2011-06-10 13:03:02.000000000 +0200
+@@ -389,25 +389,28 @@ extern void arch_unmap_area_topdown(stru
* The mm counters are not protected by its page_table_lock,
* so must be incremented atomically.
*/
#define get_mm_rss(mm) \
(get_mm_counter(mm, file_rss) + get_mm_counter(mm, anon_rss))
#define update_hiwater_rss(mm) do { \
-@@ -1183,6 +1186,12 @@ struct sched_entity {
+@@ -1185,6 +1188,12 @@ struct sched_entity {
u64 nr_wakeups_affine_attempts;
u64 nr_wakeups_passive;
u64 nr_wakeups_idle;
#endif
#ifdef CONFIG_FAIR_GROUP_SCHED
-@@ -1393,6 +1402,14 @@ struct task_struct {
+@@ -1395,6 +1404,14 @@ struct task_struct {
#endif
seccomp_t seccomp;
/* Thread group tracking */
u32 parent_exec_id;
u32 self_exec_id;
-@@ -1618,6 +1635,11 @@ struct pid_namespace;
+@@ -1619,6 +1636,11 @@ struct pid_namespace;
pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
struct pid_namespace *ns);
static inline pid_t task_pid_nr(struct task_struct *tsk)
{
return tsk->pid;
-@@ -1631,7 +1653,8 @@ static inline pid_t task_pid_nr_ns(struc
+@@ -1632,7 +1654,8 @@ static inline pid_t task_pid_nr_ns(struc
static inline pid_t task_pid_vnr(struct task_struct *tsk)
{
}
-@@ -1644,7 +1667,7 @@ pid_t task_tgid_nr_ns(struct task_struct
+@@ -1645,7 +1668,7 @@ pid_t task_tgid_nr_ns(struct task_struct
static inline pid_t task_tgid_vnr(struct task_struct *tsk)
{
}
-diff -NurpP --minimal linux-2.6.32.6/include/linux/shmem_fs.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/shmem_fs.h
---- linux-2.6.32.6/include/linux/shmem_fs.h 2009-12-03 20:02:56.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/shmem_fs.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/shmem_fs.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/shmem_fs.h
+--- linux-2.6.32.59/include/linux/shmem_fs.h 2009-12-03 20:02:56.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/shmem_fs.h 2011-06-10 13:03:02.000000000 +0200
@@ -8,6 +8,9 @@
#define SHMEM_NR_DIRECT 16
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-2.6.32.6/include/linux/stat.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/stat.h
---- linux-2.6.32.6/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/stat.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/stat.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/stat.h
+--- linux-2.6.32.59/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/stat.h 2011-06-10 13:03:02.000000000 +0200
@@ -66,6 +66,7 @@ struct kstat {
unsigned int nlink;
uid_t uid;
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-2.6.32.6/include/linux/sunrpc/auth.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/sunrpc/auth.h
---- linux-2.6.32.6/include/linux/sunrpc/auth.h 2009-12-03 20:02:56.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/sunrpc/auth.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/sunrpc/auth.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sunrpc/auth.h
+--- linux-2.6.32.59/include/linux/sunrpc/auth.h 2009-12-03 20:02:56.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sunrpc/auth.h 2011-06-10 13:03:02.000000000 +0200
@@ -25,6 +25,7 @@
struct auth_cred {
uid_t uid;
struct group_info *group_info;
unsigned char machine_cred : 1;
};
-diff -NurpP --minimal linux-2.6.32.6/include/linux/sunrpc/clnt.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/sunrpc/clnt.h
---- linux-2.6.32.6/include/linux/sunrpc/clnt.h 2009-12-03 20:02:56.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/sunrpc/clnt.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/sunrpc/clnt.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sunrpc/clnt.h
+--- linux-2.6.32.59/include/linux/sunrpc/clnt.h 2009-12-03 20:02:56.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sunrpc/clnt.h 2011-06-10 13:03:02.000000000 +0200
@@ -49,7 +49,8 @@ struct rpc_clnt {
unsigned int cl_softrtry : 1,/* soft timeouts */
cl_discrtry : 1,/* disconnect before retry */
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/syscalls.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/syscalls.h
---- linux-2.6.32.6/include/linux/syscalls.h 2010-01-26 19:31:27.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/syscalls.h 2010-01-20 04:21:33.000000000 +0100
-@@ -546,6 +546,8 @@ asmlinkage long sys_symlink(const char _
+diff -NurpP --minimal linux-2.6.32.59/include/linux/syscalls.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/syscalls.h
+--- linux-2.6.32.59/include/linux/syscalls.h 2012-03-20 11:26:29.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/syscalls.h 2011-06-10 13:03:02.000000000 +0200
+@@ -548,6 +548,8 @@ asmlinkage long sys_symlink(const char _
asmlinkage long sys_unlink(const char __user *pathname);
asmlinkage long sys_rename(const char __user *oldname,
const char __user *newname);
asmlinkage long sys_chmod(const char __user *filename, mode_t mode);
asmlinkage long sys_fchmod(unsigned int fd, mode_t mode);
-diff -NurpP --minimal linux-2.6.32.6/include/linux/sysctl.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/sysctl.h
---- linux-2.6.32.6/include/linux/sysctl.h 2009-12-03 20:02:56.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/sysctl.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/sysctl.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sysctl.h
+--- linux-2.6.32.59/include/linux/sysctl.h 2012-03-20 11:26:29.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sysctl.h 2011-06-10 13:03:02.000000000 +0200
@@ -69,6 +69,7 @@ enum
CTL_ABI=9, /* Binary emulation */
CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/sysfs.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/sysfs.h
---- linux-2.6.32.6/include/linux/sysfs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/sysfs.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/sysfs.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sysfs.h
+--- linux-2.6.32.59/include/linux/sysfs.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sysfs.h 2011-06-10 13:03:02.000000000 +0200
@@ -17,6 +17,8 @@
#include <linux/list.h>
#include <asm/atomic.h>
struct kobject;
struct module;
-diff -NurpP --minimal linux-2.6.32.6/include/linux/time.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/time.h
---- linux-2.6.32.6/include/linux/time.h 2009-12-03 20:02:56.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/time.h 2009-12-03 20:04:56.000000000 +0100
-@@ -237,6 +237,9 @@ static __always_inline void timespec_add
+diff -NurpP --minimal linux-2.6.32.59/include/linux/time.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/time.h
+--- linux-2.6.32.59/include/linux/time.h 2012-03-20 11:26:29.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/time.h 2011-06-10 13:03:02.000000000 +0200
+@@ -238,6 +238,9 @@ static __always_inline void timespec_add
a->tv_sec += __iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns);
a->tv_nsec = ns;
}
#endif /* __KERNEL__ */
#define NFDBITS __NFDBITS
-diff -NurpP --minimal linux-2.6.32.6/include/linux/types.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/types.h
---- linux-2.6.32.6/include/linux/types.h 2009-09-10 15:26:26.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/types.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/types.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/types.h
+--- linux-2.6.32.59/include/linux/types.h 2009-09-10 15:26:26.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/types.h 2011-06-10 13:03:02.000000000 +0200
@@ -37,6 +37,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vroot.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vroot.h
---- linux-2.6.32.6/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vroot.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vroot.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vroot.h
+--- linux-2.6.32.59/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vroot.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,51 @@
+
+/*
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vs_base.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_base.h
---- linux-2.6.32.6/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_base.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_base.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_base.h
+--- linux-2.6.32.59/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_base.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vs_context.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_context.h
---- linux-2.6.32.6/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_context.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_context.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_context.h
+--- linux-2.6.32.59/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_context.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vs_cowbl.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_cowbl.h
---- linux-2.6.32.6/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_cowbl.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_cowbl.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_cowbl.h
+--- linux-2.6.32.59/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_cowbl.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,47 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vs_cvirt.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_cvirt.h
---- linux-2.6.32.6/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_cvirt.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_cvirt.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_cvirt.h
+--- linux-2.6.32.59/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_cvirt.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vs_device.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_device.h
---- linux-2.6.32.6/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_device.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_device.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_device.h
+--- linux-2.6.32.59/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_device.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vs_dlimit.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_dlimit.h
---- linux-2.6.32.6/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_dlimit.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,216 @@
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_dlimit.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_dlimit.h
+--- linux-2.6.32.59/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_dlimit.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
+
+ goto out;
+
+ spin_lock(&dli->dl_lock);
-+ ret = (dli->dl_inodes_used >= dli->dl_inodes_total);
-+ if (!ret)
-+ dli->dl_inodes_used++;
++ dli->dl_inodes_used++;
++ ret = (dli->dl_inodes_used > dli->dl_inodes_total);
+ spin_unlock(&dli->dl_lock);
+ put_dl_info(dli);
+out:
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/base.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/base.h
---- linux-2.6.32.6/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/base.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,170 @@
-+#ifndef _VX_BASE_H
-+#define _VX_BASE_H
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_inet.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_inet.h
+--- linux-2.6.32.59/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_inet.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,342 @@
++#ifndef _VS_INET_H
++#define _VS_INET_H
+
++#include "vserver/base.h"
++#include "vserver/network.h"
++#include "vserver/debug.h"
+
-+/* context state changes */
++#define IPI_LOOPBACK htonl(INADDR_LOOPBACK)
+
-+enum {
-+ VSC_STARTUP = 1,
-+ VSC_SHUTDOWN,
++#define NXAV4(a) NIPQUAD((a)->ip[0]), NIPQUAD((a)->ip[1]), \
++ NIPQUAD((a)->mask), (a)->type
++#define NXAV4_FMT "[" NIPQUAD_FMT "-" NIPQUAD_FMT "/" NIPQUAD_FMT ":%04x]"
+
-+ VSC_NETUP,
-+ VSC_NETDOWN,
-+};
+
++static inline
++int v4_addr_match(struct nx_addr_v4 *nxa, __be32 addr, uint16_t tmask)
++{
++ __be32 ip = nxa->ip[0].s_addr;
++ __be32 mask = nxa->mask.s_addr;
++ __be32 bcast = ip | ~mask;
++ int ret = 0;
+
++ switch (nxa->type & tmask) {
++ case NXA_TYPE_MASK:
++ ret = (ip == (addr & mask));
++ break;
++ case NXA_TYPE_ADDR:
++ ret = 3;
++ if (addr == ip)
++ break;
++ /* fall through to broadcast */
++ case NXA_MOD_BCAST:
++ ret = ((tmask & NXA_MOD_BCAST) && (addr == bcast));
++ break;
++ case NXA_TYPE_RANGE:
++ ret = ((nxa->ip[0].s_addr <= addr) &&
++ (nxa->ip[1].s_addr > addr));
++ break;
++ case NXA_TYPE_ANY:
++ ret = 2;
++ break;
++ }
+
-+#define vx_task_xid(t) ((t)->xid)
++ vxdprintk(VXD_CBIT(net, 0),
++ "v4_addr_match(%p" NXAV4_FMT "," NIPQUAD_FMT ",%04x) = %d",
++ nxa, NXAV4(nxa), NIPQUAD(addr), tmask, ret);
++ return ret;
++}
+
-+#define vx_current_xid() vx_task_xid(current)
++static inline
++int v4_addr_in_nx_info(struct nx_info *nxi, __be32 addr, uint16_t tmask)
++{
++ struct nx_addr_v4 *nxa;
++ int ret = 1;
+
-+#define current_vx_info() (current->vx_info)
++ if (!nxi)
++ goto out;
+
++ ret = 2;
++ /* allow 127.0.0.1 when remapping lback */
++ if ((tmask & NXA_LOOPBACK) &&
++ (addr == IPI_LOOPBACK) &&
++ nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
++ goto out;
++ ret = 3;
++ /* check for lback address */
++ if ((tmask & NXA_MOD_LBACK) &&
++ (nxi->v4_lback.s_addr == addr))
++ goto out;
++ ret = 4;
++ /* check for broadcast address */
++ if ((tmask & NXA_MOD_BCAST) &&
++ (nxi->v4_bcast.s_addr == addr))
++ goto out;
++ ret = 5;
++ /* check for v4 addresses */
++ for (nxa = &nxi->v4; nxa; nxa = nxa->next)
++ if (v4_addr_match(nxa, addr, tmask))
++ goto out;
++ ret = 0;
++out:
++ vxdprintk(VXD_CBIT(net, 0),
++ "v4_addr_in_nx_info(%p[#%u]," NIPQUAD_FMT ",%04x) = %d",
++ nxi, nxi ? nxi->nx_id : 0, NIPQUAD(addr), tmask, ret);
++ return ret;
++}
+
-+#define nx_task_nid(t) ((t)->nid)
-+
-+#define nx_current_nid() nx_task_nid(current)
++static inline
++int v4_nx_addr_match(struct nx_addr_v4 *nxa, struct nx_addr_v4 *addr, uint16_t mask)
++{
++ /* FIXME: needs full range checks */
++ return v4_addr_match(nxa, addr->ip[0].s_addr, mask);
++}
+
-+#define current_nx_info() (current->nx_info)
++static inline
++int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask)
++{
++ struct nx_addr_v4 *ptr;
+
++ for (ptr = &nxi->v4; ptr; ptr = ptr->next)
++ if (v4_nx_addr_match(ptr, nxa, mask))
++ return 1;
++ return 0;
++}
+
-+/* generic flag merging */
++#include <net/inet_sock.h>
+
-+#define vs_check_flags(v, m, f) (((v) & (m)) ^ (f))
++/*
++ * Check if a given address matches for a socket
++ *
++ * nxi: the socket's nx_info if any
++ * addr: to be verified address
++ */
++static inline
++int v4_sock_addr_match (
++ struct nx_info *nxi,
++ struct inet_sock *inet,
++ __be32 addr)
++{
++ __be32 saddr = inet->rcv_saddr;
++ __be32 bcast = nxi ? nxi->v4_bcast.s_addr : INADDR_BROADCAST;
+
-+#define vs_mask_flags(v, f, m) (((v) & ~(m)) | ((f) & (m)))
++ if (addr && (saddr == addr || bcast == addr))
++ return 1;
++ if (!saddr)
++ return v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND);
++ return 0;
++}
+
-+#define vs_mask_mask(v, f, m) (((v) & ~(m)) | ((v) & (f) & (m)))
+
-+#define vs_check_bit(v, n) ((v) & (1LL << (n)))
++/* inet related checks and helpers */
+
+
-+/* context flags */
++struct in_ifaddr;
++struct net_device;
++struct sock;
+
-+#define __vx_flags(v) ((v) ? (v)->vx_flags : 0)
++#ifdef CONFIG_INET
+
-+#define vx_current_flags() __vx_flags(current_vx_info())
++#include <linux/netdevice.h>
++#include <linux/inetdevice.h>
++#include <net/inet_sock.h>
++#include <net/inet_timewait_sock.h>
+
-+#define vx_info_flags(v, m, f) \
-+ vs_check_flags(__vx_flags(v), m, f)
+
-+#define task_vx_flags(t, m, f) \
-+ ((t) && vx_info_flags((t)->vx_info, m, f))
++int dev_in_nx_info(struct net_device *, struct nx_info *);
++int v4_dev_in_nx_info(struct net_device *, struct nx_info *);
++int nx_v4_addr_conflict(struct nx_info *, struct nx_info *);
+
-+#define vx_flags(m, f) vx_info_flags(current_vx_info(), m, f)
+
++/*
++ * check if address is covered by socket
++ *
++ * sk: the socket to check against
++ * addr: the address in question (must be != 0)
++ */
+
-+/* context caps */
++static inline
++int __v4_addr_match_socket(const struct sock *sk, struct nx_addr_v4 *nxa)
++{
++ struct nx_info *nxi = sk->sk_nx_info;
++ __be32 saddr = inet_rcv_saddr(sk);
+
-+#define __vx_ccaps(v) ((v) ? (v)->vx_ccaps : 0)
++ vxdprintk(VXD_CBIT(net, 5),
++ "__v4_addr_in_socket(%p," NXAV4_FMT ") %p:" NIPQUAD_FMT " %p;%lx",
++ sk, NXAV4(nxa), nxi, NIPQUAD(saddr), sk->sk_socket,
++ (sk->sk_socket?sk->sk_socket->flags:0));
+
-+#define vx_current_ccaps() __vx_ccaps(current_vx_info())
++ if (saddr) { /* direct address match */
++ return v4_addr_match(nxa, saddr, -1);
++ } else if (nxi) { /* match against nx_info */
++ return v4_nx_addr_in_nx_info(nxi, nxa, -1);
++ } else { /* unrestricted any socket */
++ return 1;
++ }
++}
+
-+#define vx_info_ccaps(v, c) (__vx_ccaps(v) & (c))
+
-+#define vx_ccaps(c) vx_info_ccaps(current_vx_info(), (c))
+
++static inline
++int nx_dev_visible(struct nx_info *nxi, struct net_device *dev)
++{
++ vxdprintk(VXD_CBIT(net, 1), "nx_dev_visible(%p[#%u],%p »%s«) %d",
++ nxi, nxi ? nxi->nx_id : 0, dev, dev->name,
++ nxi ? dev_in_nx_info(dev, nxi) : 0);
+
++ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++ return 1;
++ if (dev_in_nx_info(dev, nxi))
++ return 1;
++ return 0;
++}
+
-+/* network flags */
+
-+#define __nx_flags(n) ((n) ? (n)->nx_flags : 0)
++static inline
++int v4_ifa_in_nx_info(struct in_ifaddr *ifa, struct nx_info *nxi)
++{
++ if (!nxi)
++ return 1;
++ if (!ifa)
++ return 0;
++ return v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW);
++}
+
-+#define nx_current_flags() __nx_flags(current_nx_info())
++static inline
++int nx_v4_ifa_visible(struct nx_info *nxi, struct in_ifaddr *ifa)
++{
++ vxdprintk(VXD_CBIT(net, 1), "nx_v4_ifa_visible(%p[#%u],%p) %d",
++ nxi, nxi ? nxi->nx_id : 0, ifa,
++ nxi ? v4_ifa_in_nx_info(ifa, nxi) : 0);
+
-+#define nx_info_flags(n, m, f) \
-+ vs_check_flags(__nx_flags(n), m, f)
++ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++ return 1;
++ if (v4_ifa_in_nx_info(ifa, nxi))
++ return 1;
++ return 0;
++}
+
-+#define task_nx_flags(t, m, f) \
-+ ((t) && nx_info_flags((t)->nx_info, m, f))
+
-+#define nx_flags(m, f) nx_info_flags(current_nx_info(), m, f)
++struct nx_v4_sock_addr {
++ __be32 saddr; /* Address used for validation */
++ __be32 baddr; /* Address used for socket bind */
++};
+
++static inline
++int v4_map_sock_addr(struct inet_sock *inet, struct sockaddr_in *addr,
++ struct nx_v4_sock_addr *nsa)
++{
++ struct sock *sk = &inet->sk;
++ struct nx_info *nxi = sk->sk_nx_info;
++ __be32 saddr = addr->sin_addr.s_addr;
++ __be32 baddr = saddr;
+
-+/* network caps */
++ vxdprintk(VXD_CBIT(net, 3),
++ "inet_bind(%p)* %p,%p;%lx " NIPQUAD_FMT,
++ sk, sk->sk_nx_info, sk->sk_socket,
++ (sk->sk_socket ? sk->sk_socket->flags : 0),
++ NIPQUAD(saddr));
+
-+#define __nx_ncaps(n) ((n) ? (n)->nx_ncaps : 0)
++ if (nxi) {
++ if (saddr == INADDR_ANY) {
++ if (nx_info_flags(nxi, NXF_SINGLE_IP, 0))
++ baddr = nxi->v4.ip[0].s_addr;
++ } else if (saddr == IPI_LOOPBACK) {
++ if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
++ baddr = nxi->v4_lback.s_addr;
++ } else { /* normal address bind */
++ if (!v4_addr_in_nx_info(nxi, saddr, NXA_MASK_BIND))
++ return -EADDRNOTAVAIL;
++ }
++ }
+
-+#define nx_current_ncaps() __nx_ncaps(current_nx_info())
++ vxdprintk(VXD_CBIT(net, 3),
++ "inet_bind(%p) " NIPQUAD_FMT ", " NIPQUAD_FMT,
++ sk, NIPQUAD(saddr), NIPQUAD(baddr));
+
-+#define nx_info_ncaps(n, c) (__nx_ncaps(n) & (c))
++ nsa->saddr = saddr;
++ nsa->baddr = baddr;
++ return 0;
++}
+
-+#define nx_ncaps(c) nx_info_ncaps(current_nx_info(), c)
++static inline
++void v4_set_sock_addr(struct inet_sock *inet, struct nx_v4_sock_addr *nsa)
++{
++ inet->saddr = nsa->baddr;
++ inet->rcv_saddr = nsa->baddr;
++}
+
+
-+/* context mask capabilities */
++/*
++ * helper to simplify inet_lookup_listener
++ *
++ * nxi: the socket's nx_info if any
++ * addr: to be verified address
++ * saddr: socket address
++ */
++static inline int v4_inet_addr_match (
++ struct nx_info *nxi,
++ __be32 addr,
++ __be32 saddr)
++{
++ if (addr && (saddr == addr))
++ return 1;
++ if (!saddr)
++ return nxi ? v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND) : 1;
++ return 0;
++}
+
-+#define __vx_mcaps(v) ((v) ? (v)->vx_ccaps >> 32UL : ~0 )
++static inline __be32 nx_map_sock_lback(struct nx_info *nxi, __be32 addr)
++{
++ if (nx_info_flags(nxi, NXF_HIDE_LBACK, 0) &&
++ (addr == nxi->v4_lback.s_addr))
++ return IPI_LOOPBACK;
++ return addr;
++}
+
-+#define vx_info_mcaps(v, c) (__vx_mcaps(v) & (c))
++static inline
++int nx_info_has_v4(struct nx_info *nxi)
++{
++ if (!nxi)
++ return 1;
++ if (NX_IPV4(nxi))
++ return 1;
++ if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
++ return 1;
++ return 0;
++}
+
-+#define vx_mcaps(c) vx_info_mcaps(current_vx_info(), c)
++#else /* CONFIG_INET */
+
++static inline
++int nx_dev_visible(struct nx_info *n, struct net_device *d)
++{
++ return 1;
++}
+
-+/* context bcap mask */
++static inline
++int nx_v4_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
++{
++ return 1;
++}
+
-+#define __vx_bcaps(v) ((v)->vx_bcaps)
++static inline
++int v4_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
++{
++ return 1;
++}
+
-+#define vx_current_bcaps() __vx_bcaps(current_vx_info())
++static inline
++int nx_info_has_v4(struct nx_info *nxi)
++{
++ return 0;
++}
+
++#endif /* CONFIG_INET */
+
-+/* mask given bcaps */
++#define current_nx_info_has_v4() \
++ nx_info_has_v4(current_nx_info())
+
-+#define vx_info_mbcaps(v, c) ((v) ? cap_intersect(__vx_bcaps(v), c) : c)
++#else
++// #warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_inet6.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_inet6.h
+--- linux-2.6.32.59/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_inet6.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,246 @@
++#ifndef _VS_INET6_H
++#define _VS_INET6_H
+
-+#define vx_mbcaps(c) vx_info_mbcaps(current_vx_info(), c)
-+
-+
-+/* masked cap_bset */
-+
-+#define vx_info_cap_bset(v) vx_info_mbcaps(v, current->cap_bset)
++#include "vserver/base.h"
++#include "vserver/network.h"
++#include "vserver/debug.h"
+
-+#define vx_current_cap_bset() vx_info_cap_bset(current_vx_info())
++#include <net/ipv6.h>
+
-+#if 0
-+#define vx_info_mbcap(v, b) \
-+ (!vx_info_flags(v, VXF_STATE_SETUP, 0) ? \
-+ vx_info_bcaps(v, b) : (b))
++#define NXAV6(a) &(a)->ip, &(a)->mask, (a)->prefix, (a)->type
++#define NXAV6_FMT "[%pI6/%pI6/%d:%04x]"
+
-+#define task_vx_mbcap(t, b) \
-+ vx_info_mbcap((t)->vx_info, (t)->b)
+
-+#define vx_mbcap(b) task_vx_mbcap(current, b)
-+#endif
++#ifdef CONFIG_IPV6
+
-+#define vx_cap_raised(v, c, f) cap_raised(vx_info_mbcaps(v, c), f)
++static inline
++int v6_addr_match(struct nx_addr_v6 *nxa,
++ const struct in6_addr *addr, uint16_t mask)
++{
++ int ret = 0;
+
-+#define vx_capable(b, c) (capable(b) || \
-+ (cap_raised(current_cap(), b) && vx_ccaps(c)))
++ switch (nxa->type & mask) {
++ case NXA_TYPE_MASK:
++ ret = ipv6_masked_addr_cmp(&nxa->ip, &nxa->mask, addr);
++ break;
++ case NXA_TYPE_ADDR:
++ ret = ipv6_addr_equal(&nxa->ip, addr);
++ break;
++ case NXA_TYPE_ANY:
++ ret = 1;
++ break;
++ }
++ vxdprintk(VXD_CBIT(net, 0),
++ "v6_addr_match(%p" NXAV6_FMT ",%pI6,%04x) = %d",
++ nxa, NXAV6(nxa), addr, mask, ret);
++ return ret;
++}
+
-+#define nx_capable(b, c) (capable(b) || \
-+ (cap_raised(current_cap(), b) && nx_ncaps(c)))
++static inline
++int v6_addr_in_nx_info(struct nx_info *nxi,
++ const struct in6_addr *addr, uint16_t mask)
++{
++ struct nx_addr_v6 *nxa;
++ int ret = 1;
+
-+#define vx_task_initpid(t, n) \
-+ ((t)->vx_info && \
-+ ((t)->vx_info->vx_initpid == (n)))
++ if (!nxi)
++ goto out;
++ for (nxa = &nxi->v6; nxa; nxa = nxa->next)
++ if (v6_addr_match(nxa, addr, mask))
++ goto out;
++ ret = 0;
++out:
++ vxdprintk(VXD_CBIT(net, 0),
++ "v6_addr_in_nx_info(%p[#%u],%pI6,%04x) = %d",
++ nxi, nxi ? nxi->nx_id : 0, addr, mask, ret);
++ return ret;
++}
+
-+#define vx_current_initpid(n) vx_task_initpid(current, n)
++static inline
++int v6_nx_addr_match(struct nx_addr_v6 *nxa, struct nx_addr_v6 *addr, uint16_t mask)
++{
++ /* FIXME: needs full range checks */
++ return v6_addr_match(nxa, &addr->ip, mask);
++}
+
++static inline
++int v6_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v6 *nxa, uint16_t mask)
++{
++ struct nx_addr_v6 *ptr;
+
-+/* context unshare mask */
++ for (ptr = &nxi->v6; ptr; ptr = ptr->next)
++ if (v6_nx_addr_match(ptr, nxa, mask))
++ return 1;
++ return 0;
++}
+
-+#define __vx_umask(v) ((v)->vx_umask)
+
-+#define vx_current_umask() __vx_umask(current_vx_info())
++/*
++ * Check if a given address matches for a socket
++ *
++ * nxi: the socket's nx_info if any
++ * addr: to be verified address
++ */
++static inline
++int v6_sock_addr_match (
++ struct nx_info *nxi,
++ struct inet_sock *inet,
++ struct in6_addr *addr)
++{
++ struct sock *sk = &inet->sk;
++ struct in6_addr *saddr = inet6_rcv_saddr(sk);
+
-+#define vx_can_unshare(b, f) (capable(b) || \
-+ (cap_raised(current_cap(), b) && \
-+ !((f) & ~vx_current_umask())))
++ if (!ipv6_addr_any(addr) &&
++ ipv6_addr_equal(saddr, addr))
++ return 1;
++ if (ipv6_addr_any(saddr))
++ return v6_addr_in_nx_info(nxi, addr, -1);
++ return 0;
++}
+
++/*
++ * check if address is covered by socket
++ *
++ * sk: the socket to check against
++ * addr: the address in question (must be != 0)
++ */
+
-+#define __vx_state(v) ((v) ? ((v)->vx_state) : 0)
++static inline
++int __v6_addr_match_socket(const struct sock *sk, struct nx_addr_v6 *nxa)
++{
++ struct nx_info *nxi = sk->sk_nx_info;
++ struct in6_addr *saddr = inet6_rcv_saddr(sk);
+
-+#define vx_info_state(v, m) (__vx_state(v) & (m))
++ vxdprintk(VXD_CBIT(net, 5),
++ "__v6_addr_in_socket(%p," NXAV6_FMT ") %p:%pI6 %p;%lx",
++ sk, NXAV6(nxa), nxi, saddr, sk->sk_socket,
++ (sk->sk_socket?sk->sk_socket->flags:0));
+
++ if (!ipv6_addr_any(saddr)) { /* direct address match */
++ return v6_addr_match(nxa, saddr, -1);
++ } else if (nxi) { /* match against nx_info */
++ return v6_nx_addr_in_nx_info(nxi, nxa, -1);
++ } else { /* unrestricted any socket */
++ return 1;
++ }
++}
+
-+#define __nx_state(n) ((n) ? ((n)->nx_state) : 0)
+
-+#define nx_info_state(n, m) (__nx_state(n) & (m))
++/* inet related checks and helpers */
+
-+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/cacct_cmd.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/cacct_cmd.h
---- linux-2.6.32.6/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/cacct_cmd.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,23 @@
-+#ifndef _VX_CACCT_CMD_H
-+#define _VX_CACCT_CMD_H
+
++struct in_ifaddr;
++struct net_device;
++struct sock;
+
-+/* virtual host info name commands */
+
-+#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0)
++#include <linux/netdevice.h>
++#include <linux/inetdevice.h>
++#include <net/inet_timewait_sock.h>
+
-+struct vcmd_sock_stat_v0 {
-+ uint32_t field;
-+ uint32_t count[3];
-+ uint64_t total[3];
-+};
+
++int dev_in_nx_info(struct net_device *, struct nx_info *);
++int v6_dev_in_nx_info(struct net_device *, struct nx_info *);
++int nx_v6_addr_conflict(struct nx_info *, struct nx_info *);
+
-+#ifdef __KERNEL__
+
-+#include <linux/compiler.h>
+
-+extern int vc_sock_stat(struct vx_info *, void __user *);
++static inline
++int v6_ifa_in_nx_info(struct inet6_ifaddr *ifa, struct nx_info *nxi)
++{
++ if (!nxi)
++ return 1;
++ if (!ifa)
++ return 0;
++ return v6_addr_in_nx_info(nxi, &ifa->addr, -1);
++}
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/cacct_def.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/cacct_def.h
---- linux-2.6.32.6/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/cacct_def.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,43 @@
-+#ifndef _VX_CACCT_DEF_H
-+#define _VX_CACCT_DEF_H
++static inline
++int nx_v6_ifa_visible(struct nx_info *nxi, struct inet6_ifaddr *ifa)
++{
++ vxdprintk(VXD_CBIT(net, 1), "nx_v6_ifa_visible(%p[#%u],%p) %d",
++ nxi, nxi ? nxi->nx_id : 0, ifa,
++ nxi ? v6_ifa_in_nx_info(ifa, nxi) : 0);
+
-+#include <asm/atomic.h>
-+#include <linux/vserver/cacct.h>
++ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++ return 1;
++ if (v6_ifa_in_nx_info(ifa, nxi))
++ return 1;
++ return 0;
++}
+
+
-+struct _vx_sock_acc {
-+ atomic_long_t count;
-+ atomic_long_t total;
++struct nx_v6_sock_addr {
++ struct in6_addr saddr; /* Address used for validation */
++ struct in6_addr baddr; /* Address used for socket bind */
+};
+
-+/* context sub struct */
-+
-+struct _vx_cacct {
-+ struct _vx_sock_acc sock[VXA_SOCK_SIZE][3];
-+ atomic_t slab[8];
-+ atomic_t page[6][8];
-+};
++static inline
++int v6_map_sock_addr(struct inet_sock *inet, struct sockaddr_in6 *addr,
++ struct nx_v6_sock_addr *nsa)
++{
++ // struct sock *sk = &inet->sk;
++ // struct nx_info *nxi = sk->sk_nx_info;
++ struct in6_addr saddr = addr->sin6_addr;
++ struct in6_addr baddr = saddr;
+
-+#ifdef CONFIG_VSERVER_DEBUG
++ nsa->saddr = saddr;
++ nsa->baddr = baddr;
++ return 0;
++}
+
-+static inline void __dump_vx_cacct(struct _vx_cacct *cacct)
++static inline
++void v6_set_sock_addr(struct inet_sock *inet, struct nx_v6_sock_addr *nsa)
+{
-+ int i, j;
++ // struct sock *sk = &inet->sk;
++ // struct in6_addr *saddr = inet6_rcv_saddr(sk);
+
-+ printk("\t_vx_cacct:");
-+ for (i = 0; i < 6; i++) {
-+ struct _vx_sock_acc *ptr = cacct->sock[i];
++ // *saddr = nsa->baddr;
++ // inet->saddr = nsa->baddr;
++}
+
-+ printk("\t [%d] =", i);
-+ for (j = 0; j < 3; j++) {
-+ printk(" [%d] = %8lu, %8lu", j,
-+ atomic_long_read(&ptr[j].count),
-+ atomic_long_read(&ptr[j].total));
-+ }
-+ printk("\n");
-+ }
++static inline
++int nx_info_has_v6(struct nx_info *nxi)
++{
++ if (!nxi)
++ return 1;
++ if (NX_IPV6(nxi))
++ return 1;
++ return 0;
+}
+
-+#endif
++#else /* CONFIG_IPV6 */
+
-+#endif /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/cacct.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/cacct.h
---- linux-2.6.32.6/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/cacct.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,15 @@
-+#ifndef _VX_CACCT_H
-+#define _VX_CACCT_H
++static inline
++int nx_v6_dev_visible(struct nx_info *n, struct net_device *d)
++{
++ return 1;
++}
+
+
-+enum sock_acc_field {
-+ VXA_SOCK_UNSPEC = 0,
-+ VXA_SOCK_UNIX,
-+ VXA_SOCK_INET,
-+ VXA_SOCK_INET6,
-+ VXA_SOCK_PACKET,
-+ VXA_SOCK_OTHER,
-+ VXA_SOCK_SIZE /* array size */
-+};
-+
-+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/cacct_int.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/cacct_int.h
---- linux-2.6.32.6/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/cacct_int.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,21 @@
-+#ifndef _VX_CACCT_INT_H
-+#define _VX_CACCT_INT_H
-+
-+
-+#ifdef __KERNEL__
-+
+static inline
-+unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
++int nx_v6_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
+{
-+ return atomic_long_read(&cacct->sock[type][pos].count);
++ return 1;
+}
+
-+
+static inline
-+unsigned long vx_sock_total(struct _vx_cacct *cacct, int type, int pos)
++int v6_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
+{
-+ return atomic_long_read(&cacct->sock[type][pos].total);
++ return 1;
+}
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/check.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/check.h
---- linux-2.6.32.6/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/check.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,89 @@
-+#ifndef _VS_CHECK_H
-+#define _VS_CHECK_H
++static inline
++int nx_info_has_v6(struct nx_info *nxi)
++{
++ return 0;
++}
+
++#endif /* CONFIG_IPV6 */
+
-+#define MAX_S_CONTEXT 65535 /* Arbitrary limit */
++#define current_nx_info_has_v6() \
++ nx_info_has_v6(current_nx_info())
+
-+#ifdef CONFIG_VSERVER_DYNAMIC_IDS
-+#define MIN_D_CONTEXT 49152 /* dynamic contexts start here */
+#else
-+#define MIN_D_CONTEXT 65536
++#warning duplicate inclusion
+#endif
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_limit.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_limit.h
+--- linux-2.6.32.59/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_limit.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,140 @@
++#ifndef _VS_LIMIT_H
++#define _VS_LIMIT_H
+
-+/* check conditions */
++#include "vserver/limit.h"
++#include "vserver/base.h"
++#include "vserver/context.h"
++#include "vserver/debug.h"
++#include "vserver/context.h"
++#include "vserver/limit_int.h"
+
-+#define VS_ADMIN 0x0001
-+#define VS_WATCH 0x0002
-+#define VS_HIDE 0x0004
-+#define VS_HOSTID 0x0008
+
-+#define VS_IDENT 0x0010
-+#define VS_EQUIV 0x0020
-+#define VS_PARENT 0x0040
-+#define VS_CHILD 0x0080
++#define vx_acc_cres(v, d, p, r) \
++ __vx_acc_cres(v, r, d, p, __FILE__, __LINE__)
+
-+#define VS_ARG_MASK 0x00F0
++#define vx_acc_cres_cond(x, d, p, r) \
++ __vx_acc_cres(((x) == vx_current_xid()) ? current_vx_info() : 0, \
++ r, d, p, __FILE__, __LINE__)
+
-+#define VS_DYNAMIC 0x0100
-+#define VS_STATIC 0x0200
+
-+#define VS_ATR_MASK 0x0F00
++#define vx_add_cres(v, a, p, r) \
++ __vx_add_cres(v, r, a, p, __FILE__, __LINE__)
++#define vx_sub_cres(v, a, p, r) vx_add_cres(v, -(a), p, r)
+
-+#ifdef CONFIG_VSERVER_PRIVACY
-+#define VS_ADMIN_P (0)
-+#define VS_WATCH_P (0)
-+#else
-+#define VS_ADMIN_P VS_ADMIN
-+#define VS_WATCH_P VS_WATCH
-+#endif
++#define vx_add_cres_cond(x, a, p, r) \
++ __vx_add_cres(((x) == vx_current_xid()) ? current_vx_info() : 0, \
++ r, a, p, __FILE__, __LINE__)
++#define vx_sub_cres_cond(x, a, p, r) vx_add_cres_cond(x, -(a), p, r)
+
-+#define VS_HARDIRQ 0x1000
-+#define VS_SOFTIRQ 0x2000
-+#define VS_IRQ 0x4000
+
-+#define VS_IRQ_MASK 0xF000
++/* process and file limits */
+
-+#include <linux/hardirq.h>
++#define vx_nproc_inc(p) \
++ vx_acc_cres((p)->vx_info, 1, p, RLIMIT_NPROC)
+
-+/*
-+ * check current context for ADMIN/WATCH and
-+ * optionally against supplied argument
-+ */
-+static inline int __vs_check(int cid, int id, unsigned int mode)
-+{
-+ if (mode & VS_ARG_MASK) {
-+ if ((mode & VS_IDENT) && (id == cid))
-+ return 1;
-+ }
-+ if (mode & VS_ATR_MASK) {
-+ if ((mode & VS_DYNAMIC) &&
-+ (id >= MIN_D_CONTEXT) &&
-+ (id <= MAX_S_CONTEXT))
-+ return 1;
-+ if ((mode & VS_STATIC) &&
-+ (id > 1) && (id < MIN_D_CONTEXT))
-+ return 1;
-+ }
-+ if (mode & VS_IRQ_MASK) {
-+ if ((mode & VS_IRQ) && unlikely(in_interrupt()))
-+ return 1;
-+ if ((mode & VS_HARDIRQ) && unlikely(in_irq()))
-+ return 1;
-+ if ((mode & VS_SOFTIRQ) && unlikely(in_softirq()))
-+ return 1;
-+ }
-+ return (((mode & VS_ADMIN) && (cid == 0)) ||
-+ ((mode & VS_WATCH) && (cid == 1)) ||
-+ ((mode & VS_HOSTID) && (id == 0)));
-+}
++#define vx_nproc_dec(p) \
++ vx_acc_cres((p)->vx_info,-1, p, RLIMIT_NPROC)
+
-+#define vx_check(c, m) __vs_check(vx_current_xid(), c, (m) | VS_IRQ)
++#define vx_files_inc(f) \
++ vx_acc_cres_cond((f)->f_xid, 1, f, RLIMIT_NOFILE)
+
-+#define vx_weak_check(c, m) ((m) ? vx_check(c, m) : 1)
++#define vx_files_dec(f) \
++ vx_acc_cres_cond((f)->f_xid,-1, f, RLIMIT_NOFILE)
+
++#define vx_locks_inc(l) \
++ vx_acc_cres_cond((l)->fl_xid, 1, l, RLIMIT_LOCKS)
+
-+#define nx_check(c, m) __vs_check(nx_current_nid(), c, m)
++#define vx_locks_dec(l) \
++ vx_acc_cres_cond((l)->fl_xid,-1, l, RLIMIT_LOCKS)
+
-+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
++#define vx_openfd_inc(f) \
++ vx_acc_cres(current_vx_info(), 1, (void *)(long)(f), VLIMIT_OPENFD)
+
-+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/context_cmd.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/context_cmd.h
---- linux-2.6.32.6/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/context_cmd.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,145 @@
-+#ifndef _VX_CONTEXT_CMD_H
-+#define _VX_CONTEXT_CMD_H
++#define vx_openfd_dec(f) \
++ vx_acc_cres(current_vx_info(),-1, (void *)(long)(f), VLIMIT_OPENFD)
+
+
-+/* vinfo commands */
++#define vx_cres_avail(v, n, r) \
++ __vx_cres_avail(v, r, n, __FILE__, __LINE__)
+
-+#define VCMD_task_xid VC_CMD(VINFO, 1, 0)
+
-+#ifdef __KERNEL__
-+extern int vc_task_xid(uint32_t);
++#define vx_nproc_avail(n) \
++ vx_cres_avail(current_vx_info(), n, RLIMIT_NPROC)
+
-+#endif /* __KERNEL__ */
++#define vx_files_avail(n) \
++ vx_cres_avail(current_vx_info(), n, RLIMIT_NOFILE)
+
-+#define VCMD_vx_info VC_CMD(VINFO, 5, 0)
++#define vx_locks_avail(n) \
++ vx_cres_avail(current_vx_info(), n, RLIMIT_LOCKS)
+
-+struct vcmd_vx_info_v0 {
-+ uint32_t xid;
-+ uint32_t initpid;
-+ /* more to come */
-+};
++#define vx_openfd_avail(n) \
++ vx_cres_avail(current_vx_info(), n, VLIMIT_OPENFD)
+
-+#ifdef __KERNEL__
-+extern int vc_vx_info(struct vx_info *, void __user *);
+
-+#endif /* __KERNEL__ */
++/* dentry limits */
+
-+#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0)
++#define vx_dentry_inc(d) do { \
++ if (atomic_read(&d->d_count) == 1) \
++ vx_acc_cres(current_vx_info(), 1, d, VLIMIT_DENTRY); \
++ } while (0)
+
-+struct vcmd_ctx_stat_v0 {
-+ uint32_t usecnt;
-+ uint32_t tasks;
-+ /* more to come */
-+};
++#define vx_dentry_dec(d) do { \
++ if (atomic_read(&d->d_count) == 0) \
++ vx_acc_cres(current_vx_info(),-1, d, VLIMIT_DENTRY); \
++ } while (0)
+
-+#ifdef __KERNEL__
-+extern int vc_ctx_stat(struct vx_info *, void __user *);
++#define vx_dentry_avail(n) \
++ vx_cres_avail(current_vx_info(), n, VLIMIT_DENTRY)
+
-+#endif /* __KERNEL__ */
+
-+/* context commands */
++/* socket limits */
+
-+#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0)
-+#define VCMD_ctx_create VC_CMD(VPROC, 1, 1)
++#define vx_sock_inc(s) \
++ vx_acc_cres((s)->sk_vx_info, 1, s, VLIMIT_NSOCK)
+
-+struct vcmd_ctx_create {
-+ uint64_t flagword;
-+};
++#define vx_sock_dec(s) \
++ vx_acc_cres((s)->sk_vx_info,-1, s, VLIMIT_NSOCK)
+
-+#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0)
-+#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1)
++#define vx_sock_avail(n) \
++ vx_cres_avail(current_vx_info(), n, VLIMIT_NSOCK)
+
-+struct vcmd_ctx_migrate {
-+ uint64_t flagword;
-+};
+
-+#ifdef __KERNEL__
-+extern int vc_ctx_create(uint32_t, void __user *);
-+extern int vc_ctx_migrate(struct vx_info *, void __user *);
++/* ipc resource limits */
+
-+#endif /* __KERNEL__ */
++#define vx_ipcmsg_add(v, u, a) \
++ vx_add_cres(v, a, u, RLIMIT_MSGQUEUE)
+
++#define vx_ipcmsg_sub(v, u, a) \
++ vx_sub_cres(v, a, u, RLIMIT_MSGQUEUE)
+
-+/* flag commands */
++#define vx_ipcmsg_avail(v, a) \
++ vx_cres_avail(v, a, RLIMIT_MSGQUEUE)
+
-+#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0)
-+#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0)
+
-+struct vcmd_ctx_flags_v0 {
-+ uint64_t flagword;
-+ uint64_t mask;
-+};
++#define vx_ipcshm_add(v, k, a) \
++ vx_add_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
+
-+#ifdef __KERNEL__
-+extern int vc_get_cflags(struct vx_info *, void __user *);
-+extern int vc_set_cflags(struct vx_info *, void __user *);
++#define vx_ipcshm_sub(v, k, a) \
++ vx_sub_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
+
-+#endif /* __KERNEL__ */
++#define vx_ipcshm_avail(v, a) \
++ vx_cres_avail(v, a, VLIMIT_SHMEM)
+
+
-+/* context caps commands */
++#define vx_semary_inc(a) \
++ vx_acc_cres(current_vx_info(), 1, a, VLIMIT_SEMARY)
+
-+#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1)
-+#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1)
++#define vx_semary_dec(a) \
++ vx_acc_cres(current_vx_info(), -1, a, VLIMIT_SEMARY)
+
-+struct vcmd_ctx_caps_v1 {
-+ uint64_t ccaps;
-+ uint64_t cmask;
-+};
+
-+#ifdef __KERNEL__
-+extern int vc_get_ccaps(struct vx_info *, void __user *);
-+extern int vc_set_ccaps(struct vx_info *, void __user *);
++#define vx_nsems_add(a,n) \
++ vx_add_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
+
-+#endif /* __KERNEL__ */
++#define vx_nsems_sub(a,n) \
++ vx_sub_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
+
+
-+/* bcaps commands */
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_memory.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_memory.h
+--- linux-2.6.32.59/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_memory.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,159 @@
++#ifndef _VS_MEMORY_H
++#define _VS_MEMORY_H
+
-+#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0)
-+#define VCMD_set_bcaps VC_CMD(FLAGS, 10, 0)
++#include "vserver/limit.h"
++#include "vserver/base.h"
++#include "vserver/context.h"
++#include "vserver/debug.h"
++#include "vserver/context.h"
++#include "vserver/limit_int.h"
+
-+struct vcmd_bcaps {
-+ uint64_t bcaps;
-+ uint64_t bmask;
-+};
+
-+#ifdef __KERNEL__
-+extern int vc_get_bcaps(struct vx_info *, void __user *);
-+extern int vc_set_bcaps(struct vx_info *, void __user *);
++#define __acc_add_long(a, v) (*(v) += (a))
++#define __acc_inc_long(v) (++*(v))
++#define __acc_dec_long(v) (--*(v))
+
-+#endif /* __KERNEL__ */
++#if NR_CPUS >= CONFIG_SPLIT_PTLOCK_CPUS
++#define __acc_add_atomic(a, v) atomic_long_add(a, v)
++#define __acc_inc_atomic(v) atomic_long_inc(v)
++#define __acc_dec_atomic(v) atomic_long_dec(v)
++#else /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
++#define __acc_add_atomic(a, v) __acc_add_long(a, v)
++#define __acc_inc_atomic(v) __acc_inc_long(v)
++#define __acc_dec_atomic(v) __acc_dec_long(v)
++#endif /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
+
+
-+/* umask commands */
++#define vx_acc_page(m, d, v, r) do { \
++ if ((d) > 0) \
++ __acc_inc_long(&(m)->v); \
++ else \
++ __acc_dec_long(&(m)->v); \
++ __vx_acc_cres(m->mm_vx_info, r, d, m, __FILE__, __LINE__); \
++} while (0)
+
-+#define VCMD_get_umask VC_CMD(FLAGS, 13, 0)
-+#define VCMD_set_umask VC_CMD(FLAGS, 14, 0)
++#define vx_acc_page_atomic(m, d, v, r) do { \
++ if ((d) > 0) \
++ __acc_inc_atomic(&(m)->v); \
++ else \
++ __acc_dec_atomic(&(m)->v); \
++ __vx_acc_cres(m->mm_vx_info, r, d, m, __FILE__, __LINE__); \
++} while (0)
+
-+struct vcmd_umask {
-+ uint64_t umask;
-+ uint64_t mask;
-+};
+
-+#ifdef __KERNEL__
-+extern int vc_get_umask(struct vx_info *, void __user *);
-+extern int vc_set_umask(struct vx_info *, void __user *);
++#define vx_acc_pages(m, p, v, r) do { \
++ unsigned long __p = (p); \
++ __acc_add_long(__p, &(m)->v); \
++ __vx_add_cres(m->mm_vx_info, r, __p, m, __FILE__, __LINE__); \
++} while (0)
+
-+#endif /* __KERNEL__ */
++#define vx_acc_pages_atomic(m, p, v, r) do { \
++ unsigned long __p = (p); \
++ __acc_add_atomic(__p, &(m)->v); \
++ __vx_add_cres(m->mm_vx_info, r, __p, m, __FILE__, __LINE__); \
++} while (0)
+
+
-+/* OOM badness */
+
-+#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0)
-+#define VCMD_set_badness VC_CMD(MEMCTRL, 6, 0)
++#define vx_acc_vmpage(m, d) \
++ vx_acc_page(m, d, total_vm, RLIMIT_AS)
++#define vx_acc_vmlpage(m, d) \
++ vx_acc_page(m, d, locked_vm, RLIMIT_MEMLOCK)
++#define vx_acc_file_rsspage(m, d) \
++ vx_acc_page_atomic(m, d, _file_rss, VLIMIT_MAPPED)
++#define vx_acc_anon_rsspage(m, d) \
++ vx_acc_page_atomic(m, d, _anon_rss, VLIMIT_ANON)
+
-+struct vcmd_badness_v0 {
-+ int64_t bias;
-+};
++#define vx_acc_vmpages(m, p) \
++ vx_acc_pages(m, p, total_vm, RLIMIT_AS)
++#define vx_acc_vmlpages(m, p) \
++ vx_acc_pages(m, p, locked_vm, RLIMIT_MEMLOCK)
++#define vx_acc_file_rsspages(m, p) \
++ vx_acc_pages_atomic(m, p, _file_rss, VLIMIT_MAPPED)
++#define vx_acc_anon_rsspages(m, p) \
++ vx_acc_pages_atomic(m, p, _anon_rss, VLIMIT_ANON)
+
-+#ifdef __KERNEL__
-+extern int vc_get_badness(struct vx_info *, void __user *);
-+extern int vc_set_badness(struct vx_info *, void __user *);
++#define vx_pages_add(s, r, p) __vx_add_cres(s, r, p, 0, __FILE__, __LINE__)
++#define vx_pages_sub(s, r, p) vx_pages_add(s, r, -(p))
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/context.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/context.h
---- linux-2.6.32.6/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/context.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,183 @@
-+#ifndef _VX_CONTEXT_H
-+#define _VX_CONTEXT_H
++#define vx_vmpages_inc(m) vx_acc_vmpage(m, 1)
++#define vx_vmpages_dec(m) vx_acc_vmpage(m, -1)
++#define vx_vmpages_add(m, p) vx_acc_vmpages(m, p)
++#define vx_vmpages_sub(m, p) vx_acc_vmpages(m, -(p))
+
-+#include <linux/types.h>
-+#include <linux/capability.h>
++#define vx_vmlocked_inc(m) vx_acc_vmlpage(m, 1)
++#define vx_vmlocked_dec(m) vx_acc_vmlpage(m, -1)
++#define vx_vmlocked_add(m, p) vx_acc_vmlpages(m, p)
++#define vx_vmlocked_sub(m, p) vx_acc_vmlpages(m, -(p))
+
++#define vx_file_rsspages_inc(m) vx_acc_file_rsspage(m, 1)
++#define vx_file_rsspages_dec(m) vx_acc_file_rsspage(m, -1)
++#define vx_file_rsspages_add(m, p) vx_acc_file_rsspages(m, p)
++#define vx_file_rsspages_sub(m, p) vx_acc_file_rsspages(m, -(p))
+
-+/* context flags */
++#define vx_anon_rsspages_inc(m) vx_acc_anon_rsspage(m, 1)
++#define vx_anon_rsspages_dec(m) vx_acc_anon_rsspage(m, -1)
++#define vx_anon_rsspages_add(m, p) vx_acc_anon_rsspages(m, p)
++#define vx_anon_rsspages_sub(m, p) vx_acc_anon_rsspages(m, -(p))
+
-+#define VXF_INFO_SCHED 0x00000002
-+#define VXF_INFO_NPROC 0x00000004
-+#define VXF_INFO_PRIVATE 0x00000008
+
-+#define VXF_INFO_INIT 0x00000010
-+#define VXF_INFO_HIDE 0x00000020
-+#define VXF_INFO_ULIMIT 0x00000040
-+#define VXF_INFO_NSPACE 0x00000080
++#define vx_pages_avail(m, p, r) \
++ __vx_cres_avail((m)->mm_vx_info, r, p, __FILE__, __LINE__)
+
-+#define VXF_SCHED_HARD 0x00000100
-+#define VXF_SCHED_PRIO 0x00000200
-+#define VXF_SCHED_PAUSE 0x00000400
++#define vx_vmpages_avail(m, p) vx_pages_avail(m, p, RLIMIT_AS)
++#define vx_vmlocked_avail(m, p) vx_pages_avail(m, p, RLIMIT_MEMLOCK)
++#define vx_anon_avail(m, p) vx_pages_avail(m, p, VLIMIT_ANON)
++#define vx_mapped_avail(m, p) vx_pages_avail(m, p, VLIMIT_MAPPED)
+
-+#define VXF_VIRT_MEM 0x00010000
-+#define VXF_VIRT_UPTIME 0x00020000
-+#define VXF_VIRT_CPU 0x00040000
-+#define VXF_VIRT_LOAD 0x00080000
-+#define VXF_VIRT_TIME 0x00100000
++#define vx_rss_avail(m, p) \
++ __vx_cres_array_avail((m)->mm_vx_info, VLA_RSS, p, __FILE__, __LINE__)
+
-+#define VXF_HIDE_MOUNT 0x01000000
-+/* was VXF_HIDE_NETIF 0x02000000 */
-+#define VXF_HIDE_VINFO 0x04000000
+
-+#define VXF_STATE_SETUP (1ULL << 32)
-+#define VXF_STATE_INIT (1ULL << 33)
-+#define VXF_STATE_ADMIN (1ULL << 34)
++enum {
++ VXPT_UNKNOWN = 0,
++ VXPT_ANON,
++ VXPT_NONE,
++ VXPT_FILE,
++ VXPT_SWAP,
++ VXPT_WRITE
++};
+
-+#define VXF_SC_HELPER (1ULL << 36)
-+#define VXF_REBOOT_KILL (1ULL << 37)
-+#define VXF_PERSISTENT (1ULL << 38)
++#if 0
++#define vx_page_fault(mm, vma, type, ret)
++#else
+
-+#define VXF_FORK_RSS (1ULL << 48)
-+#define VXF_PROLIFIC (1ULL << 49)
++static inline
++void __vx_page_fault(struct mm_struct *mm,
++ struct vm_area_struct *vma, int type, int ret)
++{
++ struct vx_info *vxi = mm->mm_vx_info;
++ int what;
++/*
++ static char *page_type[6] =
++ { "UNKNOWN", "ANON", "NONE", "FILE", "SWAP", "WRITE" };
++ static char *page_what[4] =
++ { "FAULT_OOM", "FAULT_SIGBUS", "FAULT_MINOR", "FAULT_MAJOR" };
++*/
+
-+#define VXF_IGNEG_NICE (1ULL << 52)
++ if (!vxi)
++ return;
+
-+#define VXF_ONE_TIME (0x0007ULL << 32)
++ what = (ret & 0x3);
+
-+#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN)
++/* printk("[%d] page[%d][%d] %2x %s %s\n", vxi->vx_id,
++ type, what, ret, page_type[type], page_what[what]);
++*/
++ if (ret & VM_FAULT_WRITE)
++ what |= 0x4;
++ atomic_inc(&vxi->cacct.page[type][what]);
++}
+
++#define vx_page_fault(mm, vma, type, ret) __vx_page_fault(mm, vma, type, ret)
++#endif
+
-+/* context migration */
+
-+#define VXM_SET_INIT 0x00000001
-+#define VXM_SET_REAPER 0x00000002
++extern unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm);
+
-+/* context caps */
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_network.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_network.h
+--- linux-2.6.32.59/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_network.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,169 @@
++#ifndef _NX_VS_NETWORK_H
++#define _NX_VS_NETWORK_H
+
-+#define VXC_CAP_MASK 0x00000000
++#include "vserver/context.h"
++#include "vserver/network.h"
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/debug.h"
+
-+#define VXC_SET_UTSNAME 0x00000001
-+#define VXC_SET_RLIMIT 0x00000002
-+#define VXC_FS_SECURITY 0x00000004
-+#define VXC_TIOCSTI 0x00000010
++#include <linux/sched.h>
+
-+/* was VXC_RAW_ICMP 0x00000100 */
-+#define VXC_SYSLOG 0x00001000
-+#define VXC_OOM_ADJUST 0x00002000
-+#define VXC_AUDIT_CONTROL 0x00004000
+
-+#define VXC_SECURE_MOUNT 0x00010000
-+#define VXC_SECURE_REMOUNT 0x00020000
-+#define VXC_BINARY_MOUNT 0x00040000
++#define get_nx_info(i) __get_nx_info(i, __FILE__, __LINE__)
+
-+#define VXC_QUOTA_CTL 0x00100000
-+#define VXC_ADMIN_MAPPER 0x00200000
-+#define VXC_ADMIN_CLOOP 0x00400000
++static inline struct nx_info *__get_nx_info(struct nx_info *nxi,
++ const char *_file, int _line)
++{
++ if (!nxi)
++ return NULL;
+
-+#define VXC_KTHREAD 0x01000000
-+#define VXC_NAMESPACE 0x02000000
++ vxlprintk(VXD_CBIT(nid, 2), "get_nx_info(%p[#%d.%d])",
++ nxi, nxi ? nxi->nx_id : 0,
++ nxi ? atomic_read(&nxi->nx_usecnt) : 0,
++ _file, _line);
+
++ atomic_inc(&nxi->nx_usecnt);
++ return nxi;
++}
+
-+#ifdef __KERNEL__
+
-+#include <linux/list.h>
-+#include <linux/spinlock.h>
-+#include <linux/rcupdate.h>
++extern void free_nx_info(struct nx_info *);
+
-+#include "limit_def.h"
-+#include "sched_def.h"
-+#include "cvirt_def.h"
-+#include "cacct_def.h"
-+#include "device_def.h"
++#define put_nx_info(i) __put_nx_info(i, __FILE__, __LINE__)
+
-+#define VX_SPACES 2
++static inline void __put_nx_info(struct nx_info *nxi, const char *_file, int _line)
++{
++ if (!nxi)
++ return;
+
-+struct _vx_info_pc {
-+ struct _vx_sched_pc sched_pc;
-+ struct _vx_cvirt_pc cvirt_pc;
-+};
++ vxlprintk(VXD_CBIT(nid, 2), "put_nx_info(%p[#%d.%d])",
++ nxi, nxi ? nxi->nx_id : 0,
++ nxi ? atomic_read(&nxi->nx_usecnt) : 0,
++ _file, _line);
+
-+struct vx_info {
-+ struct hlist_node vx_hlist; /* linked list of contexts */
-+ xid_t vx_id; /* context id */
-+ atomic_t vx_usecnt; /* usage count */
-+ atomic_t vx_tasks; /* tasks count */
-+ struct vx_info *vx_parent; /* parent context */
-+ int vx_state; /* context state */
++ if (atomic_dec_and_test(&nxi->nx_usecnt))
++ free_nx_info(nxi);
++}
+
-+ unsigned long vx_nsmask[VX_SPACES]; /* assignment mask */
-+ struct nsproxy *vx_nsproxy[VX_SPACES]; /* private namespaces */
-+ struct fs_struct *vx_fs[VX_SPACES]; /* private namespace fs */
+
-+ uint64_t vx_flags; /* context flags */
-+ uint64_t vx_ccaps; /* context caps (vserver) */
-+ kernel_cap_t vx_bcaps; /* bounding caps (system) */
-+ unsigned long vx_umask; /* unshare mask (guest) */
++#define init_nx_info(p, i) __init_nx_info(p, i, __FILE__, __LINE__)
+
-+ struct task_struct *vx_reaper; /* guest reaper process */
-+ pid_t vx_initpid; /* PID of guest init */
-+ int64_t vx_badness_bias; /* OOM points bias */
++static inline void __init_nx_info(struct nx_info **nxp, struct nx_info *nxi,
++ const char *_file, int _line)
++{
++ if (nxi) {
++ vxlprintk(VXD_CBIT(nid, 3),
++ "init_nx_info(%p[#%d.%d])",
++ nxi, nxi ? nxi->nx_id : 0,
++ nxi ? atomic_read(&nxi->nx_usecnt) : 0,
++ _file, _line);
+
-+ struct _vx_limit limit; /* vserver limits */
-+ struct _vx_sched sched; /* vserver scheduler */
-+ struct _vx_cvirt cvirt; /* virtual/bias stuff */
-+ struct _vx_cacct cacct; /* context accounting */
++ atomic_inc(&nxi->nx_usecnt);
++ }
++ *nxp = nxi;
++}
+
-+ struct _vx_device dmap; /* default device map targets */
+
-+#ifndef CONFIG_SMP
-+ struct _vx_info_pc info_pc; /* per cpu data */
-+#else
-+ struct _vx_info_pc *ptr_pc; /* per cpu array */
-+#endif
++#define set_nx_info(p, i) __set_nx_info(p, i, __FILE__, __LINE__)
+
-+ wait_queue_head_t vx_wait; /* context exit waitqueue */
-+ int reboot_cmd; /* last sys_reboot() cmd */
-+ int exit_code; /* last process exit code */
++static inline void __set_nx_info(struct nx_info **nxp, struct nx_info *nxi,
++ const char *_file, int _line)
++{
++ struct nx_info *nxo;
+
-+ char vx_name[65]; /* vserver name */
-+};
++ if (!nxi)
++ return;
+
-+#ifndef CONFIG_SMP
-+#define vx_ptr_pc(vxi) (&(vxi)->info_pc)
-+#define vx_per_cpu(vxi, v, id) vx_ptr_pc(vxi)->v
-+#else
-+#define vx_ptr_pc(vxi) ((vxi)->ptr_pc)
-+#define vx_per_cpu(vxi, v, id) per_cpu_ptr(vx_ptr_pc(vxi), id)->v
-+#endif
++ vxlprintk(VXD_CBIT(nid, 3), "set_nx_info(%p[#%d.%d])",
++ nxi, nxi ? nxi->nx_id : 0,
++ nxi ? atomic_read(&nxi->nx_usecnt) : 0,
++ _file, _line);
+
-+#define vx_cpu(vxi, v) vx_per_cpu(vxi, v, smp_processor_id())
++ atomic_inc(&nxi->nx_usecnt);
++ nxo = xchg(nxp, nxi);
++ BUG_ON(nxo);
++}
+
++#define clr_nx_info(p) __clr_nx_info(p, __FILE__, __LINE__)
+
-+struct vx_info_save {
-+ struct vx_info *vxi;
-+ xid_t xid;
-+};
++static inline void __clr_nx_info(struct nx_info **nxp,
++ const char *_file, int _line)
++{
++ struct nx_info *nxo;
+
++ nxo = xchg(nxp, NULL);
++ if (!nxo)
++ return;
+
-+/* status flags */
++ vxlprintk(VXD_CBIT(nid, 3), "clr_nx_info(%p[#%d.%d])",
++ nxo, nxo ? nxo->nx_id : 0,
++ nxo ? atomic_read(&nxo->nx_usecnt) : 0,
++ _file, _line);
+
-+#define VXS_HASHED 0x0001
-+#define VXS_PAUSED 0x0010
-+#define VXS_SHUTDOWN 0x0100
-+#define VXS_HELPER 0x1000
-+#define VXS_RELEASED 0x8000
++ if (atomic_dec_and_test(&nxo->nx_usecnt))
++ free_nx_info(nxo);
++}
+
+
-+extern void claim_vx_info(struct vx_info *, struct task_struct *);
-+extern void release_vx_info(struct vx_info *, struct task_struct *);
++#define claim_nx_info(v, p) __claim_nx_info(v, p, __FILE__, __LINE__)
+
-+extern struct vx_info *lookup_vx_info(int);
-+extern struct vx_info *lookup_or_create_vx_info(int);
++static inline void __claim_nx_info(struct nx_info *nxi,
++ struct task_struct *task, const char *_file, int _line)
++{
++ vxlprintk(VXD_CBIT(nid, 3), "claim_nx_info(%p[#%d.%d.%d]) %p",
++ nxi, nxi ? nxi->nx_id : 0,
++ nxi?atomic_read(&nxi->nx_usecnt):0,
++ nxi?atomic_read(&nxi->nx_tasks):0,
++ task, _file, _line);
+
-+extern int get_xid_list(int, unsigned int *, int);
-+extern int xid_is_hashed(xid_t);
++ atomic_inc(&nxi->nx_tasks);
++}
+
-+extern int vx_migrate_task(struct task_struct *, struct vx_info *, int);
+
-+extern long vs_state_change(struct vx_info *, unsigned int);
++extern void unhash_nx_info(struct nx_info *);
+
++#define release_nx_info(v, p) __release_nx_info(v, p, __FILE__, __LINE__)
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/cvirt_cmd.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/cvirt_cmd.h
---- linux-2.6.32.6/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/cvirt_cmd.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,53 @@
-+#ifndef _VX_CVIRT_CMD_H
-+#define _VX_CVIRT_CMD_H
++static inline void __release_nx_info(struct nx_info *nxi,
++ struct task_struct *task, const char *_file, int _line)
++{
++ vxlprintk(VXD_CBIT(nid, 3), "release_nx_info(%p[#%d.%d.%d]) %p",
++ nxi, nxi ? nxi->nx_id : 0,
++ nxi ? atomic_read(&nxi->nx_usecnt) : 0,
++ nxi ? atomic_read(&nxi->nx_tasks) : 0,
++ task, _file, _line);
+
++ might_sleep();
+
-+/* virtual host info name commands */
++ if (atomic_dec_and_test(&nxi->nx_tasks))
++ unhash_nx_info(nxi);
++}
+
-+#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0)
-+#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0)
+
-+struct vcmd_vhi_name_v0 {
-+ uint32_t field;
-+ char name[65];
-+};
++#define task_get_nx_info(i) __task_get_nx_info(i, __FILE__, __LINE__)
+
++static __inline__ struct nx_info *__task_get_nx_info(struct task_struct *p,
++ const char *_file, int _line)
++{
++ struct nx_info *nxi;
+
-+enum vhi_name_field {
-+ VHIN_CONTEXT = 0,
-+ VHIN_SYSNAME,
-+ VHIN_NODENAME,
-+ VHIN_RELEASE,
-+ VHIN_VERSION,
-+ VHIN_MACHINE,
-+ VHIN_DOMAINNAME,
-+};
++ task_lock(p);
++ vxlprintk(VXD_CBIT(nid, 5), "task_get_nx_info(%p)",
++ p, _file, _line);
++ nxi = __get_nx_info(p->nx_info, _file, _line);
++ task_unlock(p);
++ return nxi;
++}
+
+
-+#ifdef __KERNEL__
++static inline void exit_nx_info(struct task_struct *p)
++{
++ if (p->nx_info)
++ release_nx_info(p->nx_info, p);
++}
+
-+#include <linux/compiler.h>
+
-+extern int vc_set_vhi_name(struct vx_info *, void __user *);
-+extern int vc_get_vhi_name(struct vx_info *, void __user *);
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_pid.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_pid.h
+--- linux-2.6.32.59/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_pid.h 2011-06-10 14:04:27.000000000 +0200
+@@ -0,0 +1,50 @@
++#ifndef _VS_PID_H
++#define _VS_PID_H
+
-+#endif /* __KERNEL__ */
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/context.h"
++#include "vserver/debug.h"
++#include "vserver/pid.h"
++#include <linux/pid_namespace.h>
+
-+#define VCMD_virt_stat VC_CMD(VSTAT, 3, 0)
+
-+struct vcmd_virt_stat_v0 {
-+ uint64_t offset;
-+ uint64_t uptime;
-+ uint32_t nr_threads;
-+ uint32_t nr_running;
-+ uint32_t nr_uninterruptible;
-+ uint32_t nr_onhold;
-+ uint32_t nr_forks;
-+ uint32_t load[3];
-+};
++#define VXF_FAKE_INIT (VXF_INFO_INIT | VXF_STATE_INIT)
+
-+#ifdef __KERNEL__
-+extern int vc_virt_stat(struct vx_info *, void __user *);
++static inline
++int vx_proc_task_visible(struct task_struct *task)
++{
++ if ((task->pid == 1) &&
++ !vx_flags(VXF_FAKE_INIT, VXF_FAKE_INIT))
++ /* show a blend through init */
++ goto visible;
++ if (vx_check(vx_task_xid(task), VS_WATCH | VS_IDENT))
++ goto visible;
++ return 0;
++visible:
++ return 1;
++}
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/cvirt_def.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/cvirt_def.h
---- linux-2.6.32.6/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/cvirt_def.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,80 @@
-+#ifndef _VX_CVIRT_DEF_H
-+#define _VX_CVIRT_DEF_H
++#define find_task_by_real_pid(pid) find_task_by_pid_ns(pid, &init_pid_ns)
+
-+#include <linux/jiffies.h>
-+#include <linux/spinlock.h>
-+#include <linux/wait.h>
-+#include <linux/time.h>
-+#include <asm/atomic.h>
+
++static inline
++struct task_struct *vx_get_proc_task(struct inode *inode, struct pid *pid)
++{
++ struct task_struct *task = get_pid_task(pid, PIDTYPE_PID);
+
-+struct _vx_usage_stat {
-+ uint64_t user;
-+ uint64_t nice;
-+ uint64_t system;
-+ uint64_t softirq;
-+ uint64_t irq;
-+ uint64_t idle;
-+ uint64_t iowait;
-+};
++ if (task && !vx_proc_task_visible(task)) {
++ vxdprintk(VXD_CBIT(misc, 6),
++ "dropping task (get) %p[#%u,%u] for %p[#%u,%u]",
++ task, task->xid, task->pid,
++ current, current->xid, current->pid);
++ put_task_struct(task);
++ task = NULL;
++ }
++ return task;
++}
+
-+struct _vx_syslog {
-+ wait_queue_head_t log_wait;
-+ spinlock_t logbuf_lock; /* lock for the log buffer */
+
-+ unsigned long log_start; /* next char to be read by syslog() */
-+ unsigned long con_start; /* next char to be sent to consoles */
-+ unsigned long log_end; /* most-recently-written-char + 1 */
-+ unsigned long logged_chars; /* #chars since last read+clear operation */
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_sched.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_sched.h
+--- linux-2.6.32.59/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_sched.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,110 @@
++#ifndef _VS_SCHED_H
++#define _VS_SCHED_H
+
-+ char log_buf[1024];
-+};
++#include "vserver/base.h"
++#include "vserver/context.h"
++#include "vserver/sched.h"
+
+
-+/* context sub struct */
++#define VAVAVOOM_RATIO 50
+
-+struct _vx_cvirt {
-+ atomic_t nr_threads; /* number of current threads */
-+ atomic_t nr_running; /* number of running threads */
-+ atomic_t nr_uninterruptible; /* number of uninterruptible threads */
++#define MAX_PRIO_BIAS 20
++#define MIN_PRIO_BIAS -20
+
-+ atomic_t nr_onhold; /* processes on hold */
-+ uint32_t onhold_last; /* jiffies when put on hold */
+
-+ struct timeval bias_tv; /* time offset to the host */
-+ struct timespec bias_idle;
-+ struct timespec bias_uptime; /* context creation point */
-+ uint64_t bias_clock; /* offset in clock_t */
++#ifdef CONFIG_VSERVER_HARDCPU
+
-+ spinlock_t load_lock; /* lock for the load averages */
-+ atomic_t load_updates; /* nr of load updates done so far */
-+ uint32_t load_last; /* last time load was calculated */
-+ uint32_t load[3]; /* load averages 1,5,15 */
++/*
++ * effective_prio - return the priority that is based on the static
++ * priority but is modified by bonuses/penalties.
++ *
++ * We scale the actual sleep average [0 .... MAX_SLEEP_AVG]
++ * into a -4 ... 0 ... +4 bonus/penalty range.
++ *
++ * Additionally, we scale another amount based on the number of
++ * CPU tokens currently held by the context, if the process is
++ * part of a context (and the appropriate SCHED flag is set).
++ * This ranges from -5 ... 0 ... +15, quadratically.
++ *
++ * So, the total bonus is -9 .. 0 .. +19
++ * We use ~50% of the full 0...39 priority range so that:
++ *
++ * 1) nice +19 interactive tasks do not preempt nice 0 CPU hogs.
++ * 2) nice -20 CPU hogs do not get preempted by nice 0 tasks.
++ * unless that context is far exceeding its CPU allocation.
++ *
++ * Both properties are important to certain workloads.
++ */
++static inline
++int vx_effective_vavavoom(struct _vx_sched_pc *sched_pc, int max_prio)
++{
++ int vavavoom, max;
+
-+ atomic_t total_forks; /* number of forks so far */
++ /* lots of tokens = lots of vavavoom
++ * no tokens = no vavavoom */
++ if ((vavavoom = sched_pc->tokens) >= 0) {
++ max = sched_pc->tokens_max;
++ vavavoom = max - vavavoom;
++ max = max * max;
++ vavavoom = max_prio * VAVAVOOM_RATIO / 100
++ * (vavavoom*vavavoom - (max >> 2)) / max;
++ return vavavoom;
++ }
++ return 0;
++}
+
-+ struct _vx_syslog syslog;
-+};
+
-+struct _vx_cvirt_pc {
-+ struct _vx_usage_stat cpustat;
-+};
++static inline
++int vx_adjust_prio(struct task_struct *p, int prio, int max_user)
++{
++ struct vx_info *vxi = p->vx_info;
++ struct _vx_sched_pc *sched_pc;
+
++ if (!vxi)
++ return prio;
+
-+#ifdef CONFIG_VSERVER_DEBUG
++ sched_pc = &vx_cpu(vxi, sched_pc);
++ if (vx_info_flags(vxi, VXF_SCHED_PRIO, 0)) {
++ int vavavoom = vx_effective_vavavoom(sched_pc, max_user);
+
-+static inline void __dump_vx_cvirt(struct _vx_cvirt *cvirt)
-+{
-+ printk("\t_vx_cvirt:\n");
-+ printk("\t threads: %4d, %4d, %4d, %4d\n",
-+ atomic_read(&cvirt->nr_threads),
-+ atomic_read(&cvirt->nr_running),
-+ atomic_read(&cvirt->nr_uninterruptible),
-+ atomic_read(&cvirt->nr_onhold));
-+ /* add rest here */
-+ printk("\t total_forks = %d\n", atomic_read(&cvirt->total_forks));
++ sched_pc->vavavoom = vavavoom;
++ prio += vavavoom;
++ }
++ prio += sched_pc->prio_bias;
++ return prio;
+}
+
-+#endif
++#else /* !CONFIG_VSERVER_HARDCPU */
+
-+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/cvirt.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/cvirt.h
---- linux-2.6.32.6/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/cvirt.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,20 @@
-+#ifndef _VX_CVIRT_H
-+#define _VX_CVIRT_H
++static inline
++int vx_adjust_prio(struct task_struct *p, int prio, int max_user)
++{
++ struct vx_info *vxi = p->vx_info;
+
++ if (vxi)
++ prio += vx_cpu(vxi, sched_pc).prio_bias;
++ return prio;
++}
+
-+#ifdef __KERNEL__
++#endif /* CONFIG_VSERVER_HARDCPU */
+
-+struct timespec;
+
-+void vx_vsi_uptime(struct timespec *, struct timespec *);
++static inline void vx_account_user(struct vx_info *vxi,
++ cputime_t cputime, int nice)
++{
++ if (!vxi)
++ return;
++ vx_cpu(vxi, sched_pc).user_ticks += cputime;
++}
+
++static inline void vx_account_system(struct vx_info *vxi,
++ cputime_t cputime, int idle)
++{
++ if (!vxi)
++ return;
++ vx_cpu(vxi, sched_pc).sys_ticks += cputime;
++}
+
-+struct vx_info;
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_socket.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_socket.h
+--- linux-2.6.32.59/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_socket.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,67 @@
++#ifndef _VS_SOCKET_H
++#define _VS_SOCKET_H
+
-+void vx_update_load(struct vx_info *);
++#include "vserver/debug.h"
++#include "vserver/base.h"
++#include "vserver/cacct.h"
++#include "vserver/context.h"
++#include "vserver/tag.h"
+
+
-+int vx_do_syslog(int, char __user *, int);
++/* socket accounting */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/debug_cmd.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/debug_cmd.h
---- linux-2.6.32.6/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/debug_cmd.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,58 @@
-+#ifndef _VX_DEBUG_CMD_H
-+#define _VX_DEBUG_CMD_H
++#include <linux/socket.h>
+
++static inline int vx_sock_type(int family)
++{
++ switch (family) {
++ case PF_UNSPEC:
++ return VXA_SOCK_UNSPEC;
++ case PF_UNIX:
++ return VXA_SOCK_UNIX;
++ case PF_INET:
++ return VXA_SOCK_INET;
++ case PF_INET6:
++ return VXA_SOCK_INET6;
++ case PF_PACKET:
++ return VXA_SOCK_PACKET;
++ default:
++ return VXA_SOCK_OTHER;
++ }
++}
+
-+/* debug commands */
++#define vx_acc_sock(v, f, p, s) \
++ __vx_acc_sock(v, f, p, s, __FILE__, __LINE__)
+
-+#define VCMD_dump_history VC_CMD(DEBUG, 1, 0)
++static inline void __vx_acc_sock(struct vx_info *vxi,
++ int family, int pos, int size, char *file, int line)
++{
++ if (vxi) {
++ int type = vx_sock_type(family);
+
-+#define VCMD_read_history VC_CMD(DEBUG, 5, 0)
-+#define VCMD_read_monitor VC_CMD(DEBUG, 6, 0)
++ atomic_long_inc(&vxi->cacct.sock[type][pos].count);
++ atomic_long_add(size, &vxi->cacct.sock[type][pos].total);
++ }
++}
+
-+struct vcmd_read_history_v0 {
-+ uint32_t index;
-+ uint32_t count;
-+ char __user *data;
-+};
++#define vx_sock_recv(sk, s) \
++ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 0, s)
++#define vx_sock_send(sk, s) \
++ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 1, s)
++#define vx_sock_fail(sk, s) \
++ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 2, s)
+
-+struct vcmd_read_monitor_v0 {
-+ uint32_t index;
-+ uint32_t count;
-+ char __user *data;
-+};
+
++#define sock_vx_init(s) do { \
++ (s)->sk_xid = 0; \
++ (s)->sk_vx_info = NULL; \
++ } while (0)
+
-+#ifdef __KERNEL__
++#define sock_nx_init(s) do { \
++ (s)->sk_nid = 0; \
++ (s)->sk_nx_info = NULL; \
++ } while (0)
+
-+#ifdef CONFIG_COMPAT
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_tag.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_tag.h
+--- linux-2.6.32.59/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_tag.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,47 @@
++#ifndef _VS_TAG_H
++#define _VS_TAG_H
+
-+#include <asm/compat.h>
++#include <linux/vserver/tag.h>
+
-+struct vcmd_read_history_v0_x32 {
-+ uint32_t index;
-+ uint32_t count;
-+ compat_uptr_t data_ptr;
-+};
++/* check conditions */
+
-+struct vcmd_read_monitor_v0_x32 {
-+ uint32_t index;
-+ uint32_t count;
-+ compat_uptr_t data_ptr;
-+};
++#define DX_ADMIN 0x0001
++#define DX_WATCH 0x0002
++#define DX_HOSTID 0x0008
+
-+#endif /* CONFIG_COMPAT */
++#define DX_IDENT 0x0010
+
-+extern int vc_dump_history(uint32_t);
++#define DX_ARG_MASK 0x0010
+
-+extern int vc_read_history(uint32_t, void __user *);
-+extern int vc_read_monitor(uint32_t, void __user *);
+
-+#ifdef CONFIG_COMPAT
++#define dx_task_tag(t) ((t)->tag)
+
-+extern int vc_read_history_x32(uint32_t, void __user *);
-+extern int vc_read_monitor_x32(uint32_t, void __user *);
++#define dx_current_tag() dx_task_tag(current)
+
-+#endif /* CONFIG_COMPAT */
++#define dx_check(c, m) __dx_check(dx_current_tag(), c, m)
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/debug.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/debug.h
---- linux-2.6.32.6/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/debug.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,127 @@
-+#ifndef _VX_DEBUG_H
-+#define _VX_DEBUG_H
++#define dx_weak_check(c, m) ((m) ? dx_check(c, m) : 1)
+
+
-+#define VXD_CBIT(n, m) (vx_debug_ ## n & (1 << (m)))
-+#define VXD_CMIN(n, m) (vx_debug_ ## n > (m))
-+#define VXD_MASK(n, m) (vx_debug_ ## n & (m))
++/*
++ * check current context for ADMIN/WATCH and
++ * optionally against supplied argument
++ */
++static inline int __dx_check(tag_t cid, tag_t id, unsigned int mode)
++{
++ if (mode & DX_ARG_MASK) {
++ if ((mode & DX_IDENT) && (id == cid))
++ return 1;
++ }
++ return (((mode & DX_ADMIN) && (cid == 0)) ||
++ ((mode & DX_WATCH) && (cid == 1)) ||
++ ((mode & DX_HOSTID) && (id == 0)));
++}
+
-+#define VXD_DEV(d) (d), (d)->bd_inode->i_ino, \
-+ imajor((d)->bd_inode), iminor((d)->bd_inode)
-+#define VXF_DEV "%p[%lu,%d:%d]"
++struct inode;
++int dx_permission(const struct inode *inode, int mask);
+
+
-+#define vxd_path(p) \
-+ ({ static char _buffer[PATH_MAX]; \
-+ d_path(p, _buffer, sizeof(_buffer)); })
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_time.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_time.h
+--- linux-2.6.32.59/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_time.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,19 @@
++#ifndef _VS_TIME_H
++#define _VS_TIME_H
+
-+#define vxd_cond_path(n) \
-+ ((n) ? vxd_path(&(n)->path) : "<null>" )
+
++/* time faking stuff */
+
-+#ifdef CONFIG_VSERVER_DEBUG
++#ifdef CONFIG_VSERVER_VTIME
+
-+extern unsigned int vx_debug_switch;
-+extern unsigned int vx_debug_xid;
-+extern unsigned int vx_debug_nid;
-+extern unsigned int vx_debug_tag;
-+extern unsigned int vx_debug_net;
-+extern unsigned int vx_debug_limit;
-+extern unsigned int vx_debug_cres;
-+extern unsigned int vx_debug_dlim;
-+extern unsigned int vx_debug_quota;
-+extern unsigned int vx_debug_cvirt;
-+extern unsigned int vx_debug_space;
-+extern unsigned int vx_debug_misc;
++extern void vx_gettimeofday(struct timeval *tv);
++extern int vx_settimeofday(struct timespec *ts);
+
++#else
++#define vx_gettimeofday(t) do_gettimeofday(t)
++#define vx_settimeofday(t) do_settimeofday(t)
++#endif
+
-+#define VX_LOGLEVEL "vxD: "
-+#define VX_PROC_FMT "%p: "
-+#define VX_PROCESS current
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/Kbuild linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/Kbuild
+--- linux-2.6.32.59/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/Kbuild 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,8 @@
+
-+#define vxdprintk(c, f, x...) \
-+ do { \
-+ if (c) \
-+ printk(VX_LOGLEVEL VX_PROC_FMT f "\n", \
-+ VX_PROCESS , ##x); \
-+ } while (0)
++unifdef-y += context_cmd.h network_cmd.h space_cmd.h \
++ cacct_cmd.h cvirt_cmd.h limit_cmd.h dlimit_cmd.h \
++ inode_cmd.h tag_cmd.h sched_cmd.h signal_cmd.h \
++ debug_cmd.h device_cmd.h
+
-+#define vxlprintk(c, f, x...) \
-+ do { \
-+ if (c) \
-+ printk(VX_LOGLEVEL f " @%s:%d\n", x); \
-+ } while (0)
++unifdef-y += switch.h network.h monitor.h inode.h device.h
+
-+#define vxfprintk(c, f, x...) \
-+ do { \
-+ if (c) \
-+ printk(VX_LOGLEVEL f " %s@%s:%d\n", x); \
-+ } while (0)
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/base.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/base.h
+--- linux-2.6.32.59/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/base.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,170 @@
++#ifndef _VX_BASE_H
++#define _VX_BASE_H
+
+
-+struct vx_info;
++/* context state changes */
+
-+void dump_vx_info(struct vx_info *, int);
-+void dump_vx_info_inactive(int);
++enum {
++ VSC_STARTUP = 1,
++ VSC_SHUTDOWN,
+
-+#else /* CONFIG_VSERVER_DEBUG */
++ VSC_NETUP,
++ VSC_NETDOWN,
++};
+
-+#define vx_debug_switch 0
-+#define vx_debug_xid 0
-+#define vx_debug_nid 0
-+#define vx_debug_tag 0
-+#define vx_debug_net 0
-+#define vx_debug_limit 0
-+#define vx_debug_cres 0
-+#define vx_debug_dlim 0
-+#define vx_debug_cvirt 0
+
-+#define vxdprintk(x...) do { } while (0)
-+#define vxlprintk(x...) do { } while (0)
-+#define vxfprintk(x...) do { } while (0)
+
-+#endif /* CONFIG_VSERVER_DEBUG */
++#define vx_task_xid(t) ((t)->xid)
+
++#define vx_current_xid() vx_task_xid(current)
+
-+#ifdef CONFIG_VSERVER_WARN
++#define current_vx_info() (current->vx_info)
+
-+#define VX_WARNLEVEL KERN_WARNING "vxW: "
-+#define VX_WARN_TASK "[»%s«,%u:#%u|%u|%u] "
-+#define VX_WARN_XID "[xid #%u] "
-+#define VX_WARN_NID "[nid #%u] "
-+#define VX_WARN_TAG "[tag #%u] "
+
-+#define vxwprintk(c, f, x...) \
-+ do { \
-+ if (c) \
-+ printk(VX_WARNLEVEL f "\n", ##x); \
-+ } while (0)
++#define nx_task_nid(t) ((t)->nid)
+
-+#else /* CONFIG_VSERVER_WARN */
++#define nx_current_nid() nx_task_nid(current)
+
-+#define vxwprintk(x...) do { } while (0)
++#define current_nx_info() (current->nx_info)
+
-+#endif /* CONFIG_VSERVER_WARN */
+
-+#define vxwprintk_task(c, f, x...) \
-+ vxwprintk(c, VX_WARN_TASK f, \
-+ current->comm, current->pid, \
-+ current->xid, current->nid, current->tag, ##x)
-+#define vxwprintk_xid(c, f, x...) \
-+ vxwprintk(c, VX_WARN_XID f, current->xid, x)
-+#define vxwprintk_nid(c, f, x...) \
-+ vxwprintk(c, VX_WARN_NID f, current->nid, x)
-+#define vxwprintk_tag(c, f, x...) \
-+ vxwprintk(c, VX_WARN_TAG f, current->tag, x)
++/* generic flag merging */
+
-+#ifdef CONFIG_VSERVER_DEBUG
-+#define vxd_assert_lock(l) assert_spin_locked(l)
-+#define vxd_assert(c, f, x...) vxlprintk(!(c), \
-+ "assertion [" f "] failed.", ##x, __FILE__, __LINE__)
-+#else
-+#define vxd_assert_lock(l) do { } while (0)
-+#define vxd_assert(c, f, x...) do { } while (0)
-+#endif
++#define vs_check_flags(v, m, f) (((v) & (m)) ^ (f))
+
++#define vs_mask_flags(v, f, m) (((v) & ~(m)) | ((f) & (m)))
+
-+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/device_cmd.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/device_cmd.h
---- linux-2.6.32.6/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/device_cmd.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,44 @@
-+#ifndef _VX_DEVICE_CMD_H
-+#define _VX_DEVICE_CMD_H
++#define vs_mask_mask(v, f, m) (((v) & ~(m)) | ((v) & (f) & (m)))
+
++#define vs_check_bit(v, n) ((v) & (1LL << (n)))
+
-+/* device vserver commands */
+
-+#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0)
-+#define VCMD_unset_mapping VC_CMD(DEVICE, 2, 0)
++/* context flags */
+
-+struct vcmd_set_mapping_v0 {
-+ const char __user *device;
-+ const char __user *target;
-+ uint32_t flags;
-+};
++#define __vx_flags(v) ((v) ? (v)->vx_flags : 0)
+
++#define vx_current_flags() __vx_flags(current_vx_info())
+
-+#ifdef __KERNEL__
++#define vx_info_flags(v, m, f) \
++ vs_check_flags(__vx_flags(v), m, f)
+
-+#ifdef CONFIG_COMPAT
++#define task_vx_flags(t, m, f) \
++ ((t) && vx_info_flags((t)->vx_info, m, f))
+
-+#include <asm/compat.h>
++#define vx_flags(m, f) vx_info_flags(current_vx_info(), m, f)
+
-+struct vcmd_set_mapping_v0_x32 {
-+ compat_uptr_t device_ptr;
-+ compat_uptr_t target_ptr;
-+ uint32_t flags;
-+};
+
-+#endif /* CONFIG_COMPAT */
++/* context caps */
+
-+#include <linux/compiler.h>
++#define __vx_ccaps(v) ((v) ? (v)->vx_ccaps : 0)
+
-+extern int vc_set_mapping(struct vx_info *, void __user *);
-+extern int vc_unset_mapping(struct vx_info *, void __user *);
++#define vx_current_ccaps() __vx_ccaps(current_vx_info())
+
-+#ifdef CONFIG_COMPAT
++#define vx_info_ccaps(v, c) (__vx_ccaps(v) & (c))
+
-+extern int vc_set_mapping_x32(struct vx_info *, void __user *);
-+extern int vc_unset_mapping_x32(struct vx_info *, void __user *);
++#define vx_ccaps(c) vx_info_ccaps(current_vx_info(), (c))
+
-+#endif /* CONFIG_COMPAT */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/device_def.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/device_def.h
---- linux-2.6.32.6/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/device_def.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,17 @@
-+#ifndef _VX_DEVICE_DEF_H
-+#define _VX_DEVICE_DEF_H
+
-+#include <linux/types.h>
++/* network flags */
+
-+struct vx_dmap_target {
-+ dev_t target;
-+ uint32_t flags;
-+};
++#define __nx_flags(n) ((n) ? (n)->nx_flags : 0)
+
-+struct _vx_device {
-+#ifdef CONFIG_VSERVER_DEVICE
-+ struct vx_dmap_target targets[2];
-+#endif
-+};
++#define nx_current_flags() __nx_flags(current_nx_info())
+
-+#endif /* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/device.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/device.h
---- linux-2.6.32.6/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/device.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,15 @@
-+#ifndef _VX_DEVICE_H
-+#define _VX_DEVICE_H
++#define nx_info_flags(n, m, f) \
++ vs_check_flags(__nx_flags(n), m, f)
+
++#define task_nx_flags(t, m, f) \
++ ((t) && nx_info_flags((t)->nx_info, m, f))
+
-+#define DATTR_CREATE 0x00000001
-+#define DATTR_OPEN 0x00000002
++#define nx_flags(m, f) nx_info_flags(current_nx_info(), m, f)
+
-+#define DATTR_REMAP 0x00000010
+
-+#define DATTR_MASK 0x00000013
++/* network caps */
+
++#define __nx_ncaps(n) ((n) ? (n)->nx_ncaps : 0)
+
-+#else /* _VX_DEVICE_H */
-+#warning duplicate inclusion
-+#endif /* _VX_DEVICE_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/dlimit_cmd.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/dlimit_cmd.h
---- linux-2.6.32.6/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/dlimit_cmd.h 2009-12-10 16:43:43.000000000 +0100
-@@ -0,0 +1,109 @@
-+#ifndef _VX_DLIMIT_CMD_H
-+#define _VX_DLIMIT_CMD_H
++#define nx_current_ncaps() __nx_ncaps(current_nx_info())
+
++#define nx_info_ncaps(n, c) (__nx_ncaps(n) & (c))
+
-+/* dlimit vserver commands */
++#define nx_ncaps(c) nx_info_ncaps(current_nx_info(), c)
+
-+#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0)
-+#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0)
+
-+#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0)
-+#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0)
++/* context mask capabilities */
+
-+struct vcmd_ctx_dlimit_base_v0 {
-+ const char __user *name;
-+ uint32_t flags;
-+};
++#define __vx_mcaps(v) ((v) ? (v)->vx_ccaps >> 32UL : ~0 )
+
-+struct vcmd_ctx_dlimit_v0 {
-+ const char __user *name;
-+ uint32_t space_used; /* used space in kbytes */
-+ uint32_t space_total; /* maximum space in kbytes */
-+ uint32_t inodes_used; /* used inodes */
-+ uint32_t inodes_total; /* maximum inodes */
-+ uint32_t reserved; /* reserved for root in % */
-+ uint32_t flags;
-+};
++#define vx_info_mcaps(v, c) (__vx_mcaps(v) & (c))
+
-+#define CDLIM_UNSET ((uint32_t)0UL)
-+#define CDLIM_INFINITY ((uint32_t)~0UL)
-+#define CDLIM_KEEP ((uint32_t)~1UL)
++#define vx_mcaps(c) vx_info_mcaps(current_vx_info(), c)
+
-+#define DLIME_UNIT 0
-+#define DLIME_KILO 1
-+#define DLIME_MEGA 2
-+#define DLIME_GIGA 3
+
-+#define DLIMF_SHIFT 0x10
++/* context bcap mask */
+
-+#define DLIMS_USED 0
-+#define DLIMS_TOTAL 2
++#define __vx_bcaps(v) ((v)->vx_bcaps)
+
-+static inline
-+uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift)
-+{
-+ int exp = (flags & DLIMF_SHIFT) ?
-+ (flags >> shift) & DLIME_GIGA : DLIME_KILO;
-+ return ((uint64_t)val) << (10 * exp);
-+}
++#define vx_current_bcaps() __vx_bcaps(current_vx_info())
+
-+static inline
-+uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift)
-+{
-+ int exp = 0;
+
-+ if (*flags & DLIMF_SHIFT) {
-+ while (val > (1LL << 32) && (exp < 3)) {
-+ val >>= 10;
-+ exp++;
-+ }
-+ *flags &= ~(DLIME_GIGA << shift);
-+ *flags |= exp << shift;
-+ } else
-+ val >>= 10;
-+ return val;
-+}
++/* mask given bcaps */
+
-+#ifdef __KERNEL__
++#define vx_info_mbcaps(v, c) ((v) ? cap_intersect(__vx_bcaps(v), c) : c)
+
-+#ifdef CONFIG_COMPAT
++#define vx_mbcaps(c) vx_info_mbcaps(current_vx_info(), c)
+
-+#include <asm/compat.h>
+
-+struct vcmd_ctx_dlimit_base_v0_x32 {
-+ compat_uptr_t name_ptr;
-+ uint32_t flags;
-+};
++/* masked cap_bset */
+
-+struct vcmd_ctx_dlimit_v0_x32 {
-+ compat_uptr_t name_ptr;
-+ uint32_t space_used; /* used space in kbytes */
-+ uint32_t space_total; /* maximum space in kbytes */
-+ uint32_t inodes_used; /* used inodes */
-+ uint32_t inodes_total; /* maximum inodes */
-+ uint32_t reserved; /* reserved for root in % */
-+ uint32_t flags;
-+};
++#define vx_info_cap_bset(v) vx_info_mbcaps(v, current->cap_bset)
+
-+#endif /* CONFIG_COMPAT */
++#define vx_current_cap_bset() vx_info_cap_bset(current_vx_info())
+
-+#include <linux/compiler.h>
++#if 0
++#define vx_info_mbcap(v, b) \
++ (!vx_info_flags(v, VXF_STATE_SETUP, 0) ? \
++ vx_info_bcaps(v, b) : (b))
+
-+extern int vc_add_dlimit(uint32_t, void __user *);
-+extern int vc_rem_dlimit(uint32_t, void __user *);
++#define task_vx_mbcap(t, b) \
++ vx_info_mbcap((t)->vx_info, (t)->b)
+
-+extern int vc_set_dlimit(uint32_t, void __user *);
-+extern int vc_get_dlimit(uint32_t, void __user *);
++#define vx_mbcap(b) task_vx_mbcap(current, b)
++#endif
+
-+#ifdef CONFIG_COMPAT
++#define vx_cap_raised(v, c, f) cap_raised(vx_info_mbcaps(v, c), f)
+
-+extern int vc_add_dlimit_x32(uint32_t, void __user *);
-+extern int vc_rem_dlimit_x32(uint32_t, void __user *);
++#define vx_capable(b, c) (capable(b) || \
++ (cap_raised(current_cap(), b) && vx_ccaps(c)))
+
-+extern int vc_set_dlimit_x32(uint32_t, void __user *);
-+extern int vc_get_dlimit_x32(uint32_t, void __user *);
++#define nx_capable(b, c) (capable(b) || \
++ (cap_raised(current_cap(), b) && nx_ncaps(c)))
+
-+#endif /* CONFIG_COMPAT */
++#define vx_task_initpid(t, n) \
++ ((t)->vx_info && \
++ ((t)->vx_info->vx_initpid == (n)))
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/dlimit.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/dlimit.h
---- linux-2.6.32.6/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/dlimit.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,54 @@
-+#ifndef _VX_DLIMIT_H
-+#define _VX_DLIMIT_H
++#define vx_current_initpid(n) vx_task_initpid(current, n)
+
-+#include "switch.h"
+
++/* context unshare mask */
+
-+#ifdef __KERNEL__
++#define __vx_umask(v) ((v)->vx_umask)
+
-+/* keep in sync with CDLIM_INFINITY */
++#define vx_current_umask() __vx_umask(current_vx_info())
+
-+#define DLIM_INFINITY (~0ULL)
++#define vx_can_unshare(b, f) (capable(b) || \
++ (cap_raised(current_cap(), b) && \
++ !((f) & ~vx_current_umask())))
+
-+#include <linux/spinlock.h>
-+#include <linux/rcupdate.h>
+
-+struct super_block;
++#define __vx_state(v) ((v) ? ((v)->vx_state) : 0)
+
-+struct dl_info {
-+ struct hlist_node dl_hlist; /* linked list of contexts */
-+ struct rcu_head dl_rcu; /* the rcu head */
-+ tag_t dl_tag; /* context tag */
-+ atomic_t dl_usecnt; /* usage count */
-+ atomic_t dl_refcnt; /* reference count */
++#define vx_info_state(v, m) (__vx_state(v) & (m))
+
-+ struct super_block *dl_sb; /* associated superblock */
+
-+ spinlock_t dl_lock; /* protect the values */
++#define __nx_state(n) ((n) ? ((n)->nx_state) : 0)
+
-+ unsigned long long dl_space_used; /* used space in bytes */
-+ unsigned long long dl_space_total; /* maximum space in bytes */
-+ unsigned long dl_inodes_used; /* used inodes */
-+ unsigned long dl_inodes_total; /* maximum inodes */
++#define nx_info_state(n, m) (__nx_state(n) & (m))
+
-+ unsigned int dl_nrlmult; /* non root limit mult */
-+};
++#endif
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cacct.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cacct.h
+--- linux-2.6.32.59/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cacct.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,15 @@
++#ifndef _VX_CACCT_H
++#define _VX_CACCT_H
+
-+struct rcu_head;
+
-+extern void rcu_free_dl_info(struct rcu_head *);
-+extern void unhash_dl_info(struct dl_info *);
++enum sock_acc_field {
++ VXA_SOCK_UNSPEC = 0,
++ VXA_SOCK_UNIX,
++ VXA_SOCK_INET,
++ VXA_SOCK_INET6,
++ VXA_SOCK_PACKET,
++ VXA_SOCK_OTHER,
++ VXA_SOCK_SIZE /* array size */
++};
+
-+extern struct dl_info *locate_dl_info(struct super_block *, tag_t);
++#endif /* _VX_CACCT_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cacct_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cacct_cmd.h
+--- linux-2.6.32.59/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cacct_cmd.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,23 @@
++#ifndef _VX_CACCT_CMD_H
++#define _VX_CACCT_CMD_H
+
+
-+struct kstatfs;
++/* virtual host info name commands */
+
-+extern void vx_vsi_statfs(struct super_block *, struct kstatfs *);
++#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0)
+
-+typedef uint64_t dlsize_t;
++struct vcmd_sock_stat_v0 {
++ uint32_t field;
++ uint32_t count[3];
++ uint64_t total[3];
++};
+
-+#endif /* __KERNEL__ */
-+#else /* _VX_DLIMIT_H */
-+#warning duplicate inclusion
-+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/global.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/global.h
---- linux-2.6.32.6/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/global.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,19 @@
-+#ifndef _VX_GLOBAL_H
-+#define _VX_GLOBAL_H
+
++#ifdef __KERNEL__
+
-+extern atomic_t vx_global_ctotal;
-+extern atomic_t vx_global_cactive;
++#include <linux/compiler.h>
+
-+extern atomic_t nx_global_ctotal;
-+extern atomic_t nx_global_cactive;
++extern int vc_sock_stat(struct vx_info *, void __user *);
+
-+extern atomic_t vs_global_nsproxy;
-+extern atomic_t vs_global_fs;
-+extern atomic_t vs_global_mnt_ns;
-+extern atomic_t vs_global_uts_ns;
-+extern atomic_t vs_global_user_ns;
-+extern atomic_t vs_global_pid_ns;
++#endif /* __KERNEL__ */
++#endif /* _VX_CACCT_CMD_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cacct_def.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cacct_def.h
+--- linux-2.6.32.59/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cacct_def.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,43 @@
++#ifndef _VX_CACCT_DEF_H
++#define _VX_CACCT_DEF_H
+
++#include <asm/atomic.h>
++#include <linux/vserver/cacct.h>
+
-+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/history.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/history.h
---- linux-2.6.32.6/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/history.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,197 @@
-+#ifndef _VX_HISTORY_H
-+#define _VX_HISTORY_H
+
++struct _vx_sock_acc {
++ atomic_long_t count;
++ atomic_long_t total;
++};
+
-+enum {
-+ VXH_UNUSED = 0,
-+ VXH_THROW_OOPS = 1,
++/* context sub struct */
+
-+ VXH_GET_VX_INFO,
-+ VXH_PUT_VX_INFO,
-+ VXH_INIT_VX_INFO,
-+ VXH_SET_VX_INFO,
-+ VXH_CLR_VX_INFO,
-+ VXH_CLAIM_VX_INFO,
-+ VXH_RELEASE_VX_INFO,
-+ VXH_ALLOC_VX_INFO,
-+ VXH_DEALLOC_VX_INFO,
-+ VXH_HASH_VX_INFO,
-+ VXH_UNHASH_VX_INFO,
-+ VXH_LOC_VX_INFO,
-+ VXH_LOOKUP_VX_INFO,
-+ VXH_CREATE_VX_INFO,
++struct _vx_cacct {
++ struct _vx_sock_acc sock[VXA_SOCK_SIZE][3];
++ atomic_t slab[8];
++ atomic_t page[6][8];
+};
+
-+struct _vxhe_vxi {
-+ struct vx_info *ptr;
-+ unsigned xid;
-+ unsigned usecnt;
-+ unsigned tasks;
-+};
++#ifdef CONFIG_VSERVER_DEBUG
+
-+struct _vxhe_set_clr {
-+ void *data;
-+};
++static inline void __dump_vx_cacct(struct _vx_cacct *cacct)
++{
++ int i, j;
+
-+struct _vxhe_loc_lookup {
-+ unsigned arg;
-+};
++ printk("\t_vx_cacct:");
++ for (i = 0; i < 6; i++) {
++ struct _vx_sock_acc *ptr = cacct->sock[i];
+
-+struct _vx_hist_entry {
-+ void *loc;
-+ unsigned short seq;
-+ unsigned short type;
-+ struct _vxhe_vxi vxi;
-+ union {
-+ struct _vxhe_set_clr sc;
-+ struct _vxhe_loc_lookup ll;
-+ };
-+};
++ printk("\t [%d] =", i);
++ for (j = 0; j < 3; j++) {
++ printk(" [%d] = %8lu, %8lu", j,
++ atomic_long_read(&ptr[j].count),
++ atomic_long_read(&ptr[j].total));
++ }
++ printk("\n");
++ }
++}
+
-+#ifdef CONFIG_VSERVER_HISTORY
++#endif
+
-+extern unsigned volatile int vxh_active;
++#endif /* _VX_CACCT_DEF_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cacct_int.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cacct_int.h
+--- linux-2.6.32.59/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cacct_int.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,21 @@
++#ifndef _VX_CACCT_INT_H
++#define _VX_CACCT_INT_H
+
-+struct _vx_hist_entry *vxh_advance(void *loc);
+
++#ifdef __KERNEL__
+
+static inline
-+void __vxh_copy_vxi(struct _vx_hist_entry *entry, struct vx_info *vxi)
++unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
+{
-+ entry->vxi.ptr = vxi;
-+ if (vxi) {
-+ entry->vxi.usecnt = atomic_read(&vxi->vx_usecnt);
-+ entry->vxi.tasks = atomic_read(&vxi->vx_tasks);
-+ entry->vxi.xid = vxi->vx_id;
-+ }
++ return atomic_long_read(&cacct->sock[type][pos].count);
+}
+
+
-+#define __HERE__ current_text_addr()
++static inline
++unsigned long vx_sock_total(struct _vx_cacct *cacct, int type, int pos)
++{
++ return atomic_long_read(&cacct->sock[type][pos].total);
++}
+
-+#define __VXH_BODY(__type, __data, __here) \
-+ struct _vx_hist_entry *entry; \
-+ \
-+ preempt_disable(); \
-+ entry = vxh_advance(__here); \
-+ __data; \
-+ entry->type = __type; \
-+ preempt_enable();
++#endif /* __KERNEL__ */
++#endif /* _VX_CACCT_INT_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/check.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/check.h
+--- linux-2.6.32.59/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/check.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,89 @@
++#ifndef _VS_CHECK_H
++#define _VS_CHECK_H
+
+
-+ /* pass vxi only */
++#define MAX_S_CONTEXT 65535 /* Arbitrary limit */
+
-+#define __VXH_SMPL \
-+ __vxh_copy_vxi(entry, vxi)
++#ifdef CONFIG_VSERVER_DYNAMIC_IDS
++#define MIN_D_CONTEXT 49152 /* dynamic contexts start here */
++#else
++#define MIN_D_CONTEXT 65536
++#endif
+
-+static inline
-+void __vxh_smpl(struct vx_info *vxi, int __type, void *__here)
-+{
-+ __VXH_BODY(__type, __VXH_SMPL, __here)
-+}
++/* check conditions */
+
-+ /* pass vxi and data (void *) */
++#define VS_ADMIN 0x0001
++#define VS_WATCH 0x0002
++#define VS_HIDE 0x0004
++#define VS_HOSTID 0x0008
+
-+#define __VXH_DATA \
-+ __vxh_copy_vxi(entry, vxi); \
-+ entry->sc.data = data
++#define VS_IDENT 0x0010
++#define VS_EQUIV 0x0020
++#define VS_PARENT 0x0040
++#define VS_CHILD 0x0080
+
-+static inline
-+void __vxh_data(struct vx_info *vxi, void *data,
-+ int __type, void *__here)
-+{
-+ __VXH_BODY(__type, __VXH_DATA, __here)
-+}
++#define VS_ARG_MASK 0x00F0
+
-+ /* pass vxi and arg (long) */
++#define VS_DYNAMIC 0x0100
++#define VS_STATIC 0x0200
+
-+#define __VXH_LONG \
-+ __vxh_copy_vxi(entry, vxi); \
-+ entry->ll.arg = arg
++#define VS_ATR_MASK 0x0F00
+
-+static inline
-+void __vxh_long(struct vx_info *vxi, long arg,
-+ int __type, void *__here)
-+{
-+ __VXH_BODY(__type, __VXH_LONG, __here)
-+}
++#ifdef CONFIG_VSERVER_PRIVACY
++#define VS_ADMIN_P (0)
++#define VS_WATCH_P (0)
++#else
++#define VS_ADMIN_P VS_ADMIN
++#define VS_WATCH_P VS_WATCH
++#endif
+
++#define VS_HARDIRQ 0x1000
++#define VS_SOFTIRQ 0x2000
++#define VS_IRQ 0x4000
+
-+static inline
-+void __vxh_throw_oops(void *__here)
++#define VS_IRQ_MASK 0xF000
++
++#include <linux/hardirq.h>
++
++/*
++ * check current context for ADMIN/WATCH and
++ * optionally against supplied argument
++ */
++static inline int __vs_check(int cid, int id, unsigned int mode)
+{
-+ __VXH_BODY(VXH_THROW_OOPS, {}, __here);
-+ /* prevent further acquisition */
-+ vxh_active = 0;
++ if (mode & VS_ARG_MASK) {
++ if ((mode & VS_IDENT) && (id == cid))
++ return 1;
++ }
++ if (mode & VS_ATR_MASK) {
++ if ((mode & VS_DYNAMIC) &&
++ (id >= MIN_D_CONTEXT) &&
++ (id <= MAX_S_CONTEXT))
++ return 1;
++ if ((mode & VS_STATIC) &&
++ (id > 1) && (id < MIN_D_CONTEXT))
++ return 1;
++ }
++ if (mode & VS_IRQ_MASK) {
++ if ((mode & VS_IRQ) && unlikely(in_interrupt()))
++ return 1;
++ if ((mode & VS_HARDIRQ) && unlikely(in_irq()))
++ return 1;
++ if ((mode & VS_SOFTIRQ) && unlikely(in_softirq()))
++ return 1;
++ }
++ return (((mode & VS_ADMIN) && (cid == 0)) ||
++ ((mode & VS_WATCH) && (cid == 1)) ||
++ ((mode & VS_HOSTID) && (id == 0)));
+}
+
++#define vx_check(c, m) __vs_check(vx_current_xid(), c, (m) | VS_IRQ)
+
-+#define vxh_throw_oops() __vxh_throw_oops(__HERE__);
++#define vx_weak_check(c, m) ((m) ? vx_check(c, m) : 1)
+
-+#define __vxh_get_vx_info(v, h) __vxh_smpl(v, VXH_GET_VX_INFO, h);
-+#define __vxh_put_vx_info(v, h) __vxh_smpl(v, VXH_PUT_VX_INFO, h);
+
-+#define __vxh_init_vx_info(v, d, h) \
-+ __vxh_data(v, d, VXH_INIT_VX_INFO, h);
-+#define __vxh_set_vx_info(v, d, h) \
-+ __vxh_data(v, d, VXH_SET_VX_INFO, h);
-+#define __vxh_clr_vx_info(v, d, h) \
-+ __vxh_data(v, d, VXH_CLR_VX_INFO, h);
++#define nx_check(c, m) __vs_check(nx_current_nid(), c, m)
+
-+#define __vxh_claim_vx_info(v, d, h) \
-+ __vxh_data(v, d, VXH_CLAIM_VX_INFO, h);
-+#define __vxh_release_vx_info(v, d, h) \
-+ __vxh_data(v, d, VXH_RELEASE_VX_INFO, h);
++#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
-+#define vxh_alloc_vx_info(v) \
-+ __vxh_smpl(v, VXH_ALLOC_VX_INFO, __HERE__);
-+#define vxh_dealloc_vx_info(v) \
-+ __vxh_smpl(v, VXH_DEALLOC_VX_INFO, __HERE__);
++#endif
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/context.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/context.h
+--- linux-2.6.32.59/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/context.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,184 @@
++#ifndef _VX_CONTEXT_H
++#define _VX_CONTEXT_H
+
-+#define vxh_hash_vx_info(v) \
-+ __vxh_smpl(v, VXH_HASH_VX_INFO, __HERE__);
-+#define vxh_unhash_vx_info(v) \
-+ __vxh_smpl(v, VXH_UNHASH_VX_INFO, __HERE__);
++#include <linux/types.h>
++#include <linux/capability.h>
+
-+#define vxh_loc_vx_info(v, l) \
-+ __vxh_long(v, l, VXH_LOC_VX_INFO, __HERE__);
-+#define vxh_lookup_vx_info(v, l) \
-+ __vxh_long(v, l, VXH_LOOKUP_VX_INFO, __HERE__);
-+#define vxh_create_vx_info(v, l) \
-+ __vxh_long(v, l, VXH_CREATE_VX_INFO, __HERE__);
+
-+extern void vxh_dump_history(void);
++/* context flags */
+
++#define VXF_INFO_SCHED 0x00000002
++#define VXF_INFO_NPROC 0x00000004
++#define VXF_INFO_PRIVATE 0x00000008
+
-+#else /* CONFIG_VSERVER_HISTORY */
++#define VXF_INFO_INIT 0x00000010
++#define VXF_INFO_HIDE 0x00000020
++#define VXF_INFO_ULIMIT 0x00000040
++#define VXF_INFO_NSPACE 0x00000080
+
-+#define __HERE__ 0
++#define VXF_SCHED_HARD 0x00000100
++#define VXF_SCHED_PRIO 0x00000200
++#define VXF_SCHED_PAUSE 0x00000400
+
-+#define vxh_throw_oops() do { } while (0)
++#define VXF_VIRT_MEM 0x00010000
++#define VXF_VIRT_UPTIME 0x00020000
++#define VXF_VIRT_CPU 0x00040000
++#define VXF_VIRT_LOAD 0x00080000
++#define VXF_VIRT_TIME 0x00100000
+
-+#define __vxh_get_vx_info(v, h) do { } while (0)
-+#define __vxh_put_vx_info(v, h) do { } while (0)
++#define VXF_HIDE_MOUNT 0x01000000
++/* was VXF_HIDE_NETIF 0x02000000 */
++#define VXF_HIDE_VINFO 0x04000000
+
-+#define __vxh_init_vx_info(v, d, h) do { } while (0)
-+#define __vxh_set_vx_info(v, d, h) do { } while (0)
-+#define __vxh_clr_vx_info(v, d, h) do { } while (0)
++#define VXF_STATE_SETUP (1ULL << 32)
++#define VXF_STATE_INIT (1ULL << 33)
++#define VXF_STATE_ADMIN (1ULL << 34)
+
-+#define __vxh_claim_vx_info(v, d, h) do { } while (0)
-+#define __vxh_release_vx_info(v, d, h) do { } while (0)
++#define VXF_SC_HELPER (1ULL << 36)
++#define VXF_REBOOT_KILL (1ULL << 37)
++#define VXF_PERSISTENT (1ULL << 38)
+
-+#define vxh_alloc_vx_info(v) do { } while (0)
-+#define vxh_dealloc_vx_info(v) do { } while (0)
++#define VXF_FORK_RSS (1ULL << 48)
++#define VXF_PROLIFIC (1ULL << 49)
+
-+#define vxh_hash_vx_info(v) do { } while (0)
-+#define vxh_unhash_vx_info(v) do { } while (0)
++#define VXF_IGNEG_NICE (1ULL << 52)
+
-+#define vxh_loc_vx_info(v, l) do { } while (0)
-+#define vxh_lookup_vx_info(v, l) do { } while (0)
-+#define vxh_create_vx_info(v, l) do { } while (0)
++#define VXF_ONE_TIME (0x0007ULL << 32)
+
-+#define vxh_dump_history() do { } while (0)
++#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN)
+
+
-+#endif /* CONFIG_VSERVER_HISTORY */
++/* context migration */
+
-+#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/inode_cmd.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/inode_cmd.h
---- linux-2.6.32.6/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/inode_cmd.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,59 @@
-+#ifndef _VX_INODE_CMD_H
-+#define _VX_INODE_CMD_H
++#define VXM_SET_INIT 0x00000001
++#define VXM_SET_REAPER 0x00000002
+
++/* context caps */
+
-+/* inode vserver commands */
++#define VXC_CAP_MASK 0x00000000
+
-+#define VCMD_get_iattr VC_CMD(INODE, 1, 1)
-+#define VCMD_set_iattr VC_CMD(INODE, 2, 1)
++#define VXC_SET_UTSNAME 0x00000001
++#define VXC_SET_RLIMIT 0x00000002
++#define VXC_FS_SECURITY 0x00000004
++#define VXC_FS_TRUSTED 0x00000008
++#define VXC_TIOCSTI 0x00000010
+
-+#define VCMD_fget_iattr VC_CMD(INODE, 3, 0)
-+#define VCMD_fset_iattr VC_CMD(INODE, 4, 0)
++/* was VXC_RAW_ICMP 0x00000100 */
++#define VXC_SYSLOG 0x00001000
++#define VXC_OOM_ADJUST 0x00002000
++#define VXC_AUDIT_CONTROL 0x00004000
+
-+struct vcmd_ctx_iattr_v1 {
-+ const char __user *name;
-+ uint32_t tag;
-+ uint32_t flags;
-+ uint32_t mask;
-+};
++#define VXC_SECURE_MOUNT 0x00010000
++#define VXC_SECURE_REMOUNT 0x00020000
++#define VXC_BINARY_MOUNT 0x00040000
+
-+struct vcmd_ctx_fiattr_v0 {
-+ uint32_t tag;
-+ uint32_t flags;
-+ uint32_t mask;
-+};
++#define VXC_QUOTA_CTL 0x00100000
++#define VXC_ADMIN_MAPPER 0x00200000
++#define VXC_ADMIN_CLOOP 0x00400000
+
++#define VXC_KTHREAD 0x01000000
++#define VXC_NAMESPACE 0x02000000
+
-+#ifdef __KERNEL__
+
++#ifdef __KERNEL__
+
-+#ifdef CONFIG_COMPAT
++#include <linux/list.h>
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
+
-+#include <asm/compat.h>
++#include "limit_def.h"
++#include "sched_def.h"
++#include "cvirt_def.h"
++#include "cacct_def.h"
++#include "device_def.h"
+
-+struct vcmd_ctx_iattr_v1_x32 {
-+ compat_uptr_t name_ptr;
-+ uint32_t tag;
-+ uint32_t flags;
-+ uint32_t mask;
++#define VX_SPACES 2
++
++struct _vx_info_pc {
++ struct _vx_sched_pc sched_pc;
++ struct _vx_cvirt_pc cvirt_pc;
+};
+
-+#endif /* CONFIG_COMPAT */
++struct vx_info {
++ struct hlist_node vx_hlist; /* linked list of contexts */
++ xid_t vx_id; /* context id */
++ atomic_t vx_usecnt; /* usage count */
++ atomic_t vx_tasks; /* tasks count */
++ struct vx_info *vx_parent; /* parent context */
++ int vx_state; /* context state */
+
-+#include <linux/compiler.h>
++ unsigned long vx_nsmask[VX_SPACES]; /* assignment mask */
++ struct nsproxy *vx_nsproxy[VX_SPACES]; /* private namespaces */
++ struct fs_struct *vx_fs[VX_SPACES]; /* private namespace fs */
+
-+extern int vc_get_iattr(void __user *);
-+extern int vc_set_iattr(void __user *);
++ uint64_t vx_flags; /* context flags */
++ uint64_t vx_ccaps; /* context caps (vserver) */
++ kernel_cap_t vx_bcaps; /* bounding caps (system) */
++ unsigned long vx_umask; /* unshare mask (guest) */
+
-+extern int vc_fget_iattr(uint32_t, void __user *);
-+extern int vc_fset_iattr(uint32_t, void __user *);
++ struct task_struct *vx_reaper; /* guest reaper process */
++ pid_t vx_initpid; /* PID of guest init */
++ int64_t vx_badness_bias; /* OOM points bias */
+
-+#ifdef CONFIG_COMPAT
++ struct _vx_limit limit; /* vserver limits */
++ struct _vx_sched sched; /* vserver scheduler */
++ struct _vx_cvirt cvirt; /* virtual/bias stuff */
++ struct _vx_cacct cacct; /* context accounting */
+
-+extern int vc_get_iattr_x32(void __user *);
-+extern int vc_set_iattr_x32(void __user *);
++ struct _vx_device dmap; /* default device map targets */
+
-+#endif /* CONFIG_COMPAT */
++#ifndef CONFIG_SMP
++ struct _vx_info_pc info_pc; /* per cpu data */
++#else
++ struct _vx_info_pc *ptr_pc; /* per cpu array */
++#endif
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/inode.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/inode.h
---- linux-2.6.32.6/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/inode.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,39 @@
-+#ifndef _VX_INODE_H
-+#define _VX_INODE_H
++ wait_queue_head_t vx_wait; /* context exit waitqueue */
++ int reboot_cmd; /* last sys_reboot() cmd */
++ int exit_code; /* last process exit code */
+
++ char vx_name[65]; /* vserver name */
++};
+
-+#define IATTR_TAG 0x01000000
++#ifndef CONFIG_SMP
++#define vx_ptr_pc(vxi) (&(vxi)->info_pc)
++#define vx_per_cpu(vxi, v, id) vx_ptr_pc(vxi)->v
++#else
++#define vx_ptr_pc(vxi) ((vxi)->ptr_pc)
++#define vx_per_cpu(vxi, v, id) per_cpu_ptr(vx_ptr_pc(vxi), id)->v
++#endif
+
-+#define IATTR_ADMIN 0x00000001
-+#define IATTR_WATCH 0x00000002
-+#define IATTR_HIDE 0x00000004
-+#define IATTR_FLAGS 0x00000007
++#define vx_cpu(vxi, v) vx_per_cpu(vxi, v, smp_processor_id())
+
-+#define IATTR_BARRIER 0x00010000
-+#define IATTR_IXUNLINK 0x00020000
-+#define IATTR_IMMUTABLE 0x00040000
-+#define IATTR_COW 0x00080000
+
-+#ifdef __KERNEL__
++struct vx_info_save {
++ struct vx_info *vxi;
++ xid_t xid;
++};
+
+
-+#ifdef CONFIG_VSERVER_PROC_SECURE
-+#define IATTR_PROC_DEFAULT ( IATTR_ADMIN | IATTR_HIDE )
-+#define IATTR_PROC_SYMLINK ( IATTR_ADMIN )
-+#else
-+#define IATTR_PROC_DEFAULT ( IATTR_ADMIN )
-+#define IATTR_PROC_SYMLINK ( IATTR_ADMIN )
-+#endif
++/* status flags */
+
-+#define vx_hide_check(c, m) (((m) & IATTR_HIDE) ? vx_check(c, m) : 1)
++#define VXS_HASHED 0x0001
++#define VXS_PAUSED 0x0010
++#define VXS_SHUTDOWN 0x0100
++#define VXS_HELPER 0x1000
++#define VXS_RELEASED 0x8000
+
-+#endif /* __KERNEL__ */
+
-+/* inode ioctls */
++extern void claim_vx_info(struct vx_info *, struct task_struct *);
++extern void release_vx_info(struct vx_info *, struct task_struct *);
+
-+#define FIOC_GETXFLG _IOR('x', 5, long)
-+#define FIOC_SETXFLG _IOW('x', 6, long)
++extern struct vx_info *lookup_vx_info(int);
++extern struct vx_info *lookup_or_create_vx_info(int);
+
-+#else /* _VX_INODE_H */
-+#warning duplicate inclusion
-+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/Kbuild linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/Kbuild
---- linux-2.6.32.6/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/Kbuild 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,8 @@
++extern int get_xid_list(int, unsigned int *, int);
++extern int xid_is_hashed(xid_t);
+
-+unifdef-y += context_cmd.h network_cmd.h space_cmd.h \
-+ cacct_cmd.h cvirt_cmd.h limit_cmd.h dlimit_cmd.h \
-+ inode_cmd.h tag_cmd.h sched_cmd.h signal_cmd.h \
-+ debug_cmd.h device_cmd.h
++extern int vx_migrate_task(struct task_struct *, struct vx_info *, int);
+
-+unifdef-y += switch.h network.h monitor.h inode.h device.h
++extern long vs_state_change(struct vx_info *, unsigned int);
+
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/limit_cmd.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/limit_cmd.h
---- linux-2.6.32.6/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/limit_cmd.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,71 @@
-+#ifndef _VX_LIMIT_CMD_H
-+#define _VX_LIMIT_CMD_H
++
++#endif /* __KERNEL__ */
++#endif /* _VX_CONTEXT_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/context_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/context_cmd.h
+--- linux-2.6.32.59/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/context_cmd.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,145 @@
++#ifndef _VX_CONTEXT_CMD_H
++#define _VX_CONTEXT_CMD_H
+
+
-+/* rlimit vserver commands */
++/* vinfo commands */
+
-+#define VCMD_get_rlimit VC_CMD(RLIMIT, 1, 0)
-+#define VCMD_set_rlimit VC_CMD(RLIMIT, 2, 0)
-+#define VCMD_get_rlimit_mask VC_CMD(RLIMIT, 3, 0)
-+#define VCMD_reset_hits VC_CMD(RLIMIT, 7, 0)
-+#define VCMD_reset_minmax VC_CMD(RLIMIT, 9, 0)
++#define VCMD_task_xid VC_CMD(VINFO, 1, 0)
+
-+struct vcmd_ctx_rlimit_v0 {
-+ uint32_t id;
-+ uint64_t minimum;
-+ uint64_t softlimit;
-+ uint64_t maximum;
-+};
++#ifdef __KERNEL__
++extern int vc_task_xid(uint32_t);
+
-+struct vcmd_ctx_rlimit_mask_v0 {
-+ uint32_t minimum;
-+ uint32_t softlimit;
-+ uint32_t maximum;
-+};
++#endif /* __KERNEL__ */
+
-+#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0)
++#define VCMD_vx_info VC_CMD(VINFO, 5, 0)
+
-+struct vcmd_rlimit_stat_v0 {
-+ uint32_t id;
-+ uint32_t hits;
-+ uint64_t value;
-+ uint64_t minimum;
-+ uint64_t maximum;
++struct vcmd_vx_info_v0 {
++ uint32_t xid;
++ uint32_t initpid;
++ /* more to come */
+};
+
-+#define CRLIM_UNSET (0ULL)
-+#define CRLIM_INFINITY (~0ULL)
-+#define CRLIM_KEEP (~1ULL)
-+
+#ifdef __KERNEL__
++extern int vc_vx_info(struct vx_info *, void __user *);
+
-+#ifdef CONFIG_IA32_EMULATION
++#endif /* __KERNEL__ */
+
-+struct vcmd_ctx_rlimit_v0_x32 {
-+ uint32_t id;
-+ uint64_t minimum;
-+ uint64_t softlimit;
-+ uint64_t maximum;
-+} __attribute__ ((packed));
++#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0)
+
-+#endif /* CONFIG_IA32_EMULATION */
++struct vcmd_ctx_stat_v0 {
++ uint32_t usecnt;
++ uint32_t tasks;
++ /* more to come */
++};
+
-+#include <linux/compiler.h>
++#ifdef __KERNEL__
++extern int vc_ctx_stat(struct vx_info *, void __user *);
+
-+extern int vc_get_rlimit_mask(uint32_t, void __user *);
-+extern int vc_get_rlimit(struct vx_info *, void __user *);
-+extern int vc_set_rlimit(struct vx_info *, void __user *);
-+extern int vc_reset_hits(struct vx_info *, void __user *);
-+extern int vc_reset_minmax(struct vx_info *, void __user *);
++#endif /* __KERNEL__ */
+
-+extern int vc_rlimit_stat(struct vx_info *, void __user *);
++/* context commands */
+
-+#ifdef CONFIG_IA32_EMULATION
++#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0)
++#define VCMD_ctx_create VC_CMD(VPROC, 1, 1)
+
-+extern int vc_get_rlimit_x32(struct vx_info *, void __user *);
-+extern int vc_set_rlimit_x32(struct vx_info *, void __user *);
++struct vcmd_ctx_create {
++ uint64_t flagword;
++};
+
-+#endif /* CONFIG_IA32_EMULATION */
++#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0)
++#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1)
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/limit_def.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/limit_def.h
---- linux-2.6.32.6/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/limit_def.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,47 @@
-+#ifndef _VX_LIMIT_DEF_H
-+#define _VX_LIMIT_DEF_H
++struct vcmd_ctx_migrate {
++ uint64_t flagword;
++};
+
-+#include <asm/atomic.h>
-+#include <asm/resource.h>
++#ifdef __KERNEL__
++extern int vc_ctx_create(uint32_t, void __user *);
++extern int vc_ctx_migrate(struct vx_info *, void __user *);
+
-+#include "limit.h"
++#endif /* __KERNEL__ */
+
+
-+struct _vx_res_limit {
-+ rlim_t soft; /* Context soft limit */
-+ rlim_t hard; /* Context hard limit */
++/* flag commands */
+
-+ rlim_atomic_t rcur; /* Current value */
-+ rlim_t rmin; /* Context minimum */
-+ rlim_t rmax; /* Context maximum */
++#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0)
++#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0)
+
-+ atomic_t lhit; /* Limit hits */
++struct vcmd_ctx_flags_v0 {
++ uint64_t flagword;
++ uint64_t mask;
+};
+
-+/* context sub struct */
++#ifdef __KERNEL__
++extern int vc_get_cflags(struct vx_info *, void __user *);
++extern int vc_set_cflags(struct vx_info *, void __user *);
+
-+struct _vx_limit {
-+ struct _vx_res_limit res[NUM_LIMITS];
-+};
++#endif /* __KERNEL__ */
+
-+#ifdef CONFIG_VSERVER_DEBUG
+
-+static inline void __dump_vx_limit(struct _vx_limit *limit)
-+{
-+ int i;
++/* context caps commands */
+
-+ printk("\t_vx_limit:");
-+ for (i = 0; i < NUM_LIMITS; i++) {
-+ printk("\t [%2d] = %8lu %8lu/%8lu, %8ld/%8ld, %8d\n",
-+ i, (unsigned long)__rlim_get(limit, i),
-+ (unsigned long)__rlim_rmin(limit, i),
-+ (unsigned long)__rlim_rmax(limit, i),
-+ (long)__rlim_soft(limit, i),
-+ (long)__rlim_hard(limit, i),
-+ atomic_read(&__rlim_lhit(limit, i)));
-+ }
-+}
-+
-+#endif
++#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1)
++#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1)
+
-+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/limit.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/limit.h
---- linux-2.6.32.6/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/limit.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,70 @@
-+#ifndef _VX_LIMIT_H
-+#define _VX_LIMIT_H
++struct vcmd_ctx_caps_v1 {
++ uint64_t ccaps;
++ uint64_t cmask;
++};
+
-+#define VLIMIT_NSOCK 16
-+#define VLIMIT_OPENFD 17
-+#define VLIMIT_ANON 18
-+#define VLIMIT_SHMEM 19
-+#define VLIMIT_SEMARY 20
-+#define VLIMIT_NSEMS 21
-+#define VLIMIT_DENTRY 22
-+#define VLIMIT_MAPPED 23
++#ifdef __KERNEL__
++extern int vc_get_ccaps(struct vx_info *, void __user *);
++extern int vc_set_ccaps(struct vx_info *, void __user *);
+
++#endif /* __KERNEL__ */
+
-+#ifdef __KERNEL__
+
-+#define VLIM_NOCHECK ((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS))
++/* bcaps commands */
+
-+/* keep in sync with CRLIM_INFINITY */
++#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0)
++#define VCMD_set_bcaps VC_CMD(FLAGS, 10, 0)
+
-+#define VLIM_INFINITY (~0ULL)
++struct vcmd_bcaps {
++ uint64_t bcaps;
++ uint64_t bmask;
++};
+
-+#include <asm/atomic.h>
-+#include <asm/resource.h>
++#ifdef __KERNEL__
++extern int vc_get_bcaps(struct vx_info *, void __user *);
++extern int vc_set_bcaps(struct vx_info *, void __user *);
+
-+#ifndef RLIM_INFINITY
-+#warning RLIM_INFINITY is undefined
-+#endif
++#endif /* __KERNEL__ */
+
-+#define __rlim_val(l, r, v) ((l)->res[r].v)
+
-+#define __rlim_soft(l, r) __rlim_val(l, r, soft)
-+#define __rlim_hard(l, r) __rlim_val(l, r, hard)
++/* umask commands */
+
-+#define __rlim_rcur(l, r) __rlim_val(l, r, rcur)
-+#define __rlim_rmin(l, r) __rlim_val(l, r, rmin)
-+#define __rlim_rmax(l, r) __rlim_val(l, r, rmax)
++#define VCMD_get_umask VC_CMD(FLAGS, 13, 0)
++#define VCMD_set_umask VC_CMD(FLAGS, 14, 0)
+
-+#define __rlim_lhit(l, r) __rlim_val(l, r, lhit)
-+#define __rlim_hit(l, r) atomic_inc(&__rlim_lhit(l, r))
++struct vcmd_umask {
++ uint64_t umask;
++ uint64_t mask;
++};
+
-+typedef atomic_long_t rlim_atomic_t;
-+typedef unsigned long rlim_t;
++#ifdef __KERNEL__
++extern int vc_get_umask(struct vx_info *, void __user *);
++extern int vc_set_umask(struct vx_info *, void __user *);
+
-+#define __rlim_get(l, r) atomic_long_read(&__rlim_rcur(l, r))
-+#define __rlim_set(l, r, v) atomic_long_set(&__rlim_rcur(l, r), v)
-+#define __rlim_inc(l, r) atomic_long_inc(&__rlim_rcur(l, r))
-+#define __rlim_dec(l, r) atomic_long_dec(&__rlim_rcur(l, r))
-+#define __rlim_add(l, r, v) atomic_long_add(v, &__rlim_rcur(l, r))
-+#define __rlim_sub(l, r, v) atomic_long_sub(v, &__rlim_rcur(l, r))
++#endif /* __KERNEL__ */
+
+
-+#if (RLIM_INFINITY == VLIM_INFINITY)
-+#define VX_VLIM(r) ((long long)(long)(r))
-+#define VX_RLIM(v) ((rlim_t)(v))
-+#else
-+#define VX_VLIM(r) (((r) == RLIM_INFINITY) \
-+ ? VLIM_INFINITY : (long long)(r))
-+#define VX_RLIM(v) (((v) == VLIM_INFINITY) \
-+ ? RLIM_INFINITY : (rlim_t)(v))
-+#endif
++/* OOM badness */
+
-+struct sysinfo;
++#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0)
++#define VCMD_set_badness VC_CMD(MEMCTRL, 6, 0)
+
-+void vx_vsi_meminfo(struct sysinfo *);
-+void vx_vsi_swapinfo(struct sysinfo *);
++struct vcmd_badness_v0 {
++ int64_t bias;
++};
+
-+#define NUM_LIMITS 24
++#ifdef __KERNEL__
++extern int vc_get_badness(struct vx_info *, void __user *);
++extern int vc_set_badness(struct vx_info *, void __user *);
+
+#endif /* __KERNEL__ */
-+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/limit_int.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/limit_int.h
---- linux-2.6.32.6/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/limit_int.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,198 @@
-+#ifndef _VX_LIMIT_INT_H
-+#define _VX_LIMIT_INT_H
++#endif /* _VX_CONTEXT_CMD_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cvirt.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cvirt.h
+--- linux-2.6.32.59/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cvirt.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,20 @@
++#ifndef _VX_CVIRT_H
++#define _VX_CVIRT_H
+
-+#include "context.h"
+
+#ifdef __KERNEL__
+
-+#define VXD_RCRES_COND(r) VXD_CBIT(cres, r)
-+#define VXD_RLIMIT_COND(r) VXD_CBIT(limit, r)
-+
-+extern const char *vlimit_name[NUM_LIMITS];
++struct timespec;
+
-+static inline void __vx_acc_cres(struct vx_info *vxi,
-+ int res, int dir, void *_data, char *_file, int _line)
-+{
-+ if (VXD_RCRES_COND(res))
-+ vxlprintk(1, "vx_acc_cres[%5d,%s,%2d]: %5ld%s (%p)",
-+ (vxi ? vxi->vx_id : -1), vlimit_name[res], res,
-+ (vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
-+ (dir > 0) ? "++" : "--", _data, _file, _line);
-+ if (!vxi)
-+ return;
++void vx_vsi_uptime(struct timespec *, struct timespec *);
+
-+ if (dir > 0)
-+ __rlim_inc(&vxi->limit, res);
-+ else
-+ __rlim_dec(&vxi->limit, res);
-+}
+
-+static inline void __vx_add_cres(struct vx_info *vxi,
-+ int res, int amount, void *_data, char *_file, int _line)
-+{
-+ if (VXD_RCRES_COND(res))
-+ vxlprintk(1, "vx_add_cres[%5d,%s,%2d]: %5ld += %5d (%p)",
-+ (vxi ? vxi->vx_id : -1), vlimit_name[res], res,
-+ (vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
-+ amount, _data, _file, _line);
-+ if (amount == 0)
-+ return;
-+ if (!vxi)
-+ return;
-+ __rlim_add(&vxi->limit, res, amount);
-+}
++struct vx_info;
+
-+static inline
-+int __vx_cres_adjust_max(struct _vx_limit *limit, int res, rlim_t value)
-+{
-+ int cond = (value > __rlim_rmax(limit, res));
++void vx_update_load(struct vx_info *);
+
-+ if (cond)
-+ __rlim_rmax(limit, res) = value;
-+ return cond;
-+}
+
-+static inline
-+int __vx_cres_adjust_min(struct _vx_limit *limit, int res, rlim_t value)
-+{
-+ int cond = (value < __rlim_rmin(limit, res));
++int vx_do_syslog(int, char __user *, int);
+
-+ if (cond)
-+ __rlim_rmin(limit, res) = value;
-+ return cond;
-+}
++#endif /* __KERNEL__ */
++#endif /* _VX_CVIRT_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cvirt_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cvirt_cmd.h
+--- linux-2.6.32.59/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cvirt_cmd.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,53 @@
++#ifndef _VX_CVIRT_CMD_H
++#define _VX_CVIRT_CMD_H
+
-+static inline
-+void __vx_cres_fixup(struct _vx_limit *limit, int res, rlim_t value)
-+{
-+ if (!__vx_cres_adjust_max(limit, res, value))
-+ __vx_cres_adjust_min(limit, res, value);
-+}
+
++/* virtual host info name commands */
+
-+/* return values:
-+ +1 ... no limit hit
-+ -1 ... over soft limit
-+ 0 ... over hard limit */
++#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0)
++#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0)
+
-+static inline int __vx_cres_avail(struct vx_info *vxi,
-+ int res, int num, char *_file, int _line)
-+{
-+ struct _vx_limit *limit;
-+ rlim_t value;
++struct vcmd_vhi_name_v0 {
++ uint32_t field;
++ char name[65];
++};
+
-+ if (VXD_RLIMIT_COND(res))
-+ vxlprintk(1, "vx_cres_avail[%5d,%s,%2d]: %5ld/%5ld > %5ld + %5d",
-+ (vxi ? vxi->vx_id : -1), vlimit_name[res], res,
-+ (vxi ? (long)__rlim_soft(&vxi->limit, res) : -1),
-+ (vxi ? (long)__rlim_hard(&vxi->limit, res) : -1),
-+ (vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
-+ num, _file, _line);
-+ if (!vxi)
-+ return 1;
+
-+ limit = &vxi->limit;
-+ value = __rlim_get(limit, res);
++enum vhi_name_field {
++ VHIN_CONTEXT = 0,
++ VHIN_SYSNAME,
++ VHIN_NODENAME,
++ VHIN_RELEASE,
++ VHIN_VERSION,
++ VHIN_MACHINE,
++ VHIN_DOMAINNAME,
++};
+
-+ if (!__vx_cres_adjust_max(limit, res, value))
-+ __vx_cres_adjust_min(limit, res, value);
+
-+ if (num == 0)
-+ return 1;
++#ifdef __KERNEL__
+
-+ if (__rlim_soft(limit, res) == RLIM_INFINITY)
-+ return -1;
-+ if (value + num <= __rlim_soft(limit, res))
-+ return -1;
++#include <linux/compiler.h>
+
-+ if (__rlim_hard(limit, res) == RLIM_INFINITY)
-+ return 1;
-+ if (value + num <= __rlim_hard(limit, res))
-+ return 1;
++extern int vc_set_vhi_name(struct vx_info *, void __user *);
++extern int vc_get_vhi_name(struct vx_info *, void __user *);
+
-+ __rlim_hit(limit, res);
-+ return 0;
-+}
++#endif /* __KERNEL__ */
+
++#define VCMD_virt_stat VC_CMD(VSTAT, 3, 0)
+
-+static const int VLA_RSS[] = { RLIMIT_RSS, VLIMIT_ANON, VLIMIT_MAPPED, 0 };
++struct vcmd_virt_stat_v0 {
++ uint64_t offset;
++ uint64_t uptime;
++ uint32_t nr_threads;
++ uint32_t nr_running;
++ uint32_t nr_uninterruptible;
++ uint32_t nr_onhold;
++ uint32_t nr_forks;
++ uint32_t load[3];
++};
+
-+static inline
-+rlim_t __vx_cres_array_sum(struct _vx_limit *limit, const int *array)
-+{
-+ rlim_t value, sum = 0;
-+ int res;
++#ifdef __KERNEL__
++extern int vc_virt_stat(struct vx_info *, void __user *);
+
-+ while ((res = *array++)) {
-+ value = __rlim_get(limit, res);
-+ __vx_cres_fixup(limit, res, value);
-+ sum += value;
-+ }
-+ return sum;
-+}
++#endif /* __KERNEL__ */
++#endif /* _VX_CVIRT_CMD_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cvirt_def.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cvirt_def.h
+--- linux-2.6.32.59/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cvirt_def.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,80 @@
++#ifndef _VX_CVIRT_DEF_H
++#define _VX_CVIRT_DEF_H
+
-+static inline
-+rlim_t __vx_cres_array_fixup(struct _vx_limit *limit, const int *array)
-+{
-+ rlim_t value = __vx_cres_array_sum(limit, array + 1);
-+ int res = *array;
++#include <linux/jiffies.h>
++#include <linux/spinlock.h>
++#include <linux/wait.h>
++#include <linux/time.h>
++#include <asm/atomic.h>
+
-+ if (value == __rlim_get(limit, res))
-+ return value;
+
-+ __rlim_set(limit, res, value);
-+ /* now adjust min/max */
-+ if (!__vx_cres_adjust_max(limit, res, value))
-+ __vx_cres_adjust_min(limit, res, value);
++struct _vx_usage_stat {
++ uint64_t user;
++ uint64_t nice;
++ uint64_t system;
++ uint64_t softirq;
++ uint64_t irq;
++ uint64_t idle;
++ uint64_t iowait;
++};
+
-+ return value;
-+}
++struct _vx_syslog {
++ wait_queue_head_t log_wait;
++ spinlock_t logbuf_lock; /* lock for the log buffer */
+
-+static inline int __vx_cres_array_avail(struct vx_info *vxi,
-+ const int *array, int num, char *_file, int _line)
-+{
-+ struct _vx_limit *limit;
-+ rlim_t value = 0;
-+ int res;
++ unsigned long log_start; /* next char to be read by syslog() */
++ unsigned long con_start; /* next char to be sent to consoles */
++ unsigned long log_end; /* most-recently-written-char + 1 */
++ unsigned long logged_chars; /* #chars since last read+clear operation */
+
-+ if (num == 0)
-+ return 1;
-+ if (!vxi)
-+ return 1;
++ char log_buf[1024];
++};
+
-+ limit = &vxi->limit;
-+ res = *array;
-+ value = __vx_cres_array_sum(limit, array + 1);
+
-+ __rlim_set(limit, res, value);
-+ __vx_cres_fixup(limit, res, value);
++/* context sub struct */
+
-+ return __vx_cres_avail(vxi, res, num, _file, _line);
-+}
++struct _vx_cvirt {
++ atomic_t nr_threads; /* number of current threads */
++ atomic_t nr_running; /* number of running threads */
++ atomic_t nr_uninterruptible; /* number of uninterruptible threads */
+
++ atomic_t nr_onhold; /* processes on hold */
++ uint32_t onhold_last; /* jiffies when put on hold */
+
-+static inline void vx_limit_fixup(struct _vx_limit *limit, int id)
-+{
-+ rlim_t value;
-+ int res;
++ struct timeval bias_tv; /* time offset to the host */
++ struct timespec bias_idle;
++ struct timespec bias_uptime; /* context creation point */
++ uint64_t bias_clock; /* offset in clock_t */
+
-+ /* complex resources first */
-+ if ((id < 0) || (id == RLIMIT_RSS))
-+ __vx_cres_array_fixup(limit, VLA_RSS);
++ spinlock_t load_lock; /* lock for the load averages */
++ atomic_t load_updates; /* nr of load updates done so far */
++ uint32_t load_last; /* last time load was calculated */
++ uint32_t load[3]; /* load averages 1,5,15 */
+
-+ for (res = 0; res < NUM_LIMITS; res++) {
-+ if ((id > 0) && (res != id))
-+ continue;
++ atomic_t total_forks; /* number of forks so far */
+
-+ value = __rlim_get(limit, res);
-+ __vx_cres_fixup(limit, res, value);
++ struct _vx_syslog syslog;
++};
+
-+ /* not supposed to happen, maybe warn? */
-+ if (__rlim_rmax(limit, res) > __rlim_hard(limit, res))
-+ __rlim_rmax(limit, res) = __rlim_hard(limit, res);
-+ }
-+}
++struct _vx_cvirt_pc {
++ struct _vx_usage_stat cpustat;
++};
+
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/monitor.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/monitor.h
---- linux-2.6.32.6/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/monitor.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,96 @@
-+#ifndef _VX_MONITOR_H
-+#define _VX_MONITOR_H
++#ifdef CONFIG_VSERVER_DEBUG
+
-+#include <linux/types.h>
++static inline void __dump_vx_cvirt(struct _vx_cvirt *cvirt)
++{
++ printk("\t_vx_cvirt:\n");
++ printk("\t threads: %4d, %4d, %4d, %4d\n",
++ atomic_read(&cvirt->nr_threads),
++ atomic_read(&cvirt->nr_running),
++ atomic_read(&cvirt->nr_uninterruptible),
++ atomic_read(&cvirt->nr_onhold));
++ /* add rest here */
++ printk("\t total_forks = %d\n", atomic_read(&cvirt->total_forks));
++}
+
-+enum {
-+ VXM_UNUSED = 0,
++#endif
+
-+ VXM_SYNC = 0x10,
++#endif /* _VX_CVIRT_DEF_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/debug.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/debug.h
+--- linux-2.6.32.59/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/debug.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,127 @@
++#ifndef _VX_DEBUG_H
++#define _VX_DEBUG_H
+
-+ VXM_UPDATE = 0x20,
-+ VXM_UPDATE_1,
-+ VXM_UPDATE_2,
+
-+ VXM_RQINFO_1 = 0x24,
-+ VXM_RQINFO_2,
++#define VXD_CBIT(n, m) (vx_debug_ ## n & (1 << (m)))
++#define VXD_CMIN(n, m) (vx_debug_ ## n > (m))
++#define VXD_MASK(n, m) (vx_debug_ ## n & (m))
+
-+ VXM_ACTIVATE = 0x40,
-+ VXM_DEACTIVATE,
-+ VXM_IDLE,
++#define VXD_DEV(d) (d), (d)->bd_inode->i_ino, \
++ imajor((d)->bd_inode), iminor((d)->bd_inode)
++#define VXF_DEV "%p[%lu,%d:%d]"
+
-+ VXM_HOLD = 0x44,
-+ VXM_UNHOLD,
+
-+ VXM_MIGRATE = 0x48,
-+ VXM_RESCHED,
++#define vxd_path(p) \
++ ({ static char _buffer[PATH_MAX]; \
++ d_path(p, _buffer, sizeof(_buffer)); })
+
-+ /* all other bits are flags */
-+ VXM_SCHED = 0x80,
-+};
++#define vxd_cond_path(n) \
++ ((n) ? vxd_path(&(n)->path) : "<null>" )
+
-+struct _vxm_update_1 {
-+ uint32_t tokens_max;
-+ uint32_t fill_rate;
-+ uint32_t interval;
-+};
+
-+struct _vxm_update_2 {
-+ uint32_t tokens_min;
-+ uint32_t fill_rate;
-+ uint32_t interval;
-+};
++#ifdef CONFIG_VSERVER_DEBUG
+
-+struct _vxm_rqinfo_1 {
-+ uint16_t running;
-+ uint16_t onhold;
-+ uint16_t iowait;
-+ uint16_t uintr;
-+ uint32_t idle_tokens;
-+};
++extern unsigned int vx_debug_switch;
++extern unsigned int vx_debug_xid;
++extern unsigned int vx_debug_nid;
++extern unsigned int vx_debug_tag;
++extern unsigned int vx_debug_net;
++extern unsigned int vx_debug_limit;
++extern unsigned int vx_debug_cres;
++extern unsigned int vx_debug_dlim;
++extern unsigned int vx_debug_quota;
++extern unsigned int vx_debug_cvirt;
++extern unsigned int vx_debug_space;
++extern unsigned int vx_debug_misc;
+
-+struct _vxm_rqinfo_2 {
-+ uint32_t norm_time;
-+ uint32_t idle_time;
-+ uint32_t idle_skip;
-+};
+
-+struct _vxm_sched {
-+ uint32_t tokens;
-+ uint32_t norm_time;
-+ uint32_t idle_time;
-+};
++#define VX_LOGLEVEL "vxD: "
++#define VX_PROC_FMT "%p: "
++#define VX_PROCESS current
+
-+struct _vxm_task {
-+ uint16_t pid;
-+ uint16_t state;
-+};
++#define vxdprintk(c, f, x...) \
++ do { \
++ if (c) \
++ printk(VX_LOGLEVEL VX_PROC_FMT f "\n", \
++ VX_PROCESS , ##x); \
++ } while (0)
+
-+struct _vxm_event {
-+ uint32_t jif;
-+ union {
-+ uint32_t seq;
-+ uint32_t sec;
-+ };
-+ union {
-+ uint32_t tokens;
-+ uint32_t nsec;
-+ struct _vxm_task tsk;
-+ };
-+};
++#define vxlprintk(c, f, x...) \
++ do { \
++ if (c) \
++ printk(VX_LOGLEVEL f " @%s:%d\n", x); \
++ } while (0)
+
-+struct _vx_mon_entry {
-+ uint16_t type;
-+ uint16_t xid;
-+ union {
-+ struct _vxm_event ev;
-+ struct _vxm_sched sd;
-+ struct _vxm_update_1 u1;
-+ struct _vxm_update_2 u2;
-+ struct _vxm_rqinfo_1 q1;
-+ struct _vxm_rqinfo_2 q2;
-+ };
-+};
++#define vxfprintk(c, f, x...) \
++ do { \
++ if (c) \
++ printk(VX_LOGLEVEL f " %s@%s:%d\n", x); \
++ } while (0)
+
+
-+#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/network_cmd.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/network_cmd.h
---- linux-2.6.32.6/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/network_cmd.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,150 @@
-+#ifndef _VX_NETWORK_CMD_H
-+#define _VX_NETWORK_CMD_H
++struct vx_info;
+
++void dump_vx_info(struct vx_info *, int);
++void dump_vx_info_inactive(int);
+
-+/* vinfo commands */
++#else /* CONFIG_VSERVER_DEBUG */
+
-+#define VCMD_task_nid VC_CMD(VINFO, 2, 0)
++#define vx_debug_switch 0
++#define vx_debug_xid 0
++#define vx_debug_nid 0
++#define vx_debug_tag 0
++#define vx_debug_net 0
++#define vx_debug_limit 0
++#define vx_debug_cres 0
++#define vx_debug_dlim 0
++#define vx_debug_cvirt 0
+
-+#ifdef __KERNEL__
-+extern int vc_task_nid(uint32_t);
++#define vxdprintk(x...) do { } while (0)
++#define vxlprintk(x...) do { } while (0)
++#define vxfprintk(x...) do { } while (0)
+
-+#endif /* __KERNEL__ */
++#endif /* CONFIG_VSERVER_DEBUG */
+
-+#define VCMD_nx_info VC_CMD(VINFO, 6, 0)
+
-+struct vcmd_nx_info_v0 {
-+ uint32_t nid;
-+ /* more to come */
-+};
++#ifdef CONFIG_VSERVER_WARN
+
-+#ifdef __KERNEL__
-+extern int vc_nx_info(struct nx_info *, void __user *);
++#define VX_WARNLEVEL KERN_WARNING "vxW: "
++#define VX_WARN_TASK "[»%s«,%u:#%u|%u|%u] "
++#define VX_WARN_XID "[xid #%u] "
++#define VX_WARN_NID "[nid #%u] "
++#define VX_WARN_TAG "[tag #%u] "
+
-+#endif /* __KERNEL__ */
++#define vxwprintk(c, f, x...) \
++ do { \
++ if (c) \
++ printk(VX_WARNLEVEL f "\n", ##x); \
++ } while (0)
+
-+#include <linux/in.h>
-+#include <linux/in6.h>
++#else /* CONFIG_VSERVER_WARN */
+
-+#define VCMD_net_create_v0 VC_CMD(VNET, 1, 0)
-+#define VCMD_net_create VC_CMD(VNET, 1, 1)
++#define vxwprintk(x...) do { } while (0)
+
-+struct vcmd_net_create {
-+ uint64_t flagword;
-+};
++#endif /* CONFIG_VSERVER_WARN */
+
-+#define VCMD_net_migrate VC_CMD(NETMIG, 1, 0)
++#define vxwprintk_task(c, f, x...) \
++ vxwprintk(c, VX_WARN_TASK f, \
++ current->comm, current->pid, \
++ current->xid, current->nid, current->tag, ##x)
++#define vxwprintk_xid(c, f, x...) \
++ vxwprintk(c, VX_WARN_XID f, current->xid, x)
++#define vxwprintk_nid(c, f, x...) \
++ vxwprintk(c, VX_WARN_NID f, current->nid, x)
++#define vxwprintk_tag(c, f, x...) \
++ vxwprintk(c, VX_WARN_TAG f, current->tag, x)
+
-+#define VCMD_net_add VC_CMD(NETALT, 1, 0)
-+#define VCMD_net_remove VC_CMD(NETALT, 2, 0)
++#ifdef CONFIG_VSERVER_DEBUG
++#define vxd_assert_lock(l) assert_spin_locked(l)
++#define vxd_assert(c, f, x...) vxlprintk(!(c), \
++ "assertion [" f "] failed.", ##x, __FILE__, __LINE__)
++#else
++#define vxd_assert_lock(l) do { } while (0)
++#define vxd_assert(c, f, x...) do { } while (0)
++#endif
+
-+struct vcmd_net_addr_v0 {
-+ uint16_t type;
-+ uint16_t count;
-+ struct in_addr ip[4];
-+ struct in_addr mask[4];
-+};
+
-+#define VCMD_net_add_ipv4 VC_CMD(NETALT, 1, 1)
-+#define VCMD_net_remove_ipv4 VC_CMD(NETALT, 2, 1)
++#endif /* _VX_DEBUG_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/debug_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/debug_cmd.h
+--- linux-2.6.32.59/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/debug_cmd.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,58 @@
++#ifndef _VX_DEBUG_CMD_H
++#define _VX_DEBUG_CMD_H
+
-+struct vcmd_net_addr_ipv4_v1 {
-+ uint16_t type;
-+ uint16_t flags;
-+ struct in_addr ip;
-+ struct in_addr mask;
-+};
+
-+#define VCMD_net_add_ipv6 VC_CMD(NETALT, 3, 1)
-+#define VCMD_net_remove_ipv6 VC_CMD(NETALT, 4, 1)
++/* debug commands */
+
-+struct vcmd_net_addr_ipv6_v1 {
-+ uint16_t type;
-+ uint16_t flags;
-+ uint32_t prefix;
-+ struct in6_addr ip;
-+ struct in6_addr mask;
-+};
++#define VCMD_dump_history VC_CMD(DEBUG, 1, 0)
+
-+#define VCMD_add_match_ipv4 VC_CMD(NETALT, 5, 0)
-+#define VCMD_get_match_ipv4 VC_CMD(NETALT, 6, 0)
++#define VCMD_read_history VC_CMD(DEBUG, 5, 0)
++#define VCMD_read_monitor VC_CMD(DEBUG, 6, 0)
+
-+struct vcmd_match_ipv4_v0 {
-+ uint16_t type;
-+ uint16_t flags;
-+ uint16_t parent;
-+ uint16_t prefix;
-+ struct in_addr ip;
-+ struct in_addr ip2;
-+ struct in_addr mask;
++struct vcmd_read_history_v0 {
++ uint32_t index;
++ uint32_t count;
++ char __user *data;
+};
+
-+#define VCMD_add_match_ipv6 VC_CMD(NETALT, 7, 0)
-+#define VCMD_get_match_ipv6 VC_CMD(NETALT, 8, 0)
-+
-+struct vcmd_match_ipv6_v0 {
-+ uint16_t type;
-+ uint16_t flags;
-+ uint16_t parent;
-+ uint16_t prefix;
-+ struct in6_addr ip;
-+ struct in6_addr ip2;
-+ struct in6_addr mask;
++struct vcmd_read_monitor_v0 {
++ uint32_t index;
++ uint32_t count;
++ char __user *data;
+};
+
+
+#ifdef __KERNEL__
-+extern int vc_net_create(uint32_t, void __user *);
-+extern int vc_net_migrate(struct nx_info *, void __user *);
-+
-+extern int vc_net_add(struct nx_info *, void __user *);
-+extern int vc_net_remove(struct nx_info *, void __user *);
+
-+extern int vc_net_add_ipv4(struct nx_info *, void __user *);
-+extern int vc_net_remove_ipv4(struct nx_info *, void __user *);
++#ifdef CONFIG_COMPAT
+
-+extern int vc_net_add_ipv6(struct nx_info *, void __user *);
-+extern int vc_net_remove_ipv6(struct nx_info *, void __user *);
++#include <asm/compat.h>
+
-+extern int vc_add_match_ipv4(struct nx_info *, void __user *);
-+extern int vc_get_match_ipv4(struct nx_info *, void __user *);
++struct vcmd_read_history_v0_x32 {
++ uint32_t index;
++ uint32_t count;
++ compat_uptr_t data_ptr;
++};
+
-+extern int vc_add_match_ipv6(struct nx_info *, void __user *);
-+extern int vc_get_match_ipv6(struct nx_info *, void __user *);
++struct vcmd_read_monitor_v0_x32 {
++ uint32_t index;
++ uint32_t count;
++ compat_uptr_t data_ptr;
++};
+
-+#endif /* __KERNEL__ */
++#endif /* CONFIG_COMPAT */
+
++extern int vc_dump_history(uint32_t);
+
-+/* flag commands */
++extern int vc_read_history(uint32_t, void __user *);
++extern int vc_read_monitor(uint32_t, void __user *);
+
-+#define VCMD_get_nflags VC_CMD(FLAGS, 5, 0)
-+#define VCMD_set_nflags VC_CMD(FLAGS, 6, 0)
++#ifdef CONFIG_COMPAT
+
-+struct vcmd_net_flags_v0 {
-+ uint64_t flagword;
-+ uint64_t mask;
-+};
++extern int vc_read_history_x32(uint32_t, void __user *);
++extern int vc_read_monitor_x32(uint32_t, void __user *);
+
-+#ifdef __KERNEL__
-+extern int vc_get_nflags(struct nx_info *, void __user *);
-+extern int vc_set_nflags(struct nx_info *, void __user *);
++#endif /* CONFIG_COMPAT */
+
+#endif /* __KERNEL__ */
++#endif /* _VX_DEBUG_CMD_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/device.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/device.h
+--- linux-2.6.32.59/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/device.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,15 @@
++#ifndef _VX_DEVICE_H
++#define _VX_DEVICE_H
+
+
-+/* network caps commands */
++#define DATTR_CREATE 0x00000001
++#define DATTR_OPEN 0x00000002
+
-+#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0)
-+#define VCMD_set_ncaps VC_CMD(FLAGS, 8, 0)
++#define DATTR_REMAP 0x00000010
+
-+struct vcmd_net_caps_v0 {
-+ uint64_t ncaps;
-+ uint64_t cmask;
-+};
++#define DATTR_MASK 0x00000013
+
-+#ifdef __KERNEL__
-+extern int vc_get_ncaps(struct nx_info *, void __user *);
-+extern int vc_set_ncaps(struct nx_info *, void __user *);
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/network.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/network.h
---- linux-2.6.32.6/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/network.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,146 @@
-+#ifndef _VX_NETWORK_H
-+#define _VX_NETWORK_H
++#else /* _VX_DEVICE_H */
++#warning duplicate inclusion
++#endif /* _VX_DEVICE_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/device_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/device_cmd.h
+--- linux-2.6.32.59/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/device_cmd.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,44 @@
++#ifndef _VX_DEVICE_CMD_H
++#define _VX_DEVICE_CMD_H
+
-+#include <linux/types.h>
+
++/* device vserver commands */
+
-+#define MAX_N_CONTEXT 65535 /* Arbitrary limit */
++#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0)
++#define VCMD_unset_mapping VC_CMD(DEVICE, 2, 0)
+
++struct vcmd_set_mapping_v0 {
++ const char __user *device;
++ const char __user *target;
++ uint32_t flags;
++};
+
-+/* network flags */
+
-+#define NXF_INFO_PRIVATE 0x00000008
++#ifdef __KERNEL__
+
-+#define NXF_SINGLE_IP 0x00000100
-+#define NXF_LBACK_REMAP 0x00000200
-+#define NXF_LBACK_ALLOW 0x00000400
++#ifdef CONFIG_COMPAT
+
-+#define NXF_HIDE_NETIF 0x02000000
-+#define NXF_HIDE_LBACK 0x04000000
++#include <asm/compat.h>
+
-+#define NXF_STATE_SETUP (1ULL << 32)
-+#define NXF_STATE_ADMIN (1ULL << 34)
++struct vcmd_set_mapping_v0_x32 {
++ compat_uptr_t device_ptr;
++ compat_uptr_t target_ptr;
++ uint32_t flags;
++};
+
-+#define NXF_SC_HELPER (1ULL << 36)
-+#define NXF_PERSISTENT (1ULL << 38)
++#endif /* CONFIG_COMPAT */
+
-+#define NXF_ONE_TIME (0x0005ULL << 32)
++#include <linux/compiler.h>
+
++extern int vc_set_mapping(struct vx_info *, void __user *);
++extern int vc_unset_mapping(struct vx_info *, void __user *);
+
-+#define NXF_INIT_SET (__nxf_init_set())
++#ifdef CONFIG_COMPAT
+
-+static inline uint64_t __nxf_init_set(void) {
-+ return NXF_STATE_ADMIN
-+#ifdef CONFIG_VSERVER_AUTO_LBACK
-+ | NXF_LBACK_REMAP
-+ | NXF_HIDE_LBACK
-+#endif
-+#ifdef CONFIG_VSERVER_AUTO_SINGLE
-+ | NXF_SINGLE_IP
-+#endif
-+ | NXF_HIDE_NETIF;
-+}
++extern int vc_set_mapping_x32(struct vx_info *, void __user *);
++extern int vc_unset_mapping_x32(struct vx_info *, void __user *);
+
++#endif /* CONFIG_COMPAT */
+
-+/* network caps */
++#endif /* __KERNEL__ */
++#endif /* _VX_DEVICE_CMD_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/device_def.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/device_def.h
+--- linux-2.6.32.59/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/device_def.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,17 @@
++#ifndef _VX_DEVICE_DEF_H
++#define _VX_DEVICE_DEF_H
+
-+#define NXC_TUN_CREATE 0x00000001
++#include <linux/types.h>
+
-+#define NXC_RAW_ICMP 0x00000100
++struct vx_dmap_target {
++ dev_t target;
++ uint32_t flags;
++};
+
++struct _vx_device {
++#ifdef CONFIG_VSERVER_DEVICE
++ struct vx_dmap_target targets[2];
++#endif
++};
+
-+/* address types */
++#endif /* _VX_DEVICE_DEF_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/dlimit.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/dlimit.h
+--- linux-2.6.32.59/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/dlimit.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,54 @@
++#ifndef _VX_DLIMIT_H
++#define _VX_DLIMIT_H
+
-+#define NXA_TYPE_IPV4 0x0001
-+#define NXA_TYPE_IPV6 0x0002
-+
-+#define NXA_TYPE_NONE 0x0000
-+#define NXA_TYPE_ANY 0x00FF
-+
-+#define NXA_TYPE_ADDR 0x0010
-+#define NXA_TYPE_MASK 0x0020
-+#define NXA_TYPE_RANGE 0x0040
-+
-+#define NXA_MASK_ALL (NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE)
++#include "switch.h"
+
-+#define NXA_MOD_BCAST 0x0100
-+#define NXA_MOD_LBACK 0x0200
+
-+#define NXA_LOOPBACK 0x1000
++#ifdef __KERNEL__
+
-+#define NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK)
-+#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
++/* keep in sync with CDLIM_INFINITY */
+
-+#ifdef __KERNEL__
++#define DLIM_INFINITY (~0ULL)
+
-+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/rcupdate.h>
-+#include <linux/in.h>
-+#include <linux/in6.h>
-+#include <asm/atomic.h>
+
-+struct nx_addr_v4 {
-+ struct nx_addr_v4 *next;
-+ struct in_addr ip[2];
-+ struct in_addr mask;
-+ uint16_t type;
-+ uint16_t flags;
-+};
++struct super_block;
+
-+struct nx_addr_v6 {
-+ struct nx_addr_v6 *next;
-+ struct in6_addr ip;
-+ struct in6_addr mask;
-+ uint32_t prefix;
-+ uint16_t type;
-+ uint16_t flags;
-+};
++struct dl_info {
++ struct hlist_node dl_hlist; /* linked list of contexts */
++ struct rcu_head dl_rcu; /* the rcu head */
++ tag_t dl_tag; /* context tag */
++ atomic_t dl_usecnt; /* usage count */
++ atomic_t dl_refcnt; /* reference count */
+
-+struct nx_info {
-+ struct hlist_node nx_hlist; /* linked list of nxinfos */
-+ nid_t nx_id; /* vnet id */
-+ atomic_t nx_usecnt; /* usage count */
-+ atomic_t nx_tasks; /* tasks count */
-+ int nx_state; /* context state */
++ struct super_block *dl_sb; /* associated superblock */
+
-+ uint64_t nx_flags; /* network flag word */
-+ uint64_t nx_ncaps; /* network capabilities */
++ spinlock_t dl_lock; /* protect the values */
+
-+ struct in_addr v4_lback; /* Loopback address */
-+ struct in_addr v4_bcast; /* Broadcast address */
-+ struct nx_addr_v4 v4; /* First/Single ipv4 address */
-+#ifdef CONFIG_IPV6
-+ struct nx_addr_v6 v6; /* First/Single ipv6 address */
-+#endif
-+ char nx_name[65]; /* network context name */
++ unsigned long long dl_space_used; /* used space in bytes */
++ unsigned long long dl_space_total; /* maximum space in bytes */
++ unsigned long dl_inodes_used; /* used inodes */
++ unsigned long dl_inodes_total; /* maximum inodes */
++
++ unsigned int dl_nrlmult; /* non root limit mult */
+};
+
++struct rcu_head;
+
-+/* status flags */
++extern void rcu_free_dl_info(struct rcu_head *);
++extern void unhash_dl_info(struct dl_info *);
+
-+#define NXS_HASHED 0x0001
-+#define NXS_SHUTDOWN 0x0100
-+#define NXS_RELEASED 0x8000
++extern struct dl_info *locate_dl_info(struct super_block *, tag_t);
+
-+extern struct nx_info *lookup_nx_info(int);
+
-+extern int get_nid_list(int, unsigned int *, int);
-+extern int nid_is_hashed(nid_t);
++struct kstatfs;
+
-+extern int nx_migrate_task(struct task_struct *, struct nx_info *);
++extern void vx_vsi_statfs(struct super_block *, struct kstatfs *);
+
-+extern long vs_net_change(struct nx_info *, unsigned int);
++typedef uint64_t dlsize_t;
+
-+struct sock;
++#endif /* __KERNEL__ */
++#else /* _VX_DLIMIT_H */
++#warning duplicate inclusion
++#endif /* _VX_DLIMIT_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/dlimit_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/dlimit_cmd.h
+--- linux-2.6.32.59/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/dlimit_cmd.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,109 @@
++#ifndef _VX_DLIMIT_CMD_H
++#define _VX_DLIMIT_CMD_H
+
+
-+#define NX_IPV4(n) ((n)->v4.type != NXA_TYPE_NONE)
-+#ifdef CONFIG_IPV6
-+#define NX_IPV6(n) ((n)->v6.type != NXA_TYPE_NONE)
-+#else
-+#define NX_IPV6(n) (0)
-+#endif
++/* dlimit vserver commands */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/percpu.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/percpu.h
---- linux-2.6.32.6/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/percpu.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,14 @@
-+#ifndef _VX_PERCPU_H
-+#define _VX_PERCPU_H
++#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0)
++#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0)
+
-+#include "cvirt_def.h"
-+#include "sched_def.h"
++#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0)
++#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0)
+
-+struct _vx_percpu {
-+ struct _vx_cvirt_pc cvirt;
-+ struct _vx_sched_pc sched;
++struct vcmd_ctx_dlimit_base_v0 {
++ const char __user *name;
++ uint32_t flags;
+};
+
-+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
++struct vcmd_ctx_dlimit_v0 {
++ const char __user *name;
++ uint32_t space_used; /* used space in kbytes */
++ uint32_t space_total; /* maximum space in kbytes */
++ uint32_t inodes_used; /* used inodes */
++ uint32_t inodes_total; /* maximum inodes */
++ uint32_t reserved; /* reserved for root in % */
++ uint32_t flags;
++};
+
-+#endif /* _VX_PERCPU_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/pid.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/pid.h
---- linux-2.6.32.6/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/pid.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,51 @@
-+#ifndef _VSERVER_PID_H
-+#define _VSERVER_PID_H
++#define CDLIM_UNSET ((uint32_t)0UL)
++#define CDLIM_INFINITY ((uint32_t)~0UL)
++#define CDLIM_KEEP ((uint32_t)~1UL)
+
-+/* pid faking stuff */
++#define DLIME_UNIT 0
++#define DLIME_KILO 1
++#define DLIME_MEGA 2
++#define DLIME_GIGA 3
+
-+#define vx_info_map_pid(v, p) \
-+ __vx_info_map_pid((v), (p), __func__, __FILE__, __LINE__)
-+#define vx_info_map_tgid(v,p) vx_info_map_pid(v,p)
-+#define vx_map_pid(p) vx_info_map_pid(current_vx_info(), p)
-+#define vx_map_tgid(p) vx_map_pid(p)
++#define DLIMF_SHIFT 0x10
+
-+static inline int __vx_info_map_pid(struct vx_info *vxi, int pid,
-+ const char *func, const char *file, int line)
++#define DLIMS_USED 0
++#define DLIMS_TOTAL 2
++
++static inline
++uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift)
+{
-+ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
-+ vxfprintk(VXD_CBIT(cvirt, 2),
-+ "vx_map_tgid: %p/%llx: %d -> %d",
-+ vxi, (long long)vxi->vx_flags, pid,
-+ (pid && pid == vxi->vx_initpid) ? 1 : pid,
-+ func, file, line);
-+ if (pid == 0)
-+ return 0;
-+ if (pid == vxi->vx_initpid)
-+ return 1;
-+ }
-+ return pid;
++ int exp = (flags & DLIMF_SHIFT) ?
++ (flags >> shift) & DLIME_GIGA : DLIME_KILO;
++ return ((uint64_t)val) << (10 * exp);
+}
+
-+#define vx_info_rmap_pid(v, p) \
-+ __vx_info_rmap_pid((v), (p), __func__, __FILE__, __LINE__)
-+#define vx_rmap_pid(p) vx_info_rmap_pid(current_vx_info(), p)
-+#define vx_rmap_tgid(p) vx_rmap_pid(p)
-+
-+static inline int __vx_info_rmap_pid(struct vx_info *vxi, int pid,
-+ const char *func, const char *file, int line)
++static inline
++uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift)
+{
-+ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
-+ vxfprintk(VXD_CBIT(cvirt, 2),
-+ "vx_rmap_tgid: %p/%llx: %d -> %d",
-+ vxi, (long long)vxi->vx_flags, pid,
-+ (pid == 1) ? vxi->vx_initpid : pid,
-+ func, file, line);
-+ if ((pid == 1) && vxi->vx_initpid)
-+ return vxi->vx_initpid;
-+ if (pid == vxi->vx_initpid)
-+ return ~0U;
-+ }
-+ return pid;
-+}
++ int exp = 0;
+
-+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/sched_cmd.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/sched_cmd.h
---- linux-2.6.32.6/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/sched_cmd.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,108 @@
-+#ifndef _VX_SCHED_CMD_H
-+#define _VX_SCHED_CMD_H
++ if (*flags & DLIMF_SHIFT) {
++ while (val > (1LL << 32) && (exp < 3)) {
++ val >>= 10;
++ exp++;
++ }
++ *flags &= ~(DLIME_GIGA << shift);
++ *flags |= exp << shift;
++ } else
++ val >>= 10;
++ return val;
++}
+
++#ifdef __KERNEL__
+
-+/* sched vserver commands */
++#ifdef CONFIG_COMPAT
+
-+#define VCMD_set_sched_v2 VC_CMD(SCHED, 1, 2)
-+#define VCMD_set_sched_v3 VC_CMD(SCHED, 1, 3)
-+#define VCMD_set_sched_v4 VC_CMD(SCHED, 1, 4)
++#include <asm/compat.h>
+
-+struct vcmd_set_sched_v2 {
-+ int32_t fill_rate;
-+ int32_t interval;
-+ int32_t tokens;
-+ int32_t tokens_min;
-+ int32_t tokens_max;
-+ uint64_t cpu_mask;
++struct vcmd_ctx_dlimit_base_v0_x32 {
++ compat_uptr_t name_ptr;
++ uint32_t flags;
+};
+
-+struct vcmd_set_sched_v3 {
-+ uint32_t set_mask;
-+ int32_t fill_rate;
-+ int32_t interval;
-+ int32_t tokens;
-+ int32_t tokens_min;
-+ int32_t tokens_max;
-+ int32_t priority_bias;
++struct vcmd_ctx_dlimit_v0_x32 {
++ compat_uptr_t name_ptr;
++ uint32_t space_used; /* used space in kbytes */
++ uint32_t space_total; /* maximum space in kbytes */
++ uint32_t inodes_used; /* used inodes */
++ uint32_t inodes_total; /* maximum inodes */
++ uint32_t reserved; /* reserved for root in % */
++ uint32_t flags;
+};
+
-+struct vcmd_set_sched_v4 {
-+ uint32_t set_mask;
-+ int32_t fill_rate;
-+ int32_t interval;
-+ int32_t tokens;
-+ int32_t tokens_min;
-+ int32_t tokens_max;
-+ int32_t prio_bias;
-+ int32_t cpu_id;
-+ int32_t bucket_id;
-+};
++#endif /* CONFIG_COMPAT */
+
-+#define VCMD_set_sched VC_CMD(SCHED, 1, 5)
-+#define VCMD_get_sched VC_CMD(SCHED, 2, 5)
++#include <linux/compiler.h>
+
-+struct vcmd_sched_v5 {
-+ uint32_t mask;
-+ int32_t cpu_id;
-+ int32_t bucket_id;
-+ int32_t fill_rate[2];
-+ int32_t interval[2];
-+ int32_t tokens;
-+ int32_t tokens_min;
-+ int32_t tokens_max;
-+ int32_t prio_bias;
-+};
++extern int vc_add_dlimit(uint32_t, void __user *);
++extern int vc_rem_dlimit(uint32_t, void __user *);
+
-+#define VXSM_FILL_RATE 0x0001
-+#define VXSM_INTERVAL 0x0002
-+#define VXSM_FILL_RATE2 0x0004
-+#define VXSM_INTERVAL2 0x0008
-+#define VXSM_TOKENS 0x0010
-+#define VXSM_TOKENS_MIN 0x0020
-+#define VXSM_TOKENS_MAX 0x0040
-+#define VXSM_PRIO_BIAS 0x0100
++extern int vc_set_dlimit(uint32_t, void __user *);
++extern int vc_get_dlimit(uint32_t, void __user *);
+
-+#define VXSM_IDLE_TIME 0x0200
-+#define VXSM_FORCE 0x0400
++#ifdef CONFIG_COMPAT
+
-+#define VXSM_V3_MASK 0x0173
-+#define VXSM_SET_MASK 0x01FF
++extern int vc_add_dlimit_x32(uint32_t, void __user *);
++extern int vc_rem_dlimit_x32(uint32_t, void __user *);
+
-+#define VXSM_CPU_ID 0x1000
-+#define VXSM_BUCKET_ID 0x2000
++extern int vc_set_dlimit_x32(uint32_t, void __user *);
++extern int vc_get_dlimit_x32(uint32_t, void __user *);
+
-+#define VXSM_MSEC 0x4000
++#endif /* CONFIG_COMPAT */
+
-+#define SCHED_KEEP (-2) /* only for v2 */
++#endif /* __KERNEL__ */
++#endif /* _VX_DLIMIT_CMD_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/global.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/global.h
+--- linux-2.6.32.59/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/global.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,19 @@
++#ifndef _VX_GLOBAL_H
++#define _VX_GLOBAL_H
+
-+#ifdef __KERNEL__
+
-+#include <linux/compiler.h>
++extern atomic_t vx_global_ctotal;
++extern atomic_t vx_global_cactive;
+
-+extern int vc_set_sched_v2(struct vx_info *, void __user *);
-+extern int vc_set_sched_v3(struct vx_info *, void __user *);
-+extern int vc_set_sched_v4(struct vx_info *, void __user *);
-+extern int vc_set_sched(struct vx_info *, void __user *);
-+extern int vc_get_sched(struct vx_info *, void __user *);
++extern atomic_t nx_global_ctotal;
++extern atomic_t nx_global_cactive;
+
-+#endif /* __KERNEL__ */
++extern atomic_t vs_global_nsproxy;
++extern atomic_t vs_global_fs;
++extern atomic_t vs_global_mnt_ns;
++extern atomic_t vs_global_uts_ns;
++extern atomic_t vs_global_user_ns;
++extern atomic_t vs_global_pid_ns;
+
-+#define VCMD_sched_info VC_CMD(SCHED, 3, 0)
+
-+struct vcmd_sched_info {
-+ int32_t cpu_id;
-+ int32_t bucket_id;
-+ uint64_t user_msec;
-+ uint64_t sys_msec;
-+ uint64_t hold_msec;
-+ uint32_t token_usec;
-+ int32_t vavavoom;
-+};
++#endif /* _VX_GLOBAL_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/history.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/history.h
+--- linux-2.6.32.59/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/history.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,197 @@
++#ifndef _VX_HISTORY_H
++#define _VX_HISTORY_H
+
-+#ifdef __KERNEL__
+
-+extern int vc_sched_info(struct vx_info *, void __user *);
++enum {
++ VXH_UNUSED = 0,
++ VXH_THROW_OOPS = 1,
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/sched_def.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/sched_def.h
---- linux-2.6.32.6/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/sched_def.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,68 @@
-+#ifndef _VX_SCHED_DEF_H
-+#define _VX_SCHED_DEF_H
++ VXH_GET_VX_INFO,
++ VXH_PUT_VX_INFO,
++ VXH_INIT_VX_INFO,
++ VXH_SET_VX_INFO,
++ VXH_CLR_VX_INFO,
++ VXH_CLAIM_VX_INFO,
++ VXH_RELEASE_VX_INFO,
++ VXH_ALLOC_VX_INFO,
++ VXH_DEALLOC_VX_INFO,
++ VXH_HASH_VX_INFO,
++ VXH_UNHASH_VX_INFO,
++ VXH_LOC_VX_INFO,
++ VXH_LOOKUP_VX_INFO,
++ VXH_CREATE_VX_INFO,
++};
+
-+#include <linux/spinlock.h>
-+#include <linux/jiffies.h>
-+#include <linux/cpumask.h>
-+#include <asm/atomic.h>
-+#include <asm/param.h>
++struct _vxhe_vxi {
++ struct vx_info *ptr;
++ unsigned xid;
++ unsigned usecnt;
++ unsigned tasks;
++};
+
++struct _vxhe_set_clr {
++ void *data;
++};
+
-+/* context sub struct */
++struct _vxhe_loc_lookup {
++ unsigned arg;
++};
+
-+struct _vx_sched {
-+ spinlock_t tokens_lock; /* lock for token bucket */
++struct _vx_hist_entry {
++ void *loc;
++ unsigned short seq;
++ unsigned short type;
++ struct _vxhe_vxi vxi;
++ union {
++ struct _vxhe_set_clr sc;
++ struct _vxhe_loc_lookup ll;
++ };
++};
+
-+ int tokens; /* number of CPU tokens */
-+ int fill_rate[2]; /* Fill rate: add X tokens... */
-+ int interval[2]; /* Divisor: per Y jiffies */
-+ int tokens_min; /* Limit: minimum for unhold */
-+ int tokens_max; /* Limit: no more than N tokens */
++#ifdef CONFIG_VSERVER_HISTORY
+
-+ int prio_bias; /* bias offset for priority */
++extern unsigned volatile int vxh_active;
+
-+ unsigned update_mask; /* which features should be updated */
-+ cpumask_t update; /* CPUs which should update */
-+};
++struct _vx_hist_entry *vxh_advance(void *loc);
+
-+struct _vx_sched_pc {
-+ int tokens; /* number of CPU tokens */
-+ int flags; /* bucket flags */
+
-+ int fill_rate[2]; /* Fill rate: add X tokens... */
-+ int interval[2]; /* Divisor: per Y jiffies */
-+ int tokens_min; /* Limit: minimum for unhold */
-+ int tokens_max; /* Limit: no more than N tokens */
++static inline
++void __vxh_copy_vxi(struct _vx_hist_entry *entry, struct vx_info *vxi)
++{
++ entry->vxi.ptr = vxi;
++ if (vxi) {
++ entry->vxi.usecnt = atomic_read(&vxi->vx_usecnt);
++ entry->vxi.tasks = atomic_read(&vxi->vx_tasks);
++ entry->vxi.xid = vxi->vx_id;
++ }
++}
+
-+ int prio_bias; /* bias offset for priority */
-+ int vavavoom; /* last calculated vavavoom */
+
-+ unsigned long norm_time; /* last time accounted */
-+ unsigned long idle_time; /* non linear time for fair sched */
-+ unsigned long token_time; /* token time for accounting */
-+ unsigned long onhold; /* jiffies when put on hold */
++#define __HERE__ current_text_addr()
+
-+ uint64_t user_ticks; /* token tick events */
-+ uint64_t sys_ticks; /* token tick events */
-+ uint64_t hold_ticks; /* token ticks paused */
-+};
++#define __VXH_BODY(__type, __data, __here) \
++ struct _vx_hist_entry *entry; \
++ \
++ preempt_disable(); \
++ entry = vxh_advance(__here); \
++ __data; \
++ entry->type = __type; \
++ preempt_enable();
+
+
-+#define VXSF_ONHOLD 0x0001
-+#define VXSF_IDLE_TIME 0x0100
++ /* pass vxi only */
+
-+#ifdef CONFIG_VSERVER_DEBUG
++#define __VXH_SMPL \
++ __vxh_copy_vxi(entry, vxi)
+
-+static inline void __dump_vx_sched(struct _vx_sched *sched)
++static inline
++void __vxh_smpl(struct vx_info *vxi, int __type, void *__here)
+{
-+ printk("\t_vx_sched:\n");
-+ printk("\t tokens: %4d/%4d, %4d/%4d, %4d, %4d\n",
-+ sched->fill_rate[0], sched->interval[0],
-+ sched->fill_rate[1], sched->interval[1],
-+ sched->tokens_min, sched->tokens_max);
-+ printk("\t priority = %4d\n", sched->prio_bias);
++ __VXH_BODY(__type, __VXH_SMPL, __here)
+}
+
-+#endif
-+
-+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/sched.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/sched.h
---- linux-2.6.32.6/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/sched.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,26 @@
-+#ifndef _VX_SCHED_H
-+#define _VX_SCHED_H
++ /* pass vxi and data (void *) */
+
++#define __VXH_DATA \
++ __vxh_copy_vxi(entry, vxi); \
++ entry->sc.data = data
+
-+#ifdef __KERNEL__
++static inline
++void __vxh_data(struct vx_info *vxi, void *data,
++ int __type, void *__here)
++{
++ __VXH_BODY(__type, __VXH_DATA, __here)
++}
+
-+struct timespec;
++ /* pass vxi and arg (long) */
+
-+void vx_vsi_uptime(struct timespec *, struct timespec *);
++#define __VXH_LONG \
++ __vxh_copy_vxi(entry, vxi); \
++ entry->ll.arg = arg
+
++static inline
++void __vxh_long(struct vx_info *vxi, long arg,
++ int __type, void *__here)
++{
++ __VXH_BODY(__type, __VXH_LONG, __here)
++}
+
-+struct vx_info;
+
-+void vx_update_load(struct vx_info *);
++static inline
++void __vxh_throw_oops(void *__here)
++{
++ __VXH_BODY(VXH_THROW_OOPS, {}, __here);
++ /* prevent further acquisition */
++ vxh_active = 0;
++}
+
+
-+int vx_tokens_recalc(struct _vx_sched_pc *,
-+ unsigned long *, unsigned long *, int [2]);
++#define vxh_throw_oops() __vxh_throw_oops(__HERE__);
+
-+void vx_update_sched_param(struct _vx_sched *sched,
-+ struct _vx_sched_pc *sched_pc);
++#define __vxh_get_vx_info(v, h) __vxh_smpl(v, VXH_GET_VX_INFO, h);
++#define __vxh_put_vx_info(v, h) __vxh_smpl(v, VXH_PUT_VX_INFO, h);
+
-+#endif /* __KERNEL__ */
-+#else /* _VX_SCHED_H */
-+#warning duplicate inclusion
-+#endif /* _VX_SCHED_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/signal_cmd.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/signal_cmd.h
---- linux-2.6.32.6/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/signal_cmd.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,43 @@
-+#ifndef _VX_SIGNAL_CMD_H
-+#define _VX_SIGNAL_CMD_H
++#define __vxh_init_vx_info(v, d, h) \
++ __vxh_data(v, d, VXH_INIT_VX_INFO, h);
++#define __vxh_set_vx_info(v, d, h) \
++ __vxh_data(v, d, VXH_SET_VX_INFO, h);
++#define __vxh_clr_vx_info(v, d, h) \
++ __vxh_data(v, d, VXH_CLR_VX_INFO, h);
+
++#define __vxh_claim_vx_info(v, d, h) \
++ __vxh_data(v, d, VXH_CLAIM_VX_INFO, h);
++#define __vxh_release_vx_info(v, d, h) \
++ __vxh_data(v, d, VXH_RELEASE_VX_INFO, h);
+
-+/* signalling vserver commands */
++#define vxh_alloc_vx_info(v) \
++ __vxh_smpl(v, VXH_ALLOC_VX_INFO, __HERE__);
++#define vxh_dealloc_vx_info(v) \
++ __vxh_smpl(v, VXH_DEALLOC_VX_INFO, __HERE__);
+
-+#define VCMD_ctx_kill VC_CMD(PROCTRL, 1, 0)
-+#define VCMD_wait_exit VC_CMD(EVENT, 99, 0)
-+
-+struct vcmd_ctx_kill_v0 {
-+ int32_t pid;
-+ int32_t sig;
-+};
-+
-+struct vcmd_wait_exit_v0 {
-+ int32_t reboot_cmd;
-+ int32_t exit_code;
-+};
-+
-+#ifdef __KERNEL__
++#define vxh_hash_vx_info(v) \
++ __vxh_smpl(v, VXH_HASH_VX_INFO, __HERE__);
++#define vxh_unhash_vx_info(v) \
++ __vxh_smpl(v, VXH_UNHASH_VX_INFO, __HERE__);
+
-+extern int vc_ctx_kill(struct vx_info *, void __user *);
-+extern int vc_wait_exit(struct vx_info *, void __user *);
++#define vxh_loc_vx_info(v, l) \
++ __vxh_long(v, l, VXH_LOC_VX_INFO, __HERE__);
++#define vxh_lookup_vx_info(v, l) \
++ __vxh_long(v, l, VXH_LOOKUP_VX_INFO, __HERE__);
++#define vxh_create_vx_info(v, l) \
++ __vxh_long(v, l, VXH_CREATE_VX_INFO, __HERE__);
+
-+#endif /* __KERNEL__ */
++extern void vxh_dump_history(void);
+
-+/* process alteration commands */
+
-+#define VCMD_get_pflags VC_CMD(PROCALT, 5, 0)
-+#define VCMD_set_pflags VC_CMD(PROCALT, 6, 0)
++#else /* CONFIG_VSERVER_HISTORY */
+
-+struct vcmd_pflags_v0 {
-+ uint32_t flagword;
-+ uint32_t mask;
-+};
++#define __HERE__ 0
+
-+#ifdef __KERNEL__
++#define vxh_throw_oops() do { } while (0)
+
-+extern int vc_get_pflags(uint32_t pid, void __user *);
-+extern int vc_set_pflags(uint32_t pid, void __user *);
++#define __vxh_get_vx_info(v, h) do { } while (0)
++#define __vxh_put_vx_info(v, h) do { } while (0)
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/signal.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/signal.h
---- linux-2.6.32.6/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/signal.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,14 @@
-+#ifndef _VX_SIGNAL_H
-+#define _VX_SIGNAL_H
++#define __vxh_init_vx_info(v, d, h) do { } while (0)
++#define __vxh_set_vx_info(v, d, h) do { } while (0)
++#define __vxh_clr_vx_info(v, d, h) do { } while (0)
+
++#define __vxh_claim_vx_info(v, d, h) do { } while (0)
++#define __vxh_release_vx_info(v, d, h) do { } while (0)
+
-+#ifdef __KERNEL__
++#define vxh_alloc_vx_info(v) do { } while (0)
++#define vxh_dealloc_vx_info(v) do { } while (0)
+
-+struct vx_info;
++#define vxh_hash_vx_info(v) do { } while (0)
++#define vxh_unhash_vx_info(v) do { } while (0)
+
-+int vx_info_kill(struct vx_info *, int, int);
++#define vxh_loc_vx_info(v, l) do { } while (0)
++#define vxh_lookup_vx_info(v, l) do { } while (0)
++#define vxh_create_vx_info(v, l) do { } while (0)
+
-+#endif /* __KERNEL__ */
-+#else /* _VX_SIGNAL_H */
-+#warning duplicate inclusion
-+#endif /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/space_cmd.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/space_cmd.h
---- linux-2.6.32.6/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/space_cmd.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,38 @@
-+#ifndef _VX_SPACE_CMD_H
-+#define _VX_SPACE_CMD_H
++#define vxh_dump_history() do { } while (0)
+
+
-+#define VCMD_enter_space_v0 VC_CMD(PROCALT, 1, 0)
-+#define VCMD_enter_space_v1 VC_CMD(PROCALT, 1, 1)
-+#define VCMD_enter_space VC_CMD(PROCALT, 1, 2)
++#endif /* CONFIG_VSERVER_HISTORY */
+
-+#define VCMD_set_space_v0 VC_CMD(PROCALT, 3, 0)
-+#define VCMD_set_space_v1 VC_CMD(PROCALT, 3, 1)
-+#define VCMD_set_space VC_CMD(PROCALT, 3, 2)
++#endif /* _VX_HISTORY_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/inode.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/inode.h
+--- linux-2.6.32.59/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/inode.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,39 @@
++#ifndef _VX_INODE_H
++#define _VX_INODE_H
+
-+#define VCMD_get_space_mask_v0 VC_CMD(PROCALT, 4, 0)
+
-+#define VCMD_get_space_mask VC_CMD(VSPACE, 0, 1)
-+#define VCMD_get_space_default VC_CMD(VSPACE, 1, 0)
++#define IATTR_TAG 0x01000000
+
++#define IATTR_ADMIN 0x00000001
++#define IATTR_WATCH 0x00000002
++#define IATTR_HIDE 0x00000004
++#define IATTR_FLAGS 0x00000007
+
-+struct vcmd_space_mask_v1 {
-+ uint64_t mask;
-+};
++#define IATTR_BARRIER 0x00010000
++#define IATTR_IXUNLINK 0x00020000
++#define IATTR_IMMUTABLE 0x00040000
++#define IATTR_COW 0x00080000
+
-+struct vcmd_space_mask_v2 {
-+ uint64_t mask;
-+ uint32_t index;
-+};
++#ifdef __KERNEL__
+
+
-+#ifdef __KERNEL__
++#ifdef CONFIG_VSERVER_PROC_SECURE
++#define IATTR_PROC_DEFAULT ( IATTR_ADMIN | IATTR_HIDE )
++#define IATTR_PROC_SYMLINK ( IATTR_ADMIN )
++#else
++#define IATTR_PROC_DEFAULT ( IATTR_ADMIN )
++#define IATTR_PROC_SYMLINK ( IATTR_ADMIN )
++#endif
+
-+extern int vc_enter_space_v1(struct vx_info *, void __user *);
-+extern int vc_set_space_v1(struct vx_info *, void __user *);
-+extern int vc_enter_space(struct vx_info *, void __user *);
-+extern int vc_set_space(struct vx_info *, void __user *);
-+extern int vc_get_space_mask(void __user *, int);
++#define vx_hide_check(c, m) (((m) & IATTR_HIDE) ? vx_check(c, m) : 1)
+
+#endif /* __KERNEL__ */
-+#endif /* _VX_SPACE_CMD_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/space.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/space.h
---- linux-2.6.32.6/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/space.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,12 @@
-+#ifndef _VX_SPACE_H
-+#define _VX_SPACE_H
+
-+#include <linux/types.h>
-+
-+struct vx_info;
++/* inode ioctls */
+
-+int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index);
++#define FIOC_GETXFLG _IOR('x', 5, long)
++#define FIOC_SETXFLG _IOW('x', 6, long)
+
-+#else /* _VX_SPACE_H */
++#else /* _VX_INODE_H */
+#warning duplicate inclusion
-+#endif /* _VX_SPACE_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/switch.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/switch.h
---- linux-2.6.32.6/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/switch.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,98 @@
-+#ifndef _VX_SWITCH_H
-+#define _VX_SWITCH_H
++#endif /* _VX_INODE_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/inode_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/inode_cmd.h
+--- linux-2.6.32.59/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/inode_cmd.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,59 @@
++#ifndef _VX_INODE_CMD_H
++#define _VX_INODE_CMD_H
+
-+#include <linux/types.h>
+
++/* inode vserver commands */
+
-+#define VC_CATEGORY(c) (((c) >> 24) & 0x3F)
-+#define VC_COMMAND(c) (((c) >> 16) & 0xFF)
-+#define VC_VERSION(c) ((c) & 0xFFF)
++#define VCMD_get_iattr VC_CMD(INODE, 1, 1)
++#define VCMD_set_iattr VC_CMD(INODE, 2, 1)
+
-+#define VC_CMD(c, i, v) ((((VC_CAT_ ## c) & 0x3F) << 24) \
-+ | (((i) & 0xFF) << 16) | ((v) & 0xFFF))
++#define VCMD_fget_iattr VC_CMD(INODE, 3, 0)
++#define VCMD_fset_iattr VC_CMD(INODE, 4, 0)
+
-+/*
++struct vcmd_ctx_iattr_v1 {
++ const char __user *name;
++ uint32_t tag;
++ uint32_t flags;
++ uint32_t mask;
++};
+
-+ Syscall Matrix V2.8
++struct vcmd_ctx_fiattr_v0 {
++ uint32_t tag;
++ uint32_t flags;
++ uint32_t mask;
++};
+
-+ |VERSION|CREATE |MODIFY |MIGRATE|CONTROL|EXPERIM| |SPECIAL|SPECIAL|
-+ |STATS |DESTROY|ALTER |CHANGE |LIMIT |TEST | | | |
-+ |INFO |SETUP | |MOVE | | | | | |
-+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
-+ SYSTEM |VERSION|VSETUP |VHOST | | | | |DEVICE | |
-+ HOST | 00| 01| 02| 03| 04| 05| | 06| 07|
-+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
-+ CPU | |VPROC |PROCALT|PROCMIG|PROCTRL| | |SCHED. | |
-+ PROCESS| 08| 09| 10| 11| 12| 13| | 14| 15|
-+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
-+ MEMORY | | | | |MEMCTRL| | |SWAP | |
-+ | 16| 17| 18| 19| 20| 21| | 22| 23|
-+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
-+ NETWORK| |VNET |NETALT |NETMIG |NETCTL | | |SERIAL | |
-+ | 24| 25| 26| 27| 28| 29| | 30| 31|
-+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
-+ DISK | | | |TAGMIG |DLIMIT | | |INODE | |
-+ VFS | 32| 33| 34| 35| 36| 37| | 38| 39|
-+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
-+ OTHER |VSTAT | | | | | | |VINFO | |
-+ | 40| 41| 42| 43| 44| 45| | 46| 47|
-+ =======+=======+=======+=======+=======+=======+=======+ +=======+=======+
-+ SPECIAL|EVENT | | | |FLAGS | | |VSPACE | |
-+ | 48| 49| 50| 51| 52| 53| | 54| 55|
-+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
-+ SPECIAL|DEBUG | | | |RLIMIT |SYSCALL| | |COMPAT |
-+ | 56| 57| 58| 59| 60|TEST 61| | 62| 63|
-+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
+
-+*/
++#ifdef __KERNEL__
+
-+#define VC_CAT_VERSION 0
+
-+#define VC_CAT_VSETUP 1
-+#define VC_CAT_VHOST 2
++#ifdef CONFIG_COMPAT
+
-+#define VC_CAT_DEVICE 6
++#include <asm/compat.h>
+
-+#define VC_CAT_VPROC 9
-+#define VC_CAT_PROCALT 10
-+#define VC_CAT_PROCMIG 11
-+#define VC_CAT_PROCTRL 12
++struct vcmd_ctx_iattr_v1_x32 {
++ compat_uptr_t name_ptr;
++ uint32_t tag;
++ uint32_t flags;
++ uint32_t mask;
++};
+
-+#define VC_CAT_SCHED 14
-+#define VC_CAT_MEMCTRL 20
++#endif /* CONFIG_COMPAT */
+
-+#define VC_CAT_VNET 25
-+#define VC_CAT_NETALT 26
-+#define VC_CAT_NETMIG 27
-+#define VC_CAT_NETCTRL 28
++#include <linux/compiler.h>
+
-+#define VC_CAT_TAGMIG 35
-+#define VC_CAT_DLIMIT 36
-+#define VC_CAT_INODE 38
++extern int vc_get_iattr(void __user *);
++extern int vc_set_iattr(void __user *);
+
-+#define VC_CAT_VSTAT 40
-+#define VC_CAT_VINFO 46
-+#define VC_CAT_EVENT 48
++extern int vc_fget_iattr(uint32_t, void __user *);
++extern int vc_fset_iattr(uint32_t, void __user *);
+
-+#define VC_CAT_FLAGS 52
-+#define VC_CAT_VSPACE 54
-+#define VC_CAT_DEBUG 56
-+#define VC_CAT_RLIMIT 60
++#ifdef CONFIG_COMPAT
+
-+#define VC_CAT_SYSTEST 61
-+#define VC_CAT_COMPAT 63
++extern int vc_get_iattr_x32(void __user *);
++extern int vc_set_iattr_x32(void __user *);
+
-+/* query version */
++#endif /* CONFIG_COMPAT */
+
-+#define VCMD_get_version VC_CMD(VERSION, 0, 0)
-+#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
++#endif /* __KERNEL__ */
++#endif /* _VX_INODE_CMD_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/limit.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/limit.h
+--- linux-2.6.32.59/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/limit.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,71 @@
++#ifndef _VX_LIMIT_H
++#define _VX_LIMIT_H
++
++#define VLIMIT_NSOCK 16
++#define VLIMIT_OPENFD 17
++#define VLIMIT_ANON 18
++#define VLIMIT_SHMEM 19
++#define VLIMIT_SEMARY 20
++#define VLIMIT_NSEMS 21
++#define VLIMIT_DENTRY 22
++#define VLIMIT_MAPPED 23
+
+
+#ifdef __KERNEL__
+
-+#include <linux/errno.h>
++#define VLIM_NOCHECK ((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS))
+
-+#endif /* __KERNEL__ */
++/* keep in sync with CRLIM_INFINITY */
+
-+#endif /* _VX_SWITCH_H */
++#define VLIM_INFINITY (~0ULL)
+
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/tag_cmd.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/tag_cmd.h
---- linux-2.6.32.6/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/tag_cmd.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,22 @@
-+#ifndef _VX_TAG_CMD_H
-+#define _VX_TAG_CMD_H
++#include <asm/atomic.h>
++#include <asm/resource.h>
+
++#ifndef RLIM_INFINITY
++#warning RLIM_INFINITY is undefined
++#endif
+
-+/* vinfo commands */
++#define __rlim_val(l, r, v) ((l)->res[r].v)
+
-+#define VCMD_task_tag VC_CMD(VINFO, 3, 0)
++#define __rlim_soft(l, r) __rlim_val(l, r, soft)
++#define __rlim_hard(l, r) __rlim_val(l, r, hard)
+
-+#ifdef __KERNEL__
-+extern int vc_task_tag(uint32_t);
++#define __rlim_rcur(l, r) __rlim_val(l, r, rcur)
++#define __rlim_rmin(l, r) __rlim_val(l, r, rmin)
++#define __rlim_rmax(l, r) __rlim_val(l, r, rmax)
+
-+#endif /* __KERNEL__ */
++#define __rlim_lhit(l, r) __rlim_val(l, r, lhit)
++#define __rlim_hit(l, r) atomic_inc(&__rlim_lhit(l, r))
+
-+/* context commands */
++typedef atomic_long_t rlim_atomic_t;
++typedef unsigned long rlim_t;
+
-+#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0)
++#define __rlim_get(l, r) atomic_long_read(&__rlim_rcur(l, r))
++#define __rlim_set(l, r, v) atomic_long_set(&__rlim_rcur(l, r), v)
++#define __rlim_inc(l, r) atomic_long_inc(&__rlim_rcur(l, r))
++#define __rlim_dec(l, r) atomic_long_dec(&__rlim_rcur(l, r))
++#define __rlim_add(l, r, v) atomic_long_add(v, &__rlim_rcur(l, r))
++#define __rlim_sub(l, r, v) atomic_long_sub(v, &__rlim_rcur(l, r))
+
-+#ifdef __KERNEL__
-+extern int vc_tag_migrate(uint32_t);
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_TAG_CMD_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vserver/tag.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/tag.h
---- linux-2.6.32.6/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vserver/tag.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,143 @@
-+#ifndef _DX_TAG_H
-+#define _DX_TAG_H
++#if (RLIM_INFINITY == VLIM_INFINITY)
++#define VX_VLIM(r) ((long long)(long)(r))
++#define VX_RLIM(v) ((rlim_t)(v))
++#else
++#define VX_VLIM(r) (((r) == RLIM_INFINITY) \
++ ? VLIM_INFINITY : (long long)(r))
++#define VX_RLIM(v) (((v) == VLIM_INFINITY) \
++ ? RLIM_INFINITY : (rlim_t)(v))
++#endif
+
-+#include <linux/types.h>
++struct sysinfo;
+
++void vx_vsi_meminfo(struct sysinfo *);
++void vx_vsi_swapinfo(struct sysinfo *);
++long vx_vsi_cached(struct sysinfo *);
+
-+#define DX_TAG(in) (IS_TAGGED(in))
++#define NUM_LIMITS 24
+
++#endif /* __KERNEL__ */
++#endif /* _VX_LIMIT_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/limit_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/limit_cmd.h
+--- linux-2.6.32.59/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/limit_cmd.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,71 @@
++#ifndef _VX_LIMIT_CMD_H
++#define _VX_LIMIT_CMD_H
+
-+#ifdef CONFIG_TAG_NFSD
-+#define DX_TAG_NFSD 1
-+#else
-+#define DX_TAG_NFSD 0
-+#endif
+
++/* rlimit vserver commands */
+
-+#ifdef CONFIG_TAGGING_NONE
++#define VCMD_get_rlimit VC_CMD(RLIMIT, 1, 0)
++#define VCMD_set_rlimit VC_CMD(RLIMIT, 2, 0)
++#define VCMD_get_rlimit_mask VC_CMD(RLIMIT, 3, 0)
++#define VCMD_reset_hits VC_CMD(RLIMIT, 7, 0)
++#define VCMD_reset_minmax VC_CMD(RLIMIT, 9, 0)
+
-+#define MAX_UID 0xFFFFFFFF
-+#define MAX_GID 0xFFFFFFFF
++struct vcmd_ctx_rlimit_v0 {
++ uint32_t id;
++ uint64_t minimum;
++ uint64_t softlimit;
++ uint64_t maximum;
++};
+
-+#define INOTAG_TAG(cond, uid, gid, tag) (0)
++struct vcmd_ctx_rlimit_mask_v0 {
++ uint32_t minimum;
++ uint32_t softlimit;
++ uint32_t maximum;
++};
+
-+#define TAGINO_UID(cond, uid, tag) (uid)
-+#define TAGINO_GID(cond, gid, tag) (gid)
++#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0)
+
-+#endif
++struct vcmd_rlimit_stat_v0 {
++ uint32_t id;
++ uint32_t hits;
++ uint64_t value;
++ uint64_t minimum;
++ uint64_t maximum;
++};
+
++#define CRLIM_UNSET (0ULL)
++#define CRLIM_INFINITY (~0ULL)
++#define CRLIM_KEEP (~1ULL)
+
-+#ifdef CONFIG_TAGGING_GID16
++#ifdef __KERNEL__
+
-+#define MAX_UID 0xFFFFFFFF
-+#define MAX_GID 0x0000FFFF
++#ifdef CONFIG_IA32_EMULATION
+
-+#define INOTAG_TAG(cond, uid, gid, tag) \
-+ ((cond) ? (((gid) >> 16) & 0xFFFF) : 0)
++struct vcmd_ctx_rlimit_v0_x32 {
++ uint32_t id;
++ uint64_t minimum;
++ uint64_t softlimit;
++ uint64_t maximum;
++} __attribute__ ((packed));
+
-+#define TAGINO_UID(cond, uid, tag) (uid)
-+#define TAGINO_GID(cond, gid, tag) \
-+ ((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid))
++#endif /* CONFIG_IA32_EMULATION */
+
-+#endif
++#include <linux/compiler.h>
+
++extern int vc_get_rlimit_mask(uint32_t, void __user *);
++extern int vc_get_rlimit(struct vx_info *, void __user *);
++extern int vc_set_rlimit(struct vx_info *, void __user *);
++extern int vc_reset_hits(struct vx_info *, void __user *);
++extern int vc_reset_minmax(struct vx_info *, void __user *);
+
-+#ifdef CONFIG_TAGGING_ID24
++extern int vc_rlimit_stat(struct vx_info *, void __user *);
+
-+#define MAX_UID 0x00FFFFFF
-+#define MAX_GID 0x00FFFFFF
++#ifdef CONFIG_IA32_EMULATION
+
-+#define INOTAG_TAG(cond, uid, gid, tag) \
-+ ((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0)
++extern int vc_get_rlimit_x32(struct vx_info *, void __user *);
++extern int vc_set_rlimit_x32(struct vx_info *, void __user *);
+
-+#define TAGINO_UID(cond, uid, tag) \
-+ ((cond) ? (((uid) & 0xFFFFFF) | (((tag) & 0xFF00) << 16)) : (uid))
-+#define TAGINO_GID(cond, gid, tag) \
-+ ((cond) ? (((gid) & 0xFFFFFF) | (((tag) & 0x00FF) << 24)) : (gid))
++#endif /* CONFIG_IA32_EMULATION */
+
-+#endif
++#endif /* __KERNEL__ */
++#endif /* _VX_LIMIT_CMD_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/limit_def.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/limit_def.h
+--- linux-2.6.32.59/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/limit_def.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,47 @@
++#ifndef _VX_LIMIT_DEF_H
++#define _VX_LIMIT_DEF_H
+
++#include <asm/atomic.h>
++#include <asm/resource.h>
+
-+#ifdef CONFIG_TAGGING_UID16
++#include "limit.h"
+
-+#define MAX_UID 0x0000FFFF
-+#define MAX_GID 0xFFFFFFFF
+
-+#define INOTAG_TAG(cond, uid, gid, tag) \
-+ ((cond) ? (((uid) >> 16) & 0xFFFF) : 0)
++struct _vx_res_limit {
++ rlim_t soft; /* Context soft limit */
++ rlim_t hard; /* Context hard limit */
+
-+#define TAGINO_UID(cond, uid, tag) \
-+ ((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid))
-+#define TAGINO_GID(cond, gid, tag) (gid)
++ rlim_atomic_t rcur; /* Current value */
++ rlim_t rmin; /* Context minimum */
++ rlim_t rmax; /* Context maximum */
+
-+#endif
++ atomic_t lhit; /* Limit hits */
++};
+
++/* context sub struct */
+
-+#ifdef CONFIG_TAGGING_INTERN
++struct _vx_limit {
++ struct _vx_res_limit res[NUM_LIMITS];
++};
+
-+#define MAX_UID 0xFFFFFFFF
-+#define MAX_GID 0xFFFFFFFF
++#ifdef CONFIG_VSERVER_DEBUG
+
-+#define INOTAG_TAG(cond, uid, gid, tag) \
-+ ((cond) ? (tag) : 0)
++static inline void __dump_vx_limit(struct _vx_limit *limit)
++{
++ int i;
+
-+#define TAGINO_UID(cond, uid, tag) (uid)
-+#define TAGINO_GID(cond, gid, tag) (gid)
++ printk("\t_vx_limit:");
++ for (i = 0; i < NUM_LIMITS; i++) {
++ printk("\t [%2d] = %8lu %8lu/%8lu, %8ld/%8ld, %8d\n",
++ i, (unsigned long)__rlim_get(limit, i),
++ (unsigned long)__rlim_rmin(limit, i),
++ (unsigned long)__rlim_rmax(limit, i),
++ (long)__rlim_soft(limit, i),
++ (long)__rlim_hard(limit, i),
++ atomic_read(&__rlim_lhit(limit, i)));
++ }
++}
+
+#endif
+
++#endif /* _VX_LIMIT_DEF_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/limit_int.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/limit_int.h
+--- linux-2.6.32.59/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/limit_int.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,198 @@
++#ifndef _VX_LIMIT_INT_H
++#define _VX_LIMIT_INT_H
+
-+#ifndef CONFIG_TAGGING_NONE
-+#define dx_current_fstag(sb) \
-+ ((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0)
-+#else
-+#define dx_current_fstag(sb) (0)
-+#endif
++#include "context.h"
+
-+#ifndef CONFIG_TAGGING_INTERN
-+#define TAGINO_TAG(cond, tag) (0)
-+#else
-+#define TAGINO_TAG(cond, tag) ((cond) ? (tag) : 0)
-+#endif
++#ifdef __KERNEL__
+
-+#define INOTAG_UID(cond, uid, gid) \
-+ ((cond) ? ((uid) & MAX_UID) : (uid))
-+#define INOTAG_GID(cond, uid, gid) \
-+ ((cond) ? ((gid) & MAX_GID) : (gid))
++#define VXD_RCRES_COND(r) VXD_CBIT(cres, r)
++#define VXD_RLIMIT_COND(r) VXD_CBIT(limit, r)
+
++extern const char *vlimit_name[NUM_LIMITS];
+
-+static inline uid_t dx_map_uid(uid_t uid)
++static inline void __vx_acc_cres(struct vx_info *vxi,
++ int res, int dir, void *_data, char *_file, int _line)
+{
-+ if ((uid > MAX_UID) && (uid != -1))
-+ uid = -2;
-+ return (uid & MAX_UID);
++ if (VXD_RCRES_COND(res))
++ vxlprintk(1, "vx_acc_cres[%5d,%s,%2d]: %5ld%s (%p)",
++ (vxi ? vxi->vx_id : -1), vlimit_name[res], res,
++ (vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
++ (dir > 0) ? "++" : "--", _data, _file, _line);
++ if (!vxi)
++ return;
++
++ if (dir > 0)
++ __rlim_inc(&vxi->limit, res);
++ else
++ __rlim_dec(&vxi->limit, res);
+}
+
-+static inline gid_t dx_map_gid(gid_t gid)
++static inline void __vx_add_cres(struct vx_info *vxi,
++ int res, int amount, void *_data, char *_file, int _line)
+{
-+ if ((gid > MAX_GID) && (gid != -1))
-+ gid = -2;
-+ return (gid & MAX_GID);
++ if (VXD_RCRES_COND(res))
++ vxlprintk(1, "vx_add_cres[%5d,%s,%2d]: %5ld += %5d (%p)",
++ (vxi ? vxi->vx_id : -1), vlimit_name[res], res,
++ (vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
++ amount, _data, _file, _line);
++ if (amount == 0)
++ return;
++ if (!vxi)
++ return;
++ __rlim_add(&vxi->limit, res, amount);
+}
+
-+struct peer_tag {
-+ int32_t xid;
-+ int32_t nid;
-+};
++static inline
++int __vx_cres_adjust_max(struct _vx_limit *limit, int res, rlim_t value)
++{
++ int cond = (value > __rlim_rmax(limit, res));
+
-+#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK))
++ if (cond)
++ __rlim_rmax(limit, res) = value;
++ return cond;
++}
+
-+int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags,
-+ unsigned long *flags);
++static inline
++int __vx_cres_adjust_min(struct _vx_limit *limit, int res, rlim_t value)
++{
++ int cond = (value < __rlim_rmin(limit, res));
+
-+#ifdef CONFIG_PROPAGATE
++ if (cond)
++ __rlim_rmin(limit, res) = value;
++ return cond;
++}
+
-+void __dx_propagate_tag(struct nameidata *nd, struct inode *inode);
++static inline
++void __vx_cres_fixup(struct _vx_limit *limit, int res, rlim_t value)
++{
++ if (!__vx_cres_adjust_max(limit, res, value))
++ __vx_cres_adjust_min(limit, res, value);
++}
+
-+#define dx_propagate_tag(n, i) __dx_propagate_tag(n, i)
+
-+#else
-+#define dx_propagate_tag(n, i) do { } while (0)
-+#endif
++/* return values:
++ +1 ... no limit hit
++ -1 ... over soft limit
++ 0 ... over hard limit */
+
-+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vs_inet6.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_inet6.h
---- linux-2.6.32.6/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_inet6.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,246 @@
-+#ifndef _VS_INET6_H
-+#define _VS_INET6_H
++static inline int __vx_cres_avail(struct vx_info *vxi,
++ int res, int num, char *_file, int _line)
++{
++ struct _vx_limit *limit;
++ rlim_t value;
+
-+#include "vserver/base.h"
-+#include "vserver/network.h"
-+#include "vserver/debug.h"
++ if (VXD_RLIMIT_COND(res))
++ vxlprintk(1, "vx_cres_avail[%5d,%s,%2d]: %5ld/%5ld > %5ld + %5d",
++ (vxi ? vxi->vx_id : -1), vlimit_name[res], res,
++ (vxi ? (long)__rlim_soft(&vxi->limit, res) : -1),
++ (vxi ? (long)__rlim_hard(&vxi->limit, res) : -1),
++ (vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
++ num, _file, _line);
++ if (!vxi)
++ return 1;
+
-+#include <net/ipv6.h>
++ limit = &vxi->limit;
++ value = __rlim_get(limit, res);
+
-+#define NXAV6(a) &(a)->ip, &(a)->mask, (a)->prefix, (a)->type
-+#define NXAV6_FMT "[%pI6/%pI6/%d:%04x]"
++ if (!__vx_cres_adjust_max(limit, res, value))
++ __vx_cres_adjust_min(limit, res, value);
+
++ if (num == 0)
++ return 1;
+
-+#ifdef CONFIG_IPV6
++ if (__rlim_soft(limit, res) == RLIM_INFINITY)
++ return -1;
++ if (value + num <= __rlim_soft(limit, res))
++ return -1;
+
-+static inline
-+int v6_addr_match(struct nx_addr_v6 *nxa,
-+ const struct in6_addr *addr, uint16_t mask)
-+{
-+ int ret = 0;
++ if (__rlim_hard(limit, res) == RLIM_INFINITY)
++ return 1;
++ if (value + num <= __rlim_hard(limit, res))
++ return 1;
+
-+ switch (nxa->type & mask) {
-+ case NXA_TYPE_MASK:
-+ ret = ipv6_masked_addr_cmp(&nxa->ip, &nxa->mask, addr);
-+ break;
-+ case NXA_TYPE_ADDR:
-+ ret = ipv6_addr_equal(&nxa->ip, addr);
-+ break;
-+ case NXA_TYPE_ANY:
-+ ret = 1;
-+ break;
-+ }
-+ vxdprintk(VXD_CBIT(net, 0),
-+ "v6_addr_match(%p" NXAV6_FMT ",%pI6,%04x) = %d",
-+ nxa, NXAV6(nxa), addr, mask, ret);
-+ return ret;
++ __rlim_hit(limit, res);
++ return 0;
+}
+
-+static inline
-+int v6_addr_in_nx_info(struct nx_info *nxi,
-+ const struct in6_addr *addr, uint16_t mask)
-+{
-+ struct nx_addr_v6 *nxa;
-+ int ret = 1;
+
-+ if (!nxi)
-+ goto out;
-+ for (nxa = &nxi->v6; nxa; nxa = nxa->next)
-+ if (v6_addr_match(nxa, addr, mask))
-+ goto out;
-+ ret = 0;
-+out:
-+ vxdprintk(VXD_CBIT(net, 0),
-+ "v6_addr_in_nx_info(%p[#%u],%pI6,%04x) = %d",
-+ nxi, nxi ? nxi->nx_id : 0, addr, mask, ret);
-+ return ret;
-+}
++static const int VLA_RSS[] = { RLIMIT_RSS, VLIMIT_ANON, VLIMIT_MAPPED, 0 };
+
+static inline
-+int v6_nx_addr_match(struct nx_addr_v6 *nxa, struct nx_addr_v6 *addr, uint16_t mask)
++rlim_t __vx_cres_array_sum(struct _vx_limit *limit, const int *array)
+{
-+ /* FIXME: needs full range checks */
-+ return v6_addr_match(nxa, &addr->ip, mask);
++ rlim_t value, sum = 0;
++ int res;
++
++ while ((res = *array++)) {
++ value = __rlim_get(limit, res);
++ __vx_cres_fixup(limit, res, value);
++ sum += value;
++ }
++ return sum;
+}
+
+static inline
-+int v6_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v6 *nxa, uint16_t mask)
++rlim_t __vx_cres_array_fixup(struct _vx_limit *limit, const int *array)
+{
-+ struct nx_addr_v6 *ptr;
++ rlim_t value = __vx_cres_array_sum(limit, array + 1);
++ int res = *array;
+
-+ for (ptr = &nxi->v6; ptr; ptr = ptr->next)
-+ if (v6_nx_addr_match(ptr, nxa, mask))
-+ return 1;
-+ return 0;
-+}
++ if (value == __rlim_get(limit, res))
++ return value;
+
++ __rlim_set(limit, res, value);
++ /* now adjust min/max */
++ if (!__vx_cres_adjust_max(limit, res, value))
++ __vx_cres_adjust_min(limit, res, value);
+
-+/*
-+ * Check if a given address matches for a socket
-+ *
-+ * nxi: the socket's nx_info if any
-+ * addr: to be verified address
-+ */
-+static inline
-+int v6_sock_addr_match (
-+ struct nx_info *nxi,
-+ struct inet_sock *inet,
-+ struct in6_addr *addr)
++ return value;
++}
++
++static inline int __vx_cres_array_avail(struct vx_info *vxi,
++ const int *array, int num, char *_file, int _line)
+{
-+ struct sock *sk = &inet->sk;
-+ struct in6_addr *saddr = inet6_rcv_saddr(sk);
++ struct _vx_limit *limit;
++ rlim_t value = 0;
++ int res;
+
-+ if (!ipv6_addr_any(addr) &&
-+ ipv6_addr_equal(saddr, addr))
++ if (num == 0)
+ return 1;
-+ if (ipv6_addr_any(saddr))
-+ return v6_addr_in_nx_info(nxi, addr, -1);
-+ return 0;
++ if (!vxi)
++ return 1;
++
++ limit = &vxi->limit;
++ res = *array;
++ value = __vx_cres_array_sum(limit, array + 1);
++
++ __rlim_set(limit, res, value);
++ __vx_cres_fixup(limit, res, value);
++
++ return __vx_cres_avail(vxi, res, num, _file, _line);
+}
+
-+/*
-+ * check if address is covered by socket
-+ *
-+ * sk: the socket to check against
-+ * addr: the address in question (must be != 0)
-+ */
+
-+static inline
-+int __v6_addr_match_socket(const struct sock *sk, struct nx_addr_v6 *nxa)
++static inline void vx_limit_fixup(struct _vx_limit *limit, int id)
+{
-+ struct nx_info *nxi = sk->sk_nx_info;
-+ struct in6_addr *saddr = inet6_rcv_saddr(sk);
++ rlim_t value;
++ int res;
+
-+ vxdprintk(VXD_CBIT(net, 5),
-+ "__v6_addr_in_socket(%p," NXAV6_FMT ") %p:%pI6 %p;%lx",
-+ sk, NXAV6(nxa), nxi, saddr, sk->sk_socket,
-+ (sk->sk_socket?sk->sk_socket->flags:0));
++ /* complex resources first */
++ if ((id < 0) || (id == RLIMIT_RSS))
++ __vx_cres_array_fixup(limit, VLA_RSS);
+
-+ if (!ipv6_addr_any(saddr)) { /* direct address match */
-+ return v6_addr_match(nxa, saddr, -1);
-+ } else if (nxi) { /* match against nx_info */
-+ return v6_nx_addr_in_nx_info(nxi, nxa, -1);
-+ } else { /* unrestricted any socket */
-+ return 1;
++ for (res = 0; res < NUM_LIMITS; res++) {
++ if ((id > 0) && (res != id))
++ continue;
++
++ value = __rlim_get(limit, res);
++ __vx_cres_fixup(limit, res, value);
++
++ /* not supposed to happen, maybe warn? */
++ if (__rlim_rmax(limit, res) > __rlim_hard(limit, res))
++ __rlim_rmax(limit, res) = __rlim_hard(limit, res);
+ }
+}
+
+
-+/* inet related checks and helpers */
-+
++#endif /* __KERNEL__ */
++#endif /* _VX_LIMIT_INT_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/monitor.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/monitor.h
+--- linux-2.6.32.59/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/monitor.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,96 @@
++#ifndef _VX_MONITOR_H
++#define _VX_MONITOR_H
+
-+struct in_ifaddr;
-+struct net_device;
-+struct sock;
++#include <linux/types.h>
+
++enum {
++ VXM_UNUSED = 0,
+
-+#include <linux/netdevice.h>
-+#include <linux/inetdevice.h>
-+#include <net/inet_timewait_sock.h>
++ VXM_SYNC = 0x10,
+
++ VXM_UPDATE = 0x20,
++ VXM_UPDATE_1,
++ VXM_UPDATE_2,
+
-+int dev_in_nx_info(struct net_device *, struct nx_info *);
-+int v6_dev_in_nx_info(struct net_device *, struct nx_info *);
-+int nx_v6_addr_conflict(struct nx_info *, struct nx_info *);
++ VXM_RQINFO_1 = 0x24,
++ VXM_RQINFO_2,
+
++ VXM_ACTIVATE = 0x40,
++ VXM_DEACTIVATE,
++ VXM_IDLE,
+
++ VXM_HOLD = 0x44,
++ VXM_UNHOLD,
+
-+static inline
-+int v6_ifa_in_nx_info(struct inet6_ifaddr *ifa, struct nx_info *nxi)
-+{
-+ if (!nxi)
-+ return 1;
-+ if (!ifa)
-+ return 0;
-+ return v6_addr_in_nx_info(nxi, &ifa->addr, -1);
-+}
++ VXM_MIGRATE = 0x48,
++ VXM_RESCHED,
+
-+static inline
-+int nx_v6_ifa_visible(struct nx_info *nxi, struct inet6_ifaddr *ifa)
-+{
-+ vxdprintk(VXD_CBIT(net, 1), "nx_v6_ifa_visible(%p[#%u],%p) %d",
-+ nxi, nxi ? nxi->nx_id : 0, ifa,
-+ nxi ? v6_ifa_in_nx_info(ifa, nxi) : 0);
++ /* all other bits are flags */
++ VXM_SCHED = 0x80,
++};
+
-+ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
-+ return 1;
-+ if (v6_ifa_in_nx_info(ifa, nxi))
-+ return 1;
-+ return 0;
-+}
++struct _vxm_update_1 {
++ uint32_t tokens_max;
++ uint32_t fill_rate;
++ uint32_t interval;
++};
+
++struct _vxm_update_2 {
++ uint32_t tokens_min;
++ uint32_t fill_rate;
++ uint32_t interval;
++};
+
-+struct nx_v6_sock_addr {
-+ struct in6_addr saddr; /* Address used for validation */
-+ struct in6_addr baddr; /* Address used for socket bind */
++struct _vxm_rqinfo_1 {
++ uint16_t running;
++ uint16_t onhold;
++ uint16_t iowait;
++ uint16_t uintr;
++ uint32_t idle_tokens;
+};
+
-+static inline
-+int v6_map_sock_addr(struct inet_sock *inet, struct sockaddr_in6 *addr,
-+ struct nx_v6_sock_addr *nsa)
-+{
-+ // struct sock *sk = &inet->sk;
-+ // struct nx_info *nxi = sk->sk_nx_info;
-+ struct in6_addr saddr = addr->sin6_addr;
-+ struct in6_addr baddr = saddr;
++struct _vxm_rqinfo_2 {
++ uint32_t norm_time;
++ uint32_t idle_time;
++ uint32_t idle_skip;
++};
+
-+ nsa->saddr = saddr;
-+ nsa->baddr = baddr;
-+ return 0;
-+}
++struct _vxm_sched {
++ uint32_t tokens;
++ uint32_t norm_time;
++ uint32_t idle_time;
++};
+
-+static inline
-+void v6_set_sock_addr(struct inet_sock *inet, struct nx_v6_sock_addr *nsa)
-+{
-+ // struct sock *sk = &inet->sk;
-+ // struct in6_addr *saddr = inet6_rcv_saddr(sk);
++struct _vxm_task {
++ uint16_t pid;
++ uint16_t state;
++};
+
-+ // *saddr = nsa->baddr;
-+ // inet->saddr = nsa->baddr;
-+}
++struct _vxm_event {
++ uint32_t jif;
++ union {
++ uint32_t seq;
++ uint32_t sec;
++ };
++ union {
++ uint32_t tokens;
++ uint32_t nsec;
++ struct _vxm_task tsk;
++ };
++};
+
-+static inline
-+int nx_info_has_v6(struct nx_info *nxi)
-+{
-+ if (!nxi)
-+ return 1;
-+ if (NX_IPV6(nxi))
-+ return 1;
-+ return 0;
-+}
++struct _vx_mon_entry {
++ uint16_t type;
++ uint16_t xid;
++ union {
++ struct _vxm_event ev;
++ struct _vxm_sched sd;
++ struct _vxm_update_1 u1;
++ struct _vxm_update_2 u2;
++ struct _vxm_rqinfo_1 q1;
++ struct _vxm_rqinfo_2 q2;
++ };
++};
+
-+#else /* CONFIG_IPV6 */
+
-+static inline
-+int nx_v6_dev_visible(struct nx_info *n, struct net_device *d)
-+{
-+ return 1;
-+}
++#endif /* _VX_MONITOR_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/network.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/network.h
+--- linux-2.6.32.59/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/network.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,146 @@
++#ifndef _VX_NETWORK_H
++#define _VX_NETWORK_H
+
++#include <linux/types.h>
+
-+static inline
-+int nx_v6_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
-+{
-+ return 1;
-+}
+
-+static inline
-+int v6_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
-+{
-+ return 1;
-+}
++#define MAX_N_CONTEXT 65535 /* Arbitrary limit */
+
-+static inline
-+int nx_info_has_v6(struct nx_info *nxi)
-+{
-+ return 0;
-+}
+
-+#endif /* CONFIG_IPV6 */
++/* network flags */
+
-+#define current_nx_info_has_v6() \
-+ nx_info_has_v6(current_nx_info())
++#define NXF_INFO_PRIVATE 0x00000008
+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vs_inet.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_inet.h
---- linux-2.6.32.6/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_inet.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,342 @@
-+#ifndef _VS_INET_H
-+#define _VS_INET_H
++#define NXF_SINGLE_IP 0x00000100
++#define NXF_LBACK_REMAP 0x00000200
++#define NXF_LBACK_ALLOW 0x00000400
+
-+#include "vserver/base.h"
-+#include "vserver/network.h"
-+#include "vserver/debug.h"
++#define NXF_HIDE_NETIF 0x02000000
++#define NXF_HIDE_LBACK 0x04000000
+
-+#define IPI_LOOPBACK htonl(INADDR_LOOPBACK)
++#define NXF_STATE_SETUP (1ULL << 32)
++#define NXF_STATE_ADMIN (1ULL << 34)
+
-+#define NXAV4(a) NIPQUAD((a)->ip[0]), NIPQUAD((a)->ip[1]), \
-+ NIPQUAD((a)->mask), (a)->type
-+#define NXAV4_FMT "[" NIPQUAD_FMT "-" NIPQUAD_FMT "/" NIPQUAD_FMT ":%04x]"
++#define NXF_SC_HELPER (1ULL << 36)
++#define NXF_PERSISTENT (1ULL << 38)
+
++#define NXF_ONE_TIME (0x0005ULL << 32)
+
-+static inline
-+int v4_addr_match(struct nx_addr_v4 *nxa, __be32 addr, uint16_t tmask)
-+{
-+ __be32 ip = nxa->ip[0].s_addr;
-+ __be32 mask = nxa->mask.s_addr;
-+ __be32 bcast = ip | ~mask;
-+ int ret = 0;
+
-+ switch (nxa->type & tmask) {
-+ case NXA_TYPE_MASK:
-+ ret = (ip == (addr & mask));
-+ break;
-+ case NXA_TYPE_ADDR:
-+ ret = 3;
-+ if (addr == ip)
-+ break;
-+ /* fall through to broadcast */
-+ case NXA_MOD_BCAST:
-+ ret = ((tmask & NXA_MOD_BCAST) && (addr == bcast));
-+ break;
-+ case NXA_TYPE_RANGE:
-+ ret = ((nxa->ip[0].s_addr <= addr) &&
-+ (nxa->ip[1].s_addr > addr));
-+ break;
-+ case NXA_TYPE_ANY:
-+ ret = 2;
-+ break;
-+ }
++#define NXF_INIT_SET (__nxf_init_set())
+
-+ vxdprintk(VXD_CBIT(net, 0),
-+ "v4_addr_match(%p" NXAV4_FMT "," NIPQUAD_FMT ",%04x) = %d",
-+ nxa, NXAV4(nxa), NIPQUAD(addr), tmask, ret);
-+ return ret;
++static inline uint64_t __nxf_init_set(void) {
++ return NXF_STATE_ADMIN
++#ifdef CONFIG_VSERVER_AUTO_LBACK
++ | NXF_LBACK_REMAP
++ | NXF_HIDE_LBACK
++#endif
++#ifdef CONFIG_VSERVER_AUTO_SINGLE
++ | NXF_SINGLE_IP
++#endif
++ | NXF_HIDE_NETIF;
+}
+
-+static inline
-+int v4_addr_in_nx_info(struct nx_info *nxi, __be32 addr, uint16_t tmask)
-+{
-+ struct nx_addr_v4 *nxa;
-+ int ret = 1;
+
-+ if (!nxi)
-+ goto out;
++/* network caps */
+
-+ ret = 2;
-+ /* allow 127.0.0.1 when remapping lback */
-+ if ((tmask & NXA_LOOPBACK) &&
-+ (addr == IPI_LOOPBACK) &&
-+ nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
-+ goto out;
-+ ret = 3;
-+ /* check for lback address */
-+ if ((tmask & NXA_MOD_LBACK) &&
-+ (nxi->v4_lback.s_addr == addr))
-+ goto out;
-+ ret = 4;
-+ /* check for broadcast address */
-+ if ((tmask & NXA_MOD_BCAST) &&
-+ (nxi->v4_bcast.s_addr == addr))
-+ goto out;
-+ ret = 5;
-+ /* check for v4 addresses */
-+ for (nxa = &nxi->v4; nxa; nxa = nxa->next)
-+ if (v4_addr_match(nxa, addr, tmask))
-+ goto out;
-+ ret = 0;
-+out:
-+ vxdprintk(VXD_CBIT(net, 0),
-+ "v4_addr_in_nx_info(%p[#%u]," NIPQUAD_FMT ",%04x) = %d",
-+ nxi, nxi ? nxi->nx_id : 0, NIPQUAD(addr), tmask, ret);
-+ return ret;
-+}
++#define NXC_TUN_CREATE 0x00000001
+
-+static inline
-+int v4_nx_addr_match(struct nx_addr_v4 *nxa, struct nx_addr_v4 *addr, uint16_t mask)
-+{
-+ /* FIXME: needs full range checks */
-+ return v4_addr_match(nxa, addr->ip[0].s_addr, mask);
-+}
++#define NXC_RAW_ICMP 0x00000100
+
-+static inline
-+int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask)
-+{
-+ struct nx_addr_v4 *ptr;
+
-+ for (ptr = &nxi->v4; ptr; ptr = ptr->next)
-+ if (v4_nx_addr_match(ptr, nxa, mask))
-+ return 1;
-+ return 0;
-+}
++/* address types */
+
-+#include <net/inet_sock.h>
++#define NXA_TYPE_IPV4 0x0001
++#define NXA_TYPE_IPV6 0x0002
+
-+/*
-+ * Check if a given address matches for a socket
-+ *
-+ * nxi: the socket's nx_info if any
-+ * addr: to be verified address
-+ */
-+static inline
-+int v4_sock_addr_match (
-+ struct nx_info *nxi,
-+ struct inet_sock *inet,
-+ __be32 addr)
-+{
-+ __be32 saddr = inet->rcv_saddr;
-+ __be32 bcast = nxi ? nxi->v4_bcast.s_addr : INADDR_BROADCAST;
++#define NXA_TYPE_NONE 0x0000
++#define NXA_TYPE_ANY 0x00FF
+
-+ if (addr && (saddr == addr || bcast == addr))
-+ return 1;
-+ if (!saddr)
-+ return v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND);
-+ return 0;
-+}
++#define NXA_TYPE_ADDR 0x0010
++#define NXA_TYPE_MASK 0x0020
++#define NXA_TYPE_RANGE 0x0040
+
++#define NXA_MASK_ALL (NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE)
+
-+/* inet related checks and helpers */
++#define NXA_MOD_BCAST 0x0100
++#define NXA_MOD_LBACK 0x0200
+
++#define NXA_LOOPBACK 0x1000
+
-+struct in_ifaddr;
-+struct net_device;
-+struct sock;
++#define NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK)
++#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
+
-+#ifdef CONFIG_INET
++#ifdef __KERNEL__
+
-+#include <linux/netdevice.h>
-+#include <linux/inetdevice.h>
-+#include <net/inet_sock.h>
-+#include <net/inet_timewait_sock.h>
++#include <linux/list.h>
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
++#include <linux/in.h>
++#include <linux/in6.h>
++#include <asm/atomic.h>
+
++struct nx_addr_v4 {
++ struct nx_addr_v4 *next;
++ struct in_addr ip[2];
++ struct in_addr mask;
++ uint16_t type;
++ uint16_t flags;
++};
+
-+int dev_in_nx_info(struct net_device *, struct nx_info *);
-+int v4_dev_in_nx_info(struct net_device *, struct nx_info *);
-+int nx_v4_addr_conflict(struct nx_info *, struct nx_info *);
++struct nx_addr_v6 {
++ struct nx_addr_v6 *next;
++ struct in6_addr ip;
++ struct in6_addr mask;
++ uint32_t prefix;
++ uint16_t type;
++ uint16_t flags;
++};
+
++struct nx_info {
++ struct hlist_node nx_hlist; /* linked list of nxinfos */
++ nid_t nx_id; /* vnet id */
++ atomic_t nx_usecnt; /* usage count */
++ atomic_t nx_tasks; /* tasks count */
++ int nx_state; /* context state */
+
-+/*
-+ * check if address is covered by socket
-+ *
-+ * sk: the socket to check against
-+ * addr: the address in question (must be != 0)
-+ */
++ uint64_t nx_flags; /* network flag word */
++ uint64_t nx_ncaps; /* network capabilities */
+
-+static inline
-+int __v4_addr_match_socket(const struct sock *sk, struct nx_addr_v4 *nxa)
-+{
-+ struct nx_info *nxi = sk->sk_nx_info;
-+ __be32 saddr = inet_rcv_saddr(sk);
++ struct in_addr v4_lback; /* Loopback address */
++ struct in_addr v4_bcast; /* Broadcast address */
++ struct nx_addr_v4 v4; /* First/Single ipv4 address */
++#ifdef CONFIG_IPV6
++ struct nx_addr_v6 v6; /* First/Single ipv6 address */
++#endif
++ char nx_name[65]; /* network context name */
++};
+
-+ vxdprintk(VXD_CBIT(net, 5),
-+ "__v4_addr_in_socket(%p," NXAV4_FMT ") %p:" NIPQUAD_FMT " %p;%lx",
-+ sk, NXAV4(nxa), nxi, NIPQUAD(saddr), sk->sk_socket,
-+ (sk->sk_socket?sk->sk_socket->flags:0));
+
-+ if (saddr) { /* direct address match */
-+ return v4_addr_match(nxa, saddr, -1);
-+ } else if (nxi) { /* match against nx_info */
-+ return v4_nx_addr_in_nx_info(nxi, nxa, -1);
-+ } else { /* unrestricted any socket */
-+ return 1;
-+ }
-+}
++/* status flags */
+
++#define NXS_HASHED 0x0001
++#define NXS_SHUTDOWN 0x0100
++#define NXS_RELEASED 0x8000
+
++extern struct nx_info *lookup_nx_info(int);
+
-+static inline
-+int nx_dev_visible(struct nx_info *nxi, struct net_device *dev)
-+{
-+ vxdprintk(VXD_CBIT(net, 1), "nx_dev_visible(%p[#%u],%p »%s«) %d",
-+ nxi, nxi ? nxi->nx_id : 0, dev, dev->name,
-+ nxi ? dev_in_nx_info(dev, nxi) : 0);
++extern int get_nid_list(int, unsigned int *, int);
++extern int nid_is_hashed(nid_t);
+
-+ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
-+ return 1;
-+ if (dev_in_nx_info(dev, nxi))
-+ return 1;
-+ return 0;
-+}
++extern int nx_migrate_task(struct task_struct *, struct nx_info *);
+
++extern long vs_net_change(struct nx_info *, unsigned int);
+
-+static inline
-+int v4_ifa_in_nx_info(struct in_ifaddr *ifa, struct nx_info *nxi)
-+{
-+ if (!nxi)
-+ return 1;
-+ if (!ifa)
-+ return 0;
-+ return v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW);
-+}
++struct sock;
+
-+static inline
-+int nx_v4_ifa_visible(struct nx_info *nxi, struct in_ifaddr *ifa)
-+{
-+ vxdprintk(VXD_CBIT(net, 1), "nx_v4_ifa_visible(%p[#%u],%p) %d",
-+ nxi, nxi ? nxi->nx_id : 0, ifa,
-+ nxi ? v4_ifa_in_nx_info(ifa, nxi) : 0);
+
-+ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
-+ return 1;
-+ if (v4_ifa_in_nx_info(ifa, nxi))
-+ return 1;
-+ return 0;
-+}
++#define NX_IPV4(n) ((n)->v4.type != NXA_TYPE_NONE)
++#ifdef CONFIG_IPV6
++#define NX_IPV6(n) ((n)->v6.type != NXA_TYPE_NONE)
++#else
++#define NX_IPV6(n) (0)
++#endif
+
++#endif /* __KERNEL__ */
++#endif /* _VX_NETWORK_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/network_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/network_cmd.h
+--- linux-2.6.32.59/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/network_cmd.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,150 @@
++#ifndef _VX_NETWORK_CMD_H
++#define _VX_NETWORK_CMD_H
+
-+struct nx_v4_sock_addr {
-+ __be32 saddr; /* Address used for validation */
-+ __be32 baddr; /* Address used for socket bind */
-+};
+
-+static inline
-+int v4_map_sock_addr(struct inet_sock *inet, struct sockaddr_in *addr,
-+ struct nx_v4_sock_addr *nsa)
-+{
-+ struct sock *sk = &inet->sk;
-+ struct nx_info *nxi = sk->sk_nx_info;
-+ __be32 saddr = addr->sin_addr.s_addr;
-+ __be32 baddr = saddr;
++/* vinfo commands */
+
-+ vxdprintk(VXD_CBIT(net, 3),
-+ "inet_bind(%p)* %p,%p;%lx " NIPQUAD_FMT,
-+ sk, sk->sk_nx_info, sk->sk_socket,
-+ (sk->sk_socket ? sk->sk_socket->flags : 0),
-+ NIPQUAD(saddr));
++#define VCMD_task_nid VC_CMD(VINFO, 2, 0)
+
-+ if (nxi) {
-+ if (saddr == INADDR_ANY) {
-+ if (nx_info_flags(nxi, NXF_SINGLE_IP, 0))
-+ baddr = nxi->v4.ip[0].s_addr;
-+ } else if (saddr == IPI_LOOPBACK) {
-+ if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
-+ baddr = nxi->v4_lback.s_addr;
-+ } else { /* normal address bind */
-+ if (!v4_addr_in_nx_info(nxi, saddr, NXA_MASK_BIND))
-+ return -EADDRNOTAVAIL;
-+ }
-+ }
++#ifdef __KERNEL__
++extern int vc_task_nid(uint32_t);
+
-+ vxdprintk(VXD_CBIT(net, 3),
-+ "inet_bind(%p) " NIPQUAD_FMT ", " NIPQUAD_FMT,
-+ sk, NIPQUAD(saddr), NIPQUAD(baddr));
++#endif /* __KERNEL__ */
+
-+ nsa->saddr = saddr;
-+ nsa->baddr = baddr;
-+ return 0;
-+}
++#define VCMD_nx_info VC_CMD(VINFO, 6, 0)
+
-+static inline
-+void v4_set_sock_addr(struct inet_sock *inet, struct nx_v4_sock_addr *nsa)
-+{
-+ inet->saddr = nsa->baddr;
-+ inet->rcv_saddr = nsa->baddr;
-+}
++struct vcmd_nx_info_v0 {
++ uint32_t nid;
++ /* more to come */
++};
+
++#ifdef __KERNEL__
++extern int vc_nx_info(struct nx_info *, void __user *);
+
-+/*
-+ * helper to simplify inet_lookup_listener
-+ *
-+ * nxi: the socket's nx_info if any
-+ * addr: to be verified address
-+ * saddr: socket address
-+ */
-+static inline int v4_inet_addr_match (
-+ struct nx_info *nxi,
-+ __be32 addr,
-+ __be32 saddr)
-+{
-+ if (addr && (saddr == addr))
-+ return 1;
-+ if (!saddr)
-+ return nxi ? v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND) : 1;
-+ return 0;
-+}
++#endif /* __KERNEL__ */
+
-+static inline __be32 nx_map_sock_lback(struct nx_info *nxi, __be32 addr)
-+{
-+ if (nx_info_flags(nxi, NXF_HIDE_LBACK, 0) &&
-+ (addr == nxi->v4_lback.s_addr))
-+ return IPI_LOOPBACK;
-+ return addr;
-+}
++#include <linux/in.h>
++#include <linux/in6.h>
+
-+static inline
-+int nx_info_has_v4(struct nx_info *nxi)
-+{
-+ if (!nxi)
-+ return 1;
-+ if (NX_IPV4(nxi))
-+ return 1;
-+ if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
-+ return 1;
-+ return 0;
-+}
++#define VCMD_net_create_v0 VC_CMD(VNET, 1, 0)
++#define VCMD_net_create VC_CMD(VNET, 1, 1)
+
-+#else /* CONFIG_INET */
++struct vcmd_net_create {
++ uint64_t flagword;
++};
+
-+static inline
-+int nx_dev_visible(struct nx_info *n, struct net_device *d)
-+{
-+ return 1;
-+}
++#define VCMD_net_migrate VC_CMD(NETMIG, 1, 0)
+
-+static inline
-+int nx_v4_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
-+{
-+ return 1;
-+}
++#define VCMD_net_add VC_CMD(NETALT, 1, 0)
++#define VCMD_net_remove VC_CMD(NETALT, 2, 0)
+
-+static inline
-+int v4_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
-+{
-+ return 1;
-+}
++struct vcmd_net_addr_v0 {
++ uint16_t type;
++ uint16_t count;
++ struct in_addr ip[4];
++ struct in_addr mask[4];
++};
+
-+static inline
-+int nx_info_has_v4(struct nx_info *nxi)
-+{
-+ return 0;
-+}
++#define VCMD_net_add_ipv4 VC_CMD(NETALT, 1, 1)
++#define VCMD_net_remove_ipv4 VC_CMD(NETALT, 2, 1)
+
-+#endif /* CONFIG_INET */
++struct vcmd_net_addr_ipv4_v1 {
++ uint16_t type;
++ uint16_t flags;
++ struct in_addr ip;
++ struct in_addr mask;
++};
+
-+#define current_nx_info_has_v4() \
-+ nx_info_has_v4(current_nx_info())
++#define VCMD_net_add_ipv6 VC_CMD(NETALT, 3, 1)
++#define VCMD_net_remove_ipv6 VC_CMD(NETALT, 4, 1)
+
-+#else
-+// #warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vs_limit.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_limit.h
---- linux-2.6.32.6/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_limit.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,140 @@
-+#ifndef _VS_LIMIT_H
-+#define _VS_LIMIT_H
++struct vcmd_net_addr_ipv6_v1 {
++ uint16_t type;
++ uint16_t flags;
++ uint32_t prefix;
++ struct in6_addr ip;
++ struct in6_addr mask;
++};
+
-+#include "vserver/limit.h"
-+#include "vserver/base.h"
-+#include "vserver/context.h"
-+#include "vserver/debug.h"
-+#include "vserver/context.h"
-+#include "vserver/limit_int.h"
++#define VCMD_add_match_ipv4 VC_CMD(NETALT, 5, 0)
++#define VCMD_get_match_ipv4 VC_CMD(NETALT, 6, 0)
+
++struct vcmd_match_ipv4_v0 {
++ uint16_t type;
++ uint16_t flags;
++ uint16_t parent;
++ uint16_t prefix;
++ struct in_addr ip;
++ struct in_addr ip2;
++ struct in_addr mask;
++};
+
-+#define vx_acc_cres(v, d, p, r) \
-+ __vx_acc_cres(v, r, d, p, __FILE__, __LINE__)
++#define VCMD_add_match_ipv6 VC_CMD(NETALT, 7, 0)
++#define VCMD_get_match_ipv6 VC_CMD(NETALT, 8, 0)
+
-+#define vx_acc_cres_cond(x, d, p, r) \
-+ __vx_acc_cres(((x) == vx_current_xid()) ? current_vx_info() : 0, \
-+ r, d, p, __FILE__, __LINE__)
++struct vcmd_match_ipv6_v0 {
++ uint16_t type;
++ uint16_t flags;
++ uint16_t parent;
++ uint16_t prefix;
++ struct in6_addr ip;
++ struct in6_addr ip2;
++ struct in6_addr mask;
++};
+
+
-+#define vx_add_cres(v, a, p, r) \
-+ __vx_add_cres(v, r, a, p, __FILE__, __LINE__)
-+#define vx_sub_cres(v, a, p, r) vx_add_cres(v, -(a), p, r)
++#ifdef __KERNEL__
++extern int vc_net_create(uint32_t, void __user *);
++extern int vc_net_migrate(struct nx_info *, void __user *);
+
-+#define vx_add_cres_cond(x, a, p, r) \
-+ __vx_add_cres(((x) == vx_current_xid()) ? current_vx_info() : 0, \
-+ r, a, p, __FILE__, __LINE__)
-+#define vx_sub_cres_cond(x, a, p, r) vx_add_cres_cond(x, -(a), p, r)
++extern int vc_net_add(struct nx_info *, void __user *);
++extern int vc_net_remove(struct nx_info *, void __user *);
+
++extern int vc_net_add_ipv4(struct nx_info *, void __user *);
++extern int vc_net_remove_ipv4(struct nx_info *, void __user *);
+
-+/* process and file limits */
++extern int vc_net_add_ipv6(struct nx_info *, void __user *);
++extern int vc_net_remove_ipv6(struct nx_info *, void __user *);
+
-+#define vx_nproc_inc(p) \
-+ vx_acc_cres((p)->vx_info, 1, p, RLIMIT_NPROC)
++extern int vc_add_match_ipv4(struct nx_info *, void __user *);
++extern int vc_get_match_ipv4(struct nx_info *, void __user *);
+
-+#define vx_nproc_dec(p) \
-+ vx_acc_cres((p)->vx_info,-1, p, RLIMIT_NPROC)
++extern int vc_add_match_ipv6(struct nx_info *, void __user *);
++extern int vc_get_match_ipv6(struct nx_info *, void __user *);
+
-+#define vx_files_inc(f) \
-+ vx_acc_cres_cond((f)->f_xid, 1, f, RLIMIT_NOFILE)
++#endif /* __KERNEL__ */
+
-+#define vx_files_dec(f) \
-+ vx_acc_cres_cond((f)->f_xid,-1, f, RLIMIT_NOFILE)
+
-+#define vx_locks_inc(l) \
-+ vx_acc_cres_cond((l)->fl_xid, 1, l, RLIMIT_LOCKS)
++/* flag commands */
+
-+#define vx_locks_dec(l) \
-+ vx_acc_cres_cond((l)->fl_xid,-1, l, RLIMIT_LOCKS)
++#define VCMD_get_nflags VC_CMD(FLAGS, 5, 0)
++#define VCMD_set_nflags VC_CMD(FLAGS, 6, 0)
+
-+#define vx_openfd_inc(f) \
-+ vx_acc_cres(current_vx_info(), 1, (void *)(long)(f), VLIMIT_OPENFD)
++struct vcmd_net_flags_v0 {
++ uint64_t flagword;
++ uint64_t mask;
++};
+
-+#define vx_openfd_dec(f) \
-+ vx_acc_cres(current_vx_info(),-1, (void *)(long)(f), VLIMIT_OPENFD)
++#ifdef __KERNEL__
++extern int vc_get_nflags(struct nx_info *, void __user *);
++extern int vc_set_nflags(struct nx_info *, void __user *);
+
++#endif /* __KERNEL__ */
+
-+#define vx_cres_avail(v, n, r) \
-+ __vx_cres_avail(v, r, n, __FILE__, __LINE__)
+
++/* network caps commands */
+
-+#define vx_nproc_avail(n) \
-+ vx_cres_avail(current_vx_info(), n, RLIMIT_NPROC)
++#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0)
++#define VCMD_set_ncaps VC_CMD(FLAGS, 8, 0)
+
-+#define vx_files_avail(n) \
-+ vx_cres_avail(current_vx_info(), n, RLIMIT_NOFILE)
++struct vcmd_net_caps_v0 {
++ uint64_t ncaps;
++ uint64_t cmask;
++};
+
-+#define vx_locks_avail(n) \
-+ vx_cres_avail(current_vx_info(), n, RLIMIT_LOCKS)
++#ifdef __KERNEL__
++extern int vc_get_ncaps(struct nx_info *, void __user *);
++extern int vc_set_ncaps(struct nx_info *, void __user *);
+
-+#define vx_openfd_avail(n) \
-+ vx_cres_avail(current_vx_info(), n, VLIMIT_OPENFD)
++#endif /* __KERNEL__ */
++#endif /* _VX_CONTEXT_CMD_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/percpu.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/percpu.h
+--- linux-2.6.32.59/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/percpu.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,14 @@
++#ifndef _VX_PERCPU_H
++#define _VX_PERCPU_H
+
++#include "cvirt_def.h"
++#include "sched_def.h"
+
-+/* dentry limits */
++struct _vx_percpu {
++ struct _vx_cvirt_pc cvirt;
++ struct _vx_sched_pc sched;
++};
+
-+#define vx_dentry_inc(d) do { \
-+ if (atomic_read(&d->d_count) == 1) \
-+ vx_acc_cres(current_vx_info(), 1, d, VLIMIT_DENTRY); \
-+ } while (0)
++#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
-+#define vx_dentry_dec(d) do { \
-+ if (atomic_read(&d->d_count) == 0) \
-+ vx_acc_cres(current_vx_info(),-1, d, VLIMIT_DENTRY); \
-+ } while (0)
++#endif /* _VX_PERCPU_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/pid.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/pid.h
+--- linux-2.6.32.59/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/pid.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,51 @@
++#ifndef _VSERVER_PID_H
++#define _VSERVER_PID_H
+
-+#define vx_dentry_avail(n) \
-+ vx_cres_avail(current_vx_info(), n, VLIMIT_DENTRY)
++/* pid faking stuff */
+
++#define vx_info_map_pid(v, p) \
++ __vx_info_map_pid((v), (p), __func__, __FILE__, __LINE__)
++#define vx_info_map_tgid(v,p) vx_info_map_pid(v,p)
++#define vx_map_pid(p) vx_info_map_pid(current_vx_info(), p)
++#define vx_map_tgid(p) vx_map_pid(p)
+
-+/* socket limits */
++static inline int __vx_info_map_pid(struct vx_info *vxi, int pid,
++ const char *func, const char *file, int line)
++{
++ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
++ vxfprintk(VXD_CBIT(cvirt, 2),
++ "vx_map_tgid: %p/%llx: %d -> %d",
++ vxi, (long long)vxi->vx_flags, pid,
++ (pid && pid == vxi->vx_initpid) ? 1 : pid,
++ func, file, line);
++ if (pid == 0)
++ return 0;
++ if (pid == vxi->vx_initpid)
++ return 1;
++ }
++ return pid;
++}
+
-+#define vx_sock_inc(s) \
-+ vx_acc_cres((s)->sk_vx_info, 1, s, VLIMIT_NSOCK)
++#define vx_info_rmap_pid(v, p) \
++ __vx_info_rmap_pid((v), (p), __func__, __FILE__, __LINE__)
++#define vx_rmap_pid(p) vx_info_rmap_pid(current_vx_info(), p)
++#define vx_rmap_tgid(p) vx_rmap_pid(p)
+
-+#define vx_sock_dec(s) \
-+ vx_acc_cres((s)->sk_vx_info,-1, s, VLIMIT_NSOCK)
++static inline int __vx_info_rmap_pid(struct vx_info *vxi, int pid,
++ const char *func, const char *file, int line)
++{
++ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
++ vxfprintk(VXD_CBIT(cvirt, 2),
++ "vx_rmap_tgid: %p/%llx: %d -> %d",
++ vxi, (long long)vxi->vx_flags, pid,
++ (pid == 1) ? vxi->vx_initpid : pid,
++ func, file, line);
++ if ((pid == 1) && vxi->vx_initpid)
++ return vxi->vx_initpid;
++ if (pid == vxi->vx_initpid)
++ return ~0U;
++ }
++ return pid;
++}
+
-+#define vx_sock_avail(n) \
-+ vx_cres_avail(current_vx_info(), n, VLIMIT_NSOCK)
++#endif
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/sched.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/sched.h
+--- linux-2.6.32.59/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/sched.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,26 @@
++#ifndef _VX_SCHED_H
++#define _VX_SCHED_H
+
+
-+/* ipc resource limits */
++#ifdef __KERNEL__
+
-+#define vx_ipcmsg_add(v, u, a) \
-+ vx_add_cres(v, a, u, RLIMIT_MSGQUEUE)
++struct timespec;
+
-+#define vx_ipcmsg_sub(v, u, a) \
-+ vx_sub_cres(v, a, u, RLIMIT_MSGQUEUE)
++void vx_vsi_uptime(struct timespec *, struct timespec *);
+
-+#define vx_ipcmsg_avail(v, a) \
-+ vx_cres_avail(v, a, RLIMIT_MSGQUEUE)
+
++struct vx_info;
+
-+#define vx_ipcshm_add(v, k, a) \
-+ vx_add_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
++void vx_update_load(struct vx_info *);
+
-+#define vx_ipcshm_sub(v, k, a) \
-+ vx_sub_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
+
-+#define vx_ipcshm_avail(v, a) \
-+ vx_cres_avail(v, a, VLIMIT_SHMEM)
++int vx_tokens_recalc(struct _vx_sched_pc *,
++ unsigned long *, unsigned long *, int [2]);
+
++void vx_update_sched_param(struct _vx_sched *sched,
++ struct _vx_sched_pc *sched_pc);
+
-+#define vx_semary_inc(a) \
-+ vx_acc_cres(current_vx_info(), 1, a, VLIMIT_SEMARY)
-+
-+#define vx_semary_dec(a) \
-+ vx_acc_cres(current_vx_info(), -1, a, VLIMIT_SEMARY)
++#endif /* __KERNEL__ */
++#else /* _VX_SCHED_H */
++#warning duplicate inclusion
++#endif /* _VX_SCHED_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/sched_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/sched_cmd.h
+--- linux-2.6.32.59/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/sched_cmd.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,108 @@
++#ifndef _VX_SCHED_CMD_H
++#define _VX_SCHED_CMD_H
+
+
-+#define vx_nsems_add(a,n) \
-+ vx_add_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
++/* sched vserver commands */
+
-+#define vx_nsems_sub(a,n) \
-+ vx_sub_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
++#define VCMD_set_sched_v2 VC_CMD(SCHED, 1, 2)
++#define VCMD_set_sched_v3 VC_CMD(SCHED, 1, 3)
++#define VCMD_set_sched_v4 VC_CMD(SCHED, 1, 4)
+
++struct vcmd_set_sched_v2 {
++ int32_t fill_rate;
++ int32_t interval;
++ int32_t tokens;
++ int32_t tokens_min;
++ int32_t tokens_max;
++ uint64_t cpu_mask;
++};
+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vs_memory.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_memory.h
---- linux-2.6.32.6/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_memory.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,159 @@
-+#ifndef _VS_MEMORY_H
-+#define _VS_MEMORY_H
++struct vcmd_set_sched_v3 {
++ uint32_t set_mask;
++ int32_t fill_rate;
++ int32_t interval;
++ int32_t tokens;
++ int32_t tokens_min;
++ int32_t tokens_max;
++ int32_t priority_bias;
++};
+
-+#include "vserver/limit.h"
-+#include "vserver/base.h"
-+#include "vserver/context.h"
-+#include "vserver/debug.h"
-+#include "vserver/context.h"
-+#include "vserver/limit_int.h"
++struct vcmd_set_sched_v4 {
++ uint32_t set_mask;
++ int32_t fill_rate;
++ int32_t interval;
++ int32_t tokens;
++ int32_t tokens_min;
++ int32_t tokens_max;
++ int32_t prio_bias;
++ int32_t cpu_id;
++ int32_t bucket_id;
++};
+
++#define VCMD_set_sched VC_CMD(SCHED, 1, 5)
++#define VCMD_get_sched VC_CMD(SCHED, 2, 5)
+
-+#define __acc_add_long(a, v) (*(v) += (a))
-+#define __acc_inc_long(v) (++*(v))
-+#define __acc_dec_long(v) (--*(v))
++struct vcmd_sched_v5 {
++ uint32_t mask;
++ int32_t cpu_id;
++ int32_t bucket_id;
++ int32_t fill_rate[2];
++ int32_t interval[2];
++ int32_t tokens;
++ int32_t tokens_min;
++ int32_t tokens_max;
++ int32_t prio_bias;
++};
+
-+#if NR_CPUS >= CONFIG_SPLIT_PTLOCK_CPUS
-+#define __acc_add_atomic(a, v) atomic_long_add(a, v)
-+#define __acc_inc_atomic(v) atomic_long_inc(v)
-+#define __acc_dec_atomic(v) atomic_long_dec(v)
-+#else /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
-+#define __acc_add_atomic(a, v) __acc_add_long(a, v)
-+#define __acc_inc_atomic(v) __acc_inc_long(v)
-+#define __acc_dec_atomic(v) __acc_dec_long(v)
-+#endif /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
++#define VXSM_FILL_RATE 0x0001
++#define VXSM_INTERVAL 0x0002
++#define VXSM_FILL_RATE2 0x0004
++#define VXSM_INTERVAL2 0x0008
++#define VXSM_TOKENS 0x0010
++#define VXSM_TOKENS_MIN 0x0020
++#define VXSM_TOKENS_MAX 0x0040
++#define VXSM_PRIO_BIAS 0x0100
+
++#define VXSM_IDLE_TIME 0x0200
++#define VXSM_FORCE 0x0400
+
-+#define vx_acc_page(m, d, v, r) do { \
-+ if ((d) > 0) \
-+ __acc_inc_long(&(m)->v); \
-+ else \
-+ __acc_dec_long(&(m)->v); \
-+ __vx_acc_cres(m->mm_vx_info, r, d, m, __FILE__, __LINE__); \
-+} while (0)
++#define VXSM_V3_MASK 0x0173
++#define VXSM_SET_MASK 0x01FF
+
-+#define vx_acc_page_atomic(m, d, v, r) do { \
-+ if ((d) > 0) \
-+ __acc_inc_atomic(&(m)->v); \
-+ else \
-+ __acc_dec_atomic(&(m)->v); \
-+ __vx_acc_cres(m->mm_vx_info, r, d, m, __FILE__, __LINE__); \
-+} while (0)
++#define VXSM_CPU_ID 0x1000
++#define VXSM_BUCKET_ID 0x2000
+
++#define VXSM_MSEC 0x4000
+
-+#define vx_acc_pages(m, p, v, r) do { \
-+ unsigned long __p = (p); \
-+ __acc_add_long(__p, &(m)->v); \
-+ __vx_add_cres(m->mm_vx_info, r, __p, m, __FILE__, __LINE__); \
-+} while (0)
++#define SCHED_KEEP (-2) /* only for v2 */
+
-+#define vx_acc_pages_atomic(m, p, v, r) do { \
-+ unsigned long __p = (p); \
-+ __acc_add_atomic(__p, &(m)->v); \
-+ __vx_add_cres(m->mm_vx_info, r, __p, m, __FILE__, __LINE__); \
-+} while (0)
++#ifdef __KERNEL__
+
++#include <linux/compiler.h>
+
++extern int vc_set_sched_v2(struct vx_info *, void __user *);
++extern int vc_set_sched_v3(struct vx_info *, void __user *);
++extern int vc_set_sched_v4(struct vx_info *, void __user *);
++extern int vc_set_sched(struct vx_info *, void __user *);
++extern int vc_get_sched(struct vx_info *, void __user *);
+
-+#define vx_acc_vmpage(m, d) \
-+ vx_acc_page(m, d, total_vm, RLIMIT_AS)
-+#define vx_acc_vmlpage(m, d) \
-+ vx_acc_page(m, d, locked_vm, RLIMIT_MEMLOCK)
-+#define vx_acc_file_rsspage(m, d) \
-+ vx_acc_page_atomic(m, d, _file_rss, VLIMIT_MAPPED)
-+#define vx_acc_anon_rsspage(m, d) \
-+ vx_acc_page_atomic(m, d, _anon_rss, VLIMIT_ANON)
++#endif /* __KERNEL__ */
+
-+#define vx_acc_vmpages(m, p) \
-+ vx_acc_pages(m, p, total_vm, RLIMIT_AS)
-+#define vx_acc_vmlpages(m, p) \
-+ vx_acc_pages(m, p, locked_vm, RLIMIT_MEMLOCK)
-+#define vx_acc_file_rsspages(m, p) \
-+ vx_acc_pages_atomic(m, p, _file_rss, VLIMIT_MAPPED)
-+#define vx_acc_anon_rsspages(m, p) \
-+ vx_acc_pages_atomic(m, p, _anon_rss, VLIMIT_ANON)
++#define VCMD_sched_info VC_CMD(SCHED, 3, 0)
+
-+#define vx_pages_add(s, r, p) __vx_add_cres(s, r, p, 0, __FILE__, __LINE__)
-+#define vx_pages_sub(s, r, p) vx_pages_add(s, r, -(p))
++struct vcmd_sched_info {
++ int32_t cpu_id;
++ int32_t bucket_id;
++ uint64_t user_msec;
++ uint64_t sys_msec;
++ uint64_t hold_msec;
++ uint32_t token_usec;
++ int32_t vavavoom;
++};
+
-+#define vx_vmpages_inc(m) vx_acc_vmpage(m, 1)
-+#define vx_vmpages_dec(m) vx_acc_vmpage(m, -1)
-+#define vx_vmpages_add(m, p) vx_acc_vmpages(m, p)
-+#define vx_vmpages_sub(m, p) vx_acc_vmpages(m, -(p))
++#ifdef __KERNEL__
+
-+#define vx_vmlocked_inc(m) vx_acc_vmlpage(m, 1)
-+#define vx_vmlocked_dec(m) vx_acc_vmlpage(m, -1)
-+#define vx_vmlocked_add(m, p) vx_acc_vmlpages(m, p)
-+#define vx_vmlocked_sub(m, p) vx_acc_vmlpages(m, -(p))
++extern int vc_sched_info(struct vx_info *, void __user *);
+
-+#define vx_file_rsspages_inc(m) vx_acc_file_rsspage(m, 1)
-+#define vx_file_rsspages_dec(m) vx_acc_file_rsspage(m, -1)
-+#define vx_file_rsspages_add(m, p) vx_acc_file_rsspages(m, p)
-+#define vx_file_rsspages_sub(m, p) vx_acc_file_rsspages(m, -(p))
++#endif /* __KERNEL__ */
++#endif /* _VX_SCHED_CMD_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/sched_def.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/sched_def.h
+--- linux-2.6.32.59/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/sched_def.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,68 @@
++#ifndef _VX_SCHED_DEF_H
++#define _VX_SCHED_DEF_H
+
-+#define vx_anon_rsspages_inc(m) vx_acc_anon_rsspage(m, 1)
-+#define vx_anon_rsspages_dec(m) vx_acc_anon_rsspage(m, -1)
-+#define vx_anon_rsspages_add(m, p) vx_acc_anon_rsspages(m, p)
-+#define vx_anon_rsspages_sub(m, p) vx_acc_anon_rsspages(m, -(p))
++#include <linux/spinlock.h>
++#include <linux/jiffies.h>
++#include <linux/cpumask.h>
++#include <asm/atomic.h>
++#include <asm/param.h>
+
+
-+#define vx_pages_avail(m, p, r) \
-+ __vx_cres_avail((m)->mm_vx_info, r, p, __FILE__, __LINE__)
++/* context sub struct */
+
-+#define vx_vmpages_avail(m, p) vx_pages_avail(m, p, RLIMIT_AS)
-+#define vx_vmlocked_avail(m, p) vx_pages_avail(m, p, RLIMIT_MEMLOCK)
-+#define vx_anon_avail(m, p) vx_pages_avail(m, p, VLIMIT_ANON)
-+#define vx_mapped_avail(m, p) vx_pages_avail(m, p, VLIMIT_MAPPED)
++struct _vx_sched {
++ spinlock_t tokens_lock; /* lock for token bucket */
+
-+#define vx_rss_avail(m, p) \
-+ __vx_cres_array_avail((m)->mm_vx_info, VLA_RSS, p, __FILE__, __LINE__)
++ int tokens; /* number of CPU tokens */
++ int fill_rate[2]; /* Fill rate: add X tokens... */
++ int interval[2]; /* Divisor: per Y jiffies */
++ int tokens_min; /* Limit: minimum for unhold */
++ int tokens_max; /* Limit: no more than N tokens */
+
++ int prio_bias; /* bias offset for priority */
+
-+enum {
-+ VXPT_UNKNOWN = 0,
-+ VXPT_ANON,
-+ VXPT_NONE,
-+ VXPT_FILE,
-+ VXPT_SWAP,
-+ VXPT_WRITE
++ unsigned update_mask; /* which features should be updated */
++ cpumask_t update; /* CPUs which should update */
+};
+
-+#if 0
-+#define vx_page_fault(mm, vma, type, ret)
-+#else
-+
-+static inline
-+void __vx_page_fault(struct mm_struct *mm,
-+ struct vm_area_struct *vma, int type, int ret)
-+{
-+ struct vx_info *vxi = mm->mm_vx_info;
-+ int what;
-+/*
-+ static char *page_type[6] =
-+ { "UNKNOWN", "ANON", "NONE", "FILE", "SWAP", "WRITE" };
-+ static char *page_what[4] =
-+ { "FAULT_OOM", "FAULT_SIGBUS", "FAULT_MINOR", "FAULT_MAJOR" };
-+*/
++struct _vx_sched_pc {
++ int tokens; /* number of CPU tokens */
++ int flags; /* bucket flags */
+
-+ if (!vxi)
-+ return;
++ int fill_rate[2]; /* Fill rate: add X tokens... */
++ int interval[2]; /* Divisor: per Y jiffies */
++ int tokens_min; /* Limit: minimum for unhold */
++ int tokens_max; /* Limit: no more than N tokens */
+
-+ what = (ret & 0x3);
++ int prio_bias; /* bias offset for priority */
++ int vavavoom; /* last calculated vavavoom */
+
-+/* printk("[%d] page[%d][%d] %2x %s %s\n", vxi->vx_id,
-+ type, what, ret, page_type[type], page_what[what]);
-+*/
-+ if (ret & VM_FAULT_WRITE)
-+ what |= 0x4;
-+ atomic_inc(&vxi->cacct.page[type][what]);
-+}
++ unsigned long norm_time; /* last time accounted */
++ unsigned long idle_time; /* non linear time for fair sched */
++ unsigned long token_time; /* token time for accounting */
++ unsigned long onhold; /* jiffies when put on hold */
+
-+#define vx_page_fault(mm, vma, type, ret) __vx_page_fault(mm, vma, type, ret)
-+#endif
-+
-+
-+extern unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm);
-+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vs_network.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_network.h
---- linux-2.6.32.6/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_network.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,169 @@
-+#ifndef _NX_VS_NETWORK_H
-+#define _NX_VS_NETWORK_H
-+
-+#include "vserver/context.h"
-+#include "vserver/network.h"
-+#include "vserver/base.h"
-+#include "vserver/check.h"
-+#include "vserver/debug.h"
++ uint64_t user_ticks; /* token tick events */
++ uint64_t sys_ticks; /* token tick events */
++ uint64_t hold_ticks; /* token ticks paused */
++};
+
-+#include <linux/sched.h>
+
++#define VXSF_ONHOLD 0x0001
++#define VXSF_IDLE_TIME 0x0100
+
-+#define get_nx_info(i) __get_nx_info(i, __FILE__, __LINE__)
++#ifdef CONFIG_VSERVER_DEBUG
+
-+static inline struct nx_info *__get_nx_info(struct nx_info *nxi,
-+ const char *_file, int _line)
++static inline void __dump_vx_sched(struct _vx_sched *sched)
+{
-+ if (!nxi)
-+ return NULL;
-+
-+ vxlprintk(VXD_CBIT(nid, 2), "get_nx_info(%p[#%d.%d])",
-+ nxi, nxi ? nxi->nx_id : 0,
-+ nxi ? atomic_read(&nxi->nx_usecnt) : 0,
-+ _file, _line);
-+
-+ atomic_inc(&nxi->nx_usecnt);
-+ return nxi;
++ printk("\t_vx_sched:\n");
++ printk("\t tokens: %4d/%4d, %4d/%4d, %4d, %4d\n",
++ sched->fill_rate[0], sched->interval[0],
++ sched->fill_rate[1], sched->interval[1],
++ sched->tokens_min, sched->tokens_max);
++ printk("\t priority = %4d\n", sched->prio_bias);
+}
+
++#endif
+
-+extern void free_nx_info(struct nx_info *);
++#endif /* _VX_SCHED_DEF_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/signal.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/signal.h
+--- linux-2.6.32.59/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/signal.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,14 @@
++#ifndef _VX_SIGNAL_H
++#define _VX_SIGNAL_H
+
-+#define put_nx_info(i) __put_nx_info(i, __FILE__, __LINE__)
+
-+static inline void __put_nx_info(struct nx_info *nxi, const char *_file, int _line)
-+{
-+ if (!nxi)
-+ return;
++#ifdef __KERNEL__
+
-+ vxlprintk(VXD_CBIT(nid, 2), "put_nx_info(%p[#%d.%d])",
-+ nxi, nxi ? nxi->nx_id : 0,
-+ nxi ? atomic_read(&nxi->nx_usecnt) : 0,
-+ _file, _line);
++struct vx_info;
+
-+ if (atomic_dec_and_test(&nxi->nx_usecnt))
-+ free_nx_info(nxi);
-+}
++int vx_info_kill(struct vx_info *, int, int);
+
++#endif /* __KERNEL__ */
++#else /* _VX_SIGNAL_H */
++#warning duplicate inclusion
++#endif /* _VX_SIGNAL_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/signal_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/signal_cmd.h
+--- linux-2.6.32.59/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/signal_cmd.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,43 @@
++#ifndef _VX_SIGNAL_CMD_H
++#define _VX_SIGNAL_CMD_H
+
-+#define init_nx_info(p, i) __init_nx_info(p, i, __FILE__, __LINE__)
+
-+static inline void __init_nx_info(struct nx_info **nxp, struct nx_info *nxi,
-+ const char *_file, int _line)
-+{
-+ if (nxi) {
-+ vxlprintk(VXD_CBIT(nid, 3),
-+ "init_nx_info(%p[#%d.%d])",
-+ nxi, nxi ? nxi->nx_id : 0,
-+ nxi ? atomic_read(&nxi->nx_usecnt) : 0,
-+ _file, _line);
++/* signalling vserver commands */
+
-+ atomic_inc(&nxi->nx_usecnt);
-+ }
-+ *nxp = nxi;
-+}
++#define VCMD_ctx_kill VC_CMD(PROCTRL, 1, 0)
++#define VCMD_wait_exit VC_CMD(EVENT, 99, 0)
+
++struct vcmd_ctx_kill_v0 {
++ int32_t pid;
++ int32_t sig;
++};
+
-+#define set_nx_info(p, i) __set_nx_info(p, i, __FILE__, __LINE__)
++struct vcmd_wait_exit_v0 {
++ int32_t reboot_cmd;
++ int32_t exit_code;
++};
+
-+static inline void __set_nx_info(struct nx_info **nxp, struct nx_info *nxi,
-+ const char *_file, int _line)
-+{
-+ struct nx_info *nxo;
++#ifdef __KERNEL__
+
-+ if (!nxi)
-+ return;
++extern int vc_ctx_kill(struct vx_info *, void __user *);
++extern int vc_wait_exit(struct vx_info *, void __user *);
+
-+ vxlprintk(VXD_CBIT(nid, 3), "set_nx_info(%p[#%d.%d])",
-+ nxi, nxi ? nxi->nx_id : 0,
-+ nxi ? atomic_read(&nxi->nx_usecnt) : 0,
-+ _file, _line);
++#endif /* __KERNEL__ */
+
-+ atomic_inc(&nxi->nx_usecnt);
-+ nxo = xchg(nxp, nxi);
-+ BUG_ON(nxo);
-+}
++/* process alteration commands */
+
-+#define clr_nx_info(p) __clr_nx_info(p, __FILE__, __LINE__)
++#define VCMD_get_pflags VC_CMD(PROCALT, 5, 0)
++#define VCMD_set_pflags VC_CMD(PROCALT, 6, 0)
+
-+static inline void __clr_nx_info(struct nx_info **nxp,
-+ const char *_file, int _line)
-+{
-+ struct nx_info *nxo;
++struct vcmd_pflags_v0 {
++ uint32_t flagword;
++ uint32_t mask;
++};
+
-+ nxo = xchg(nxp, NULL);
-+ if (!nxo)
-+ return;
++#ifdef __KERNEL__
+
-+ vxlprintk(VXD_CBIT(nid, 3), "clr_nx_info(%p[#%d.%d])",
-+ nxo, nxo ? nxo->nx_id : 0,
-+ nxo ? atomic_read(&nxo->nx_usecnt) : 0,
-+ _file, _line);
++extern int vc_get_pflags(uint32_t pid, void __user *);
++extern int vc_set_pflags(uint32_t pid, void __user *);
+
-+ if (atomic_dec_and_test(&nxo->nx_usecnt))
-+ free_nx_info(nxo);
-+}
++#endif /* __KERNEL__ */
++#endif /* _VX_SIGNAL_CMD_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/space.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/space.h
+--- linux-2.6.32.59/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/space.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,12 @@
++#ifndef _VX_SPACE_H
++#define _VX_SPACE_H
+
++#include <linux/types.h>
+
-+#define claim_nx_info(v, p) __claim_nx_info(v, p, __FILE__, __LINE__)
++struct vx_info;
+
-+static inline void __claim_nx_info(struct nx_info *nxi,
-+ struct task_struct *task, const char *_file, int _line)
-+{
-+ vxlprintk(VXD_CBIT(nid, 3), "claim_nx_info(%p[#%d.%d.%d]) %p",
-+ nxi, nxi ? nxi->nx_id : 0,
-+ nxi?atomic_read(&nxi->nx_usecnt):0,
-+ nxi?atomic_read(&nxi->nx_tasks):0,
-+ task, _file, _line);
++int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index);
+
-+ atomic_inc(&nxi->nx_tasks);
-+}
++#else /* _VX_SPACE_H */
++#warning duplicate inclusion
++#endif /* _VX_SPACE_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/space_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/space_cmd.h
+--- linux-2.6.32.59/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/space_cmd.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,38 @@
++#ifndef _VX_SPACE_CMD_H
++#define _VX_SPACE_CMD_H
+
+
-+extern void unhash_nx_info(struct nx_info *);
++#define VCMD_enter_space_v0 VC_CMD(PROCALT, 1, 0)
++#define VCMD_enter_space_v1 VC_CMD(PROCALT, 1, 1)
++#define VCMD_enter_space VC_CMD(PROCALT, 1, 2)
+
-+#define release_nx_info(v, p) __release_nx_info(v, p, __FILE__, __LINE__)
++#define VCMD_set_space_v0 VC_CMD(PROCALT, 3, 0)
++#define VCMD_set_space_v1 VC_CMD(PROCALT, 3, 1)
++#define VCMD_set_space VC_CMD(PROCALT, 3, 2)
+
-+static inline void __release_nx_info(struct nx_info *nxi,
-+ struct task_struct *task, const char *_file, int _line)
-+{
-+ vxlprintk(VXD_CBIT(nid, 3), "release_nx_info(%p[#%d.%d.%d]) %p",
-+ nxi, nxi ? nxi->nx_id : 0,
-+ nxi ? atomic_read(&nxi->nx_usecnt) : 0,
-+ nxi ? atomic_read(&nxi->nx_tasks) : 0,
-+ task, _file, _line);
++#define VCMD_get_space_mask_v0 VC_CMD(PROCALT, 4, 0)
+
-+ might_sleep();
++#define VCMD_get_space_mask VC_CMD(VSPACE, 0, 1)
++#define VCMD_get_space_default VC_CMD(VSPACE, 1, 0)
+
-+ if (atomic_dec_and_test(&nxi->nx_tasks))
-+ unhash_nx_info(nxi);
-+}
+
++struct vcmd_space_mask_v1 {
++ uint64_t mask;
++};
+
-+#define task_get_nx_info(i) __task_get_nx_info(i, __FILE__, __LINE__)
++struct vcmd_space_mask_v2 {
++ uint64_t mask;
++ uint32_t index;
++};
+
-+static __inline__ struct nx_info *__task_get_nx_info(struct task_struct *p,
-+ const char *_file, int _line)
-+{
-+ struct nx_info *nxi;
+
-+ task_lock(p);
-+ vxlprintk(VXD_CBIT(nid, 5), "task_get_nx_info(%p)",
-+ p, _file, _line);
-+ nxi = __get_nx_info(p->nx_info, _file, _line);
-+ task_unlock(p);
-+ return nxi;
-+}
++#ifdef __KERNEL__
+
++extern int vc_enter_space_v1(struct vx_info *, void __user *);
++extern int vc_set_space_v1(struct vx_info *, void __user *);
++extern int vc_enter_space(struct vx_info *, void __user *);
++extern int vc_set_space(struct vx_info *, void __user *);
++extern int vc_get_space_mask(void __user *, int);
+
-+static inline void exit_nx_info(struct task_struct *p)
-+{
-+ if (p->nx_info)
-+ release_nx_info(p->nx_info, p);
-+}
++#endif /* __KERNEL__ */
++#endif /* _VX_SPACE_CMD_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/switch.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/switch.h
+--- linux-2.6.32.59/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/switch.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,98 @@
++#ifndef _VX_SWITCH_H
++#define _VX_SWITCH_H
+
++#include <linux/types.h>
+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vs_pid.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_pid.h
---- linux-2.6.32.6/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_pid.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,95 @@
-+#ifndef _VS_PID_H
-+#define _VS_PID_H
+
-+#include "vserver/base.h"
-+#include "vserver/check.h"
-+#include "vserver/context.h"
-+#include "vserver/debug.h"
-+#include "vserver/pid.h"
-+#include <linux/pid_namespace.h>
++#define VC_CATEGORY(c) (((c) >> 24) & 0x3F)
++#define VC_COMMAND(c) (((c) >> 16) & 0xFF)
++#define VC_VERSION(c) ((c) & 0xFFF)
+
++#define VC_CMD(c, i, v) ((((VC_CAT_ ## c) & 0x3F) << 24) \
++ | (((i) & 0xFF) << 16) | ((v) & 0xFFF))
+
-+#define VXF_FAKE_INIT (VXF_INFO_INIT | VXF_STATE_INIT)
++/*
+
-+static inline
-+int vx_proc_task_visible(struct task_struct *task)
-+{
-+ if ((task->pid == 1) &&
-+ !vx_flags(VXF_FAKE_INIT, VXF_FAKE_INIT))
-+ /* show a blend through init */
-+ goto visible;
-+ if (vx_check(vx_task_xid(task), VS_WATCH | VS_IDENT))
-+ goto visible;
-+ return 0;
-+visible:
-+ return 1;
-+}
++ Syscall Matrix V2.8
+
-+#define find_task_by_real_pid(pid) find_task_by_pid_ns(pid, &init_pid_ns)
++ |VERSION|CREATE |MODIFY |MIGRATE|CONTROL|EXPERIM| |SPECIAL|SPECIAL|
++ |STATS |DESTROY|ALTER |CHANGE |LIMIT |TEST | | | |
++ |INFO |SETUP | |MOVE | | | | | |
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ SYSTEM |VERSION|VSETUP |VHOST | | | | |DEVICE | |
++ HOST | 00| 01| 02| 03| 04| 05| | 06| 07|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ CPU | |VPROC |PROCALT|PROCMIG|PROCTRL| | |SCHED. | |
++ PROCESS| 08| 09| 10| 11| 12| 13| | 14| 15|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ MEMORY | | | | |MEMCTRL| | |SWAP | |
++ | 16| 17| 18| 19| 20| 21| | 22| 23|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ NETWORK| |VNET |NETALT |NETMIG |NETCTL | | |SERIAL | |
++ | 24| 25| 26| 27| 28| 29| | 30| 31|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ DISK | | | |TAGMIG |DLIMIT | | |INODE | |
++ VFS | 32| 33| 34| 35| 36| 37| | 38| 39|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ OTHER |VSTAT | | | | | | |VINFO | |
++ | 40| 41| 42| 43| 44| 45| | 46| 47|
++ =======+=======+=======+=======+=======+=======+=======+ +=======+=======+
++ SPECIAL|EVENT | | | |FLAGS | | |VSPACE | |
++ | 48| 49| 50| 51| 52| 53| | 54| 55|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ SPECIAL|DEBUG | | | |RLIMIT |SYSCALL| | |COMPAT |
++ | 56| 57| 58| 59| 60|TEST 61| | 62| 63|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
+
-+#if 0
++*/
+
-+static inline
-+struct task_struct *vx_find_proc_task_by_pid(int pid)
-+{
-+ struct task_struct *task = find_task_by_real_pid(pid);
++#define VC_CAT_VERSION 0
+
-+ if (task && !vx_proc_task_visible(task)) {
-+ vxdprintk(VXD_CBIT(misc, 6),
-+ "dropping task (find) %p[#%u,%u] for %p[#%u,%u]",
-+ task, task->xid, task->pid,
-+ current, current->xid, current->pid);
-+ task = NULL;
-+ }
-+ return task;
-+}
++#define VC_CAT_VSETUP 1
++#define VC_CAT_VHOST 2
+
-+#endif
++#define VC_CAT_DEVICE 6
+
-+static inline
-+struct task_struct *vx_get_proc_task(struct inode *inode, struct pid *pid)
-+{
-+ struct task_struct *task = get_pid_task(pid, PIDTYPE_PID);
++#define VC_CAT_VPROC 9
++#define VC_CAT_PROCALT 10
++#define VC_CAT_PROCMIG 11
++#define VC_CAT_PROCTRL 12
+
-+ if (task && !vx_proc_task_visible(task)) {
-+ vxdprintk(VXD_CBIT(misc, 6),
-+ "dropping task (get) %p[#%u,%u] for %p[#%u,%u]",
-+ task, task->xid, task->pid,
-+ current, current->xid, current->pid);
-+ put_task_struct(task);
-+ task = NULL;
-+ }
-+ return task;
-+}
++#define VC_CAT_SCHED 14
++#define VC_CAT_MEMCTRL 20
+
-+#if 0
++#define VC_CAT_VNET 25
++#define VC_CAT_NETALT 26
++#define VC_CAT_NETMIG 27
++#define VC_CAT_NETCTRL 28
+
-+static inline
-+struct task_struct *vx_child_reaper(struct task_struct *p)
-+{
-+ struct vx_info *vxi = p->vx_info;
-+ struct task_struct *reaper = child_reaper(p);
++#define VC_CAT_TAGMIG 35
++#define VC_CAT_DLIMIT 36
++#define VC_CAT_INODE 38
+
-+ if (!vxi)
-+ goto out;
++#define VC_CAT_VSTAT 40
++#define VC_CAT_VINFO 46
++#define VC_CAT_EVENT 48
+
-+ BUG_ON(!p->vx_info->vx_reaper);
++#define VC_CAT_FLAGS 52
++#define VC_CAT_VSPACE 54
++#define VC_CAT_DEBUG 56
++#define VC_CAT_RLIMIT 60
+
-+ /* child reaper for the guest reaper */
-+ if (vxi->vx_reaper == p)
-+ goto out;
++#define VC_CAT_SYSTEST 61
++#define VC_CAT_COMPAT 63
+
-+ reaper = vxi->vx_reaper;
-+out:
-+ vxdprintk(VXD_CBIT(xid, 7),
-+ "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]",
-+ p, p->xid, p->pid, reaper, reaper->xid, reaper->pid);
-+ return reaper;
-+}
++/* query version */
+
-+#endif
++#define VCMD_get_version VC_CMD(VERSION, 0, 0)
++#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
+
+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vs_sched.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_sched.h
---- linux-2.6.32.6/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_sched.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,110 @@
-+#ifndef _VS_SCHED_H
-+#define _VS_SCHED_H
++#ifdef __KERNEL__
+
-+#include "vserver/base.h"
-+#include "vserver/context.h"
-+#include "vserver/sched.h"
++#include <linux/errno.h>
+
++#endif /* __KERNEL__ */
+
-+#define VAVAVOOM_RATIO 50
++#endif /* _VX_SWITCH_H */
+
-+#define MAX_PRIO_BIAS 20
-+#define MIN_PRIO_BIAS -20
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/tag.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/tag.h
+--- linux-2.6.32.59/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/tag.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,143 @@
++#ifndef _DX_TAG_H
++#define _DX_TAG_H
+
++#include <linux/types.h>
+
-+#ifdef CONFIG_VSERVER_HARDCPU
+
-+/*
-+ * effective_prio - return the priority that is based on the static
-+ * priority but is modified by bonuses/penalties.
-+ *
-+ * We scale the actual sleep average [0 .... MAX_SLEEP_AVG]
-+ * into a -4 ... 0 ... +4 bonus/penalty range.
-+ *
-+ * Additionally, we scale another amount based on the number of
-+ * CPU tokens currently held by the context, if the process is
-+ * part of a context (and the appropriate SCHED flag is set).
-+ * This ranges from -5 ... 0 ... +15, quadratically.
-+ *
-+ * So, the total bonus is -9 .. 0 .. +19
-+ * We use ~50% of the full 0...39 priority range so that:
-+ *
-+ * 1) nice +19 interactive tasks do not preempt nice 0 CPU hogs.
-+ * 2) nice -20 CPU hogs do not get preempted by nice 0 tasks.
-+ * unless that context is far exceeding its CPU allocation.
-+ *
-+ * Both properties are important to certain workloads.
-+ */
-+static inline
-+int vx_effective_vavavoom(struct _vx_sched_pc *sched_pc, int max_prio)
-+{
-+ int vavavoom, max;
++#define DX_TAG(in) (IS_TAGGED(in))
+
-+ /* lots of tokens = lots of vavavoom
-+ * no tokens = no vavavoom */
-+ if ((vavavoom = sched_pc->tokens) >= 0) {
-+ max = sched_pc->tokens_max;
-+ vavavoom = max - vavavoom;
-+ max = max * max;
-+ vavavoom = max_prio * VAVAVOOM_RATIO / 100
-+ * (vavavoom*vavavoom - (max >> 2)) / max;
-+ return vavavoom;
-+ }
-+ return 0;
-+}
+
++#ifdef CONFIG_TAG_NFSD
++#define DX_TAG_NFSD 1
++#else
++#define DX_TAG_NFSD 0
++#endif
+
-+static inline
-+int vx_adjust_prio(struct task_struct *p, int prio, int max_user)
-+{
-+ struct vx_info *vxi = p->vx_info;
-+ struct _vx_sched_pc *sched_pc;
+
-+ if (!vxi)
-+ return prio;
++#ifdef CONFIG_TAGGING_NONE
+
-+ sched_pc = &vx_cpu(vxi, sched_pc);
-+ if (vx_info_flags(vxi, VXF_SCHED_PRIO, 0)) {
-+ int vavavoom = vx_effective_vavavoom(sched_pc, max_user);
++#define MAX_UID 0xFFFFFFFF
++#define MAX_GID 0xFFFFFFFF
+
-+ sched_pc->vavavoom = vavavoom;
-+ prio += vavavoom;
-+ }
-+ prio += sched_pc->prio_bias;
-+ return prio;
-+}
++#define INOTAG_TAG(cond, uid, gid, tag) (0)
+
-+#else /* !CONFIG_VSERVER_HARDCPU */
++#define TAGINO_UID(cond, uid, tag) (uid)
++#define TAGINO_GID(cond, gid, tag) (gid)
+
-+static inline
-+int vx_adjust_prio(struct task_struct *p, int prio, int max_user)
-+{
-+ struct vx_info *vxi = p->vx_info;
++#endif
+
-+ if (vxi)
-+ prio += vx_cpu(vxi, sched_pc).prio_bias;
-+ return prio;
-+}
+
-+#endif /* CONFIG_VSERVER_HARDCPU */
++#ifdef CONFIG_TAGGING_GID16
+
++#define MAX_UID 0xFFFFFFFF
++#define MAX_GID 0x0000FFFF
+
-+static inline void vx_account_user(struct vx_info *vxi,
-+ cputime_t cputime, int nice)
-+{
-+ if (!vxi)
-+ return;
-+ vx_cpu(vxi, sched_pc).user_ticks += cputime;
-+}
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? (((gid) >> 16) & 0xFFFF) : 0)
+
-+static inline void vx_account_system(struct vx_info *vxi,
-+ cputime_t cputime, int idle)
-+{
-+ if (!vxi)
-+ return;
-+ vx_cpu(vxi, sched_pc).sys_ticks += cputime;
-+}
++#define TAGINO_UID(cond, uid, tag) (uid)
++#define TAGINO_GID(cond, gid, tag) \
++ ((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid))
+
-+#else
-+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vs_socket.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_socket.h
---- linux-2.6.32.6/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_socket.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,67 @@
-+#ifndef _VS_SOCKET_H
-+#define _VS_SOCKET_H
+
-+#include "vserver/debug.h"
-+#include "vserver/base.h"
-+#include "vserver/cacct.h"
-+#include "vserver/context.h"
-+#include "vserver/tag.h"
+
++#ifdef CONFIG_TAGGING_ID24
+
-+/* socket accounting */
++#define MAX_UID 0x00FFFFFF
++#define MAX_GID 0x00FFFFFF
+
-+#include <linux/socket.h>
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0)
+
-+static inline int vx_sock_type(int family)
-+{
-+ switch (family) {
-+ case PF_UNSPEC:
-+ return VXA_SOCK_UNSPEC;
-+ case PF_UNIX:
-+ return VXA_SOCK_UNIX;
-+ case PF_INET:
-+ return VXA_SOCK_INET;
-+ case PF_INET6:
-+ return VXA_SOCK_INET6;
-+ case PF_PACKET:
-+ return VXA_SOCK_PACKET;
-+ default:
-+ return VXA_SOCK_OTHER;
-+ }
-+}
++#define TAGINO_UID(cond, uid, tag) \
++ ((cond) ? (((uid) & 0xFFFFFF) | (((tag) & 0xFF00) << 16)) : (uid))
++#define TAGINO_GID(cond, gid, tag) \
++ ((cond) ? (((gid) & 0xFFFFFF) | (((tag) & 0x00FF) << 24)) : (gid))
+
-+#define vx_acc_sock(v, f, p, s) \
-+ __vx_acc_sock(v, f, p, s, __FILE__, __LINE__)
++#endif
+
-+static inline void __vx_acc_sock(struct vx_info *vxi,
-+ int family, int pos, int size, char *file, int line)
-+{
-+ if (vxi) {
-+ int type = vx_sock_type(family);
+
-+ atomic_long_inc(&vxi->cacct.sock[type][pos].count);
-+ atomic_long_add(size, &vxi->cacct.sock[type][pos].total);
-+ }
-+}
-+
-+#define vx_sock_recv(sk, s) \
-+ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 0, s)
-+#define vx_sock_send(sk, s) \
-+ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 1, s)
-+#define vx_sock_fail(sk, s) \
-+ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 2, s)
++#ifdef CONFIG_TAGGING_UID16
+
++#define MAX_UID 0x0000FFFF
++#define MAX_GID 0xFFFFFFFF
+
-+#define sock_vx_init(s) do { \
-+ (s)->sk_xid = 0; \
-+ (s)->sk_vx_info = NULL; \
-+ } while (0)
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? (((uid) >> 16) & 0xFFFF) : 0)
+
-+#define sock_nx_init(s) do { \
-+ (s)->sk_nid = 0; \
-+ (s)->sk_nx_info = NULL; \
-+ } while (0)
++#define TAGINO_UID(cond, uid, tag) \
++ ((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid))
++#define TAGINO_GID(cond, gid, tag) (gid)
+
-+#else
-+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vs_tag.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_tag.h
---- linux-2.6.32.6/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_tag.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,47 @@
-+#ifndef _VS_TAG_H
-+#define _VS_TAG_H
+
-+#include <linux/vserver/tag.h>
+
-+/* check conditions */
++#ifdef CONFIG_TAGGING_INTERN
+
-+#define DX_ADMIN 0x0001
-+#define DX_WATCH 0x0002
-+#define DX_HOSTID 0x0008
++#define MAX_UID 0xFFFFFFFF
++#define MAX_GID 0xFFFFFFFF
+
-+#define DX_IDENT 0x0010
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? (tag) : 0)
+
-+#define DX_ARG_MASK 0x0010
++#define TAGINO_UID(cond, uid, tag) (uid)
++#define TAGINO_GID(cond, gid, tag) (gid)
+
++#endif
+
-+#define dx_task_tag(t) ((t)->tag)
+
-+#define dx_current_tag() dx_task_tag(current)
++#ifndef CONFIG_TAGGING_NONE
++#define dx_current_fstag(sb) \
++ ((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0)
++#else
++#define dx_current_fstag(sb) (0)
++#endif
+
-+#define dx_check(c, m) __dx_check(dx_current_tag(), c, m)
++#ifndef CONFIG_TAGGING_INTERN
++#define TAGINO_TAG(cond, tag) (0)
++#else
++#define TAGINO_TAG(cond, tag) ((cond) ? (tag) : 0)
++#endif
+
-+#define dx_weak_check(c, m) ((m) ? dx_check(c, m) : 1)
++#define INOTAG_UID(cond, uid, gid) \
++ ((cond) ? ((uid) & MAX_UID) : (uid))
++#define INOTAG_GID(cond, uid, gid) \
++ ((cond) ? ((gid) & MAX_GID) : (gid))
+
+
-+/*
-+ * check current context for ADMIN/WATCH and
-+ * optionally against supplied argument
-+ */
-+static inline int __dx_check(tag_t cid, tag_t id, unsigned int mode)
++static inline uid_t dx_map_uid(uid_t uid)
+{
-+ if (mode & DX_ARG_MASK) {
-+ if ((mode & DX_IDENT) && (id == cid))
-+ return 1;
-+ }
-+ return (((mode & DX_ADMIN) && (cid == 0)) ||
-+ ((mode & DX_WATCH) && (cid == 1)) ||
-+ ((mode & DX_HOSTID) && (id == 0)));
++ if ((uid > MAX_UID) && (uid != -1))
++ uid = -2;
++ return (uid & MAX_UID);
+}
+
-+struct inode;
-+int dx_permission(const struct inode *inode, int mask);
++static inline gid_t dx_map_gid(gid_t gid)
++{
++ if ((gid > MAX_GID) && (gid != -1))
++ gid = -2;
++ return (gid & MAX_GID);
++}
+
++struct peer_tag {
++ int32_t xid;
++ int32_t nid;
++};
+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/linux/vs_time.h linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_time.h
---- linux-2.6.32.6/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/linux/vs_time.h 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,19 @@
-+#ifndef _VS_TIME_H
-+#define _VS_TIME_H
++#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK))
+
++int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags,
++ unsigned long *flags);
+
-+/* time faking stuff */
++#ifdef CONFIG_PROPAGATE
+
-+#ifdef CONFIG_VSERVER_VTIME
++void __dx_propagate_tag(struct nameidata *nd, struct inode *inode);
+
-+extern void vx_gettimeofday(struct timeval *tv);
-+extern int vx_settimeofday(struct timespec *ts);
++#define dx_propagate_tag(n, i) __dx_propagate_tag(n, i)
+
+#else
-+#define vx_gettimeofday(t) do_gettimeofday(t)
-+#define vx_settimeofday(t) do_settimeofday(t)
++#define dx_propagate_tag(n, i) do { } while (0)
+#endif
+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.32.6/include/net/addrconf.h linux-2.6.32.6-vs2.3.0.36.28/include/net/addrconf.h
---- linux-2.6.32.6/include/net/addrconf.h 2009-12-03 20:02:57.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/net/addrconf.h 2009-12-03 20:04:56.000000000 +0100
++#endif /* _DX_TAG_H */
+diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/tag_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/tag_cmd.h
+--- linux-2.6.32.59/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/tag_cmd.h 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,22 @@
++#ifndef _VX_TAG_CMD_H
++#define _VX_TAG_CMD_H
++
++
++/* vinfo commands */
++
++#define VCMD_task_tag VC_CMD(VINFO, 3, 0)
++
++#ifdef __KERNEL__
++extern int vc_task_tag(uint32_t);
++
++#endif /* __KERNEL__ */
++
++/* context commands */
++
++#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0)
++
++#ifdef __KERNEL__
++extern int vc_tag_migrate(uint32_t);
++
++#endif /* __KERNEL__ */
++#endif /* _VX_TAG_CMD_H */
+diff -NurpP --minimal linux-2.6.32.59/include/net/addrconf.h linux-2.6.32.59-vs2.3.0.36.29.9/include/net/addrconf.h
+--- linux-2.6.32.59/include/net/addrconf.h 2009-12-03 20:02:57.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/net/addrconf.h 2011-06-10 13:03:02.000000000 +0200
@@ -84,7 +84,8 @@ extern int ipv6_dev_get_saddr(struct n
struct net_device *dev,
const struct in6_addr *daddr,
extern int ipv6_get_lladdr(struct net_device *dev,
struct in6_addr *addr,
unsigned char banned_flags);
-diff -NurpP --minimal linux-2.6.32.6/include/net/af_unix.h linux-2.6.32.6-vs2.3.0.36.28/include/net/af_unix.h
---- linux-2.6.32.6/include/net/af_unix.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/net/af_unix.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/net/af_unix.h linux-2.6.32.59-vs2.3.0.36.29.9/include/net/af_unix.h
+--- linux-2.6.32.59/include/net/af_unix.h 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/net/af_unix.h 2011-06-10 13:03:02.000000000 +0200
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
#include <net/sock.h>
extern void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-2.6.32.6/include/net/inet_timewait_sock.h linux-2.6.32.6-vs2.3.0.36.28/include/net/inet_timewait_sock.h
---- linux-2.6.32.6/include/net/inet_timewait_sock.h 2009-12-03 20:02:57.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/net/inet_timewait_sock.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/net/inet_timewait_sock.h linux-2.6.32.59-vs2.3.0.36.29.9/include/net/inet_timewait_sock.h
+--- linux-2.6.32.59/include/net/inet_timewait_sock.h 2009-12-03 20:02:57.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/net/inet_timewait_sock.h 2011-06-10 13:03:02.000000000 +0200
@@ -117,6 +117,10 @@ struct inet_timewait_sock {
#define tw_hash __tw_common.skc_hash
#define tw_prot __tw_common.skc_prot
int tw_timeout;
volatile unsigned char tw_substate;
/* 3 bits hole, try to pack */
-diff -NurpP --minimal linux-2.6.32.6/include/net/route.h linux-2.6.32.6-vs2.3.0.36.28/include/net/route.h
---- linux-2.6.32.6/include/net/route.h 2009-09-10 15:26:27.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/net/route.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/net/route.h linux-2.6.32.59-vs2.3.0.36.29.9/include/net/route.h
+--- linux-2.6.32.59/include/net/route.h 2009-09-10 15:26:27.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/net/route.h 2011-06-10 13:03:02.000000000 +0200
@@ -135,6 +135,9 @@ static inline void ip_rt_put(struct rtab
dst_release(&rt->u.dst);
}
err = __ip_route_output_key(net, rp, &fl);
if (err)
return err;
-diff -NurpP --minimal linux-2.6.32.6/include/net/sock.h linux-2.6.32.6-vs2.3.0.36.28/include/net/sock.h
---- linux-2.6.32.6/include/net/sock.h 2009-12-03 20:02:57.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/include/net/sock.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/include/net/sock.h linux-2.6.32.59-vs2.3.0.36.29.9/include/net/sock.h
+--- linux-2.6.32.59/include/net/sock.h 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/include/net/sock.h 2012-03-23 18:34:19.000000000 +0100
@@ -139,6 +139,10 @@ struct sock_common {
#ifdef CONFIG_NET_NS
struct net *skc_net;
kmemcheck_bitfield_begin(flags);
unsigned int sk_shutdown : 2,
sk_no_check : 2,
-diff -NurpP --minimal linux-2.6.32.6/init/Kconfig linux-2.6.32.6-vs2.3.0.36.28/init/Kconfig
---- linux-2.6.32.6/init/Kconfig 2009-12-03 20:02:57.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/init/Kconfig 2009-12-03 20:04:56.000000000 +0100
-@@ -477,6 +477,19 @@ config CGROUP_SCHED
-
- endchoice
+diff -NurpP --minimal linux-2.6.32.59/init/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/init/Kconfig
+--- linux-2.6.32.59/init/Kconfig 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/init/Kconfig 2011-06-10 13:03:02.000000000 +0200
+@@ -426,6 +426,19 @@ config LOG_BUF_SHIFT
+ config HAVE_UNSTABLE_SCHED_CLOCK
+ bool
+config CFS_HARD_LIMITS
+ bool "Hard Limits for CFS Group Scheduler"
menuconfig CGROUPS
boolean "Control Group support"
help
-diff -NurpP --minimal linux-2.6.32.6/init/main.c linux-2.6.32.6-vs2.3.0.36.28/init/main.c
---- linux-2.6.32.6/init/main.c 2009-12-03 20:02:57.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/init/main.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/init/main.c linux-2.6.32.59-vs2.3.0.36.29.9/init/main.c
+--- linux-2.6.32.59/init/main.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/init/main.c 2011-06-10 13:03:02.000000000 +0200
@@ -70,6 +70,7 @@
#include <linux/sfi.h>
#include <linux/shmem_fs.h>
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-2.6.32.6/ipc/mqueue.c linux-2.6.32.6-vs2.3.0.36.28/ipc/mqueue.c
---- linux-2.6.32.6/ipc/mqueue.c 2009-12-03 20:02:57.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/ipc/mqueue.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/ipc/mqueue.c linux-2.6.32.59-vs2.3.0.36.29.9/ipc/mqueue.c
+--- linux-2.6.32.59/ipc/mqueue.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/ipc/mqueue.c 2011-06-10 13:03:02.000000000 +0200
@@ -33,6 +33,8 @@
#include <linux/pid.h>
#include <linux/ipc_namespace.h>
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-2.6.32.6/ipc/msg.c linux-2.6.32.6-vs2.3.0.36.28/ipc/msg.c
---- linux-2.6.32.6/ipc/msg.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/ipc/msg.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/ipc/msg.c linux-2.6.32.59-vs2.3.0.36.29.9/ipc/msg.c
+--- linux-2.6.32.59/ipc/msg.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/ipc/msg.c 2011-06-10 13:03:02.000000000 +0200
@@ -38,6 +38,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
#include <asm/current.h>
#include <asm/uaccess.h>
-@@ -190,6 +191,7 @@ static int newque(struct ipc_namespace *
+@@ -191,6 +192,7 @@ static int newque(struct ipc_namespace *
msq->q_perm.mode = msgflg & S_IRWXUGO;
msq->q_perm.key = key;
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-2.6.32.6/ipc/namespace.c linux-2.6.32.6-vs2.3.0.36.28/ipc/namespace.c
---- linux-2.6.32.6/ipc/namespace.c 2009-09-10 15:26:27.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/ipc/namespace.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/ipc/namespace.c linux-2.6.32.59-vs2.3.0.36.29.9/ipc/namespace.c
+--- linux-2.6.32.59/ipc/namespace.c 2009-09-10 15:26:27.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/ipc/namespace.c 2011-06-10 13:03:02.000000000 +0200
@@ -11,6 +11,8 @@
#include <linux/slab.h>
#include <linux/fs.h>
#include "util.h"
-diff -NurpP --minimal linux-2.6.32.6/ipc/sem.c linux-2.6.32.6-vs2.3.0.36.28/ipc/sem.c
---- linux-2.6.32.6/ipc/sem.c 2009-09-10 15:26:27.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/ipc/sem.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/ipc/sem.c linux-2.6.32.59-vs2.3.0.36.29.9/ipc/sem.c
+--- linux-2.6.32.59/ipc/sem.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/ipc/sem.c 2011-06-10 13:03:02.000000000 +0200
@@ -83,6 +83,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include "util.h"
-@@ -255,6 +257,7 @@ static int newary(struct ipc_namespace *
+@@ -256,6 +258,7 @@ static int newary(struct ipc_namespace *
sma->sem_perm.mode = (semflg & S_IRWXUGO);
sma->sem_perm.key = key;
sma->sem_perm.security = NULL;
retval = security_sem_alloc(sma);
-@@ -270,6 +273,9 @@ static int newary(struct ipc_namespace *
+@@ -271,6 +274,9 @@ static int newary(struct ipc_namespace *
return id;
}
ns->used_sems += nsems;
sma->sem_base = (struct sem *) &sma[1];
INIT_LIST_HEAD(&sma->sem_pending);
-@@ -546,6 +552,9 @@ static void freeary(struct ipc_namespace
+@@ -547,6 +553,9 @@ static void freeary(struct ipc_namespace
sem_unlock(sma);
ns->used_sems -= sma->sem_nsems;
security_sem_free(sma);
ipc_rcu_putref(sma);
}
-diff -NurpP --minimal linux-2.6.32.6/ipc/shm.c linux-2.6.32.6-vs2.3.0.36.28/ipc/shm.c
---- linux-2.6.32.6/ipc/shm.c 2010-01-26 19:31:27.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/ipc/shm.c 2010-01-20 04:21:33.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/ipc/shm.c linux-2.6.32.59-vs2.3.0.36.29.9/ipc/shm.c
+--- linux-2.6.32.59/ipc/shm.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/ipc/shm.c 2011-06-10 13:03:02.000000000 +0200
@@ -40,6 +40,8 @@
#include <linux/mount.h>
#include <linux/ipc_namespace.h>
#include <asm/uaccess.h>
-@@ -169,7 +171,12 @@ static void shm_open(struct vm_area_stru
+@@ -170,7 +172,12 @@ static void shm_open(struct vm_area_stru
*/
static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp)
{
shm_rmid(ns, shp);
shm_unlock(shp);
if (!is_file_hugepages(shp->shm_file))
-@@ -179,6 +186,7 @@ static void shm_destroy(struct ipc_names
+@@ -180,6 +187,7 @@ static void shm_destroy(struct ipc_names
shp->mlock_user);
fput (shp->shm_file);
security_shm_free(shp);
ipc_rcu_putref(shp);
}
-@@ -349,11 +357,15 @@ static int newseg(struct ipc_namespace *
+@@ -350,11 +358,15 @@ static int newseg(struct ipc_namespace *
if (ns->shm_tot + numpages > ns->shm_ctlall)
return -ENOSPC;
shp->shm_perm.mode = (shmflg & S_IRWXUGO);
shp->mlock_user = NULL;
-@@ -407,6 +419,7 @@ static int newseg(struct ipc_namespace *
+@@ -408,6 +420,7 @@ static int newseg(struct ipc_namespace *
ns->shm_tot += numpages;
error = shp->shm_perm.id;
shm_unlock(shp);
return error;
no_id:
-diff -NurpP --minimal linux-2.6.32.6/kernel/capability.c linux-2.6.32.6-vs2.3.0.36.28/kernel/capability.c
---- linux-2.6.32.6/kernel/capability.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/capability.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/Makefile linux-2.6.32.59-vs2.3.0.36.29.9/kernel/Makefile
+--- linux-2.6.32.59/kernel/Makefile 2009-12-03 20:02:57.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/Makefile 2011-06-10 13:03:02.000000000 +0200
+@@ -23,6 +23,7 @@ CFLAGS_REMOVE_cgroup-debug.o = -pg
+ CFLAGS_REMOVE_sched_clock.o = -pg
+ endif
+
++obj-y += vserver/
+ obj-$(CONFIG_FREEZER) += freezer.o
+ obj-$(CONFIG_PROFILING) += profile.o
+ obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o
+diff -NurpP --minimal linux-2.6.32.59/kernel/capability.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/capability.c
+--- linux-2.6.32.59/kernel/capability.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/capability.c 2011-06-10 13:03:02.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
#include <linux/pid_namespace.h>
+#include <linux/vs_context.h>
#include <asm/uaccess.h>
- #include "cred-internals.h"
-@@ -122,6 +123,7 @@ static int cap_validate_magic(cap_user_h
+ /*
+@@ -121,6 +122,7 @@ static int cap_validate_magic(cap_user_h
return 0;
}
/*
* The only thing that can change the capabilities of the current
* process is the current process. As such, we can't be in this code
-@@ -289,6 +291,8 @@ error:
+@@ -288,6 +290,8 @@ error:
return ret;
}
/**
* capable - Determine if the current task has a superior capability in effect
* @cap: The capability to be tested for
-@@ -301,6 +305,9 @@ error:
+@@ -300,6 +304,9 @@ error:
*/
int capable(int cap)
{
if (unlikely(!cap_valid(cap))) {
printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
BUG();
-diff -NurpP --minimal linux-2.6.32.6/kernel/compat.c linux-2.6.32.6-vs2.3.0.36.28/kernel/compat.c
---- linux-2.6.32.6/kernel/compat.c 2009-09-10 15:26:27.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/compat.c 2009-12-03 20:04:56.000000000 +0100
-@@ -902,7 +902,7 @@ asmlinkage long compat_sys_time(compat_t
+diff -NurpP --minimal linux-2.6.32.59/kernel/compat.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/compat.c
+--- linux-2.6.32.59/kernel/compat.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/compat.c 2011-06-10 13:03:02.000000000 +0200
+@@ -900,7 +900,7 @@ asmlinkage long compat_sys_time(compat_t
compat_time_t i;
struct timeval tv;
i = tv.tv_sec;
if (tloc) {
-@@ -927,7 +927,7 @@ asmlinkage long compat_sys_stime(compat_
+@@ -925,7 +925,7 @@ asmlinkage long compat_sys_stime(compat_
if (err)
return err;
return 0;
}
-diff -NurpP --minimal linux-2.6.32.6/kernel/exit.c linux-2.6.32.6-vs2.3.0.36.28/kernel/exit.c
---- linux-2.6.32.6/kernel/exit.c 2009-12-03 20:02:57.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/exit.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/exit.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/exit.c
+--- linux-2.6.32.59/kernel/exit.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/exit.c 2011-06-10 13:03:02.000000000 +0200
@@ -48,6 +48,10 @@
#include <linux/fs_struct.h>
#include <linux/init_task.h>
#include <trace/events/sched.h>
#include <asm/uaccess.h>
-@@ -488,9 +492,11 @@ static void close_files(struct files_str
+@@ -495,9 +499,11 @@ static void close_files(struct files_str
filp_close(file, files);
cond_resched();
}
}
}
}
-@@ -1011,11 +1017,16 @@ NORET_TYPE void do_exit(long code)
+@@ -1027,11 +1033,16 @@ NORET_TYPE void do_exit(long code)
validate_creds_for_do_exit(tsk);
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-diff -NurpP --minimal linux-2.6.32.6/kernel/fork.c linux-2.6.32.6-vs2.3.0.36.28/kernel/fork.c
---- linux-2.6.32.6/kernel/fork.c 2009-12-03 20:02:57.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/fork.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/fork.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/fork.c
+--- linux-2.6.32.59/kernel/fork.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/fork.c 2011-06-10 13:03:02.000000000 +0200
@@ -64,6 +64,10 @@
#include <linux/magic.h>
#include <linux/perf_event.h>
cpumask_clear(mm_cpumask(mm));
mm->mm_rb = RB_ROOT;
rb_link = &mm->mm_rb.rb_node;
-@@ -310,7 +318,7 @@ static int dup_mmap(struct mm_struct *mm
+@@ -311,7 +319,7 @@ static int dup_mmap(struct mm_struct *mm
if (mpnt->vm_flags & VM_DONTCOPY) {
long pages = vma_pages(mpnt);
vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
-pages);
continue;
-@@ -452,8 +460,8 @@ static struct mm_struct * mm_init(struct
+@@ -455,8 +463,8 @@ static struct mm_struct * mm_init(struct
(current->mm->flags & MMF_INIT_MASK) : default_dump_filter;
mm->core_state = NULL;
mm->nr_ptes = 0;
spin_lock_init(&mm->page_table_lock);
mm->free_area_cache = TASK_UNMAPPED_BASE;
mm->cached_hole_size = ~0UL;
-@@ -463,6 +471,7 @@ static struct mm_struct * mm_init(struct
+@@ -466,6 +474,7 @@ static struct mm_struct * mm_init(struct
if (likely(!mm_alloc_pgd(mm))) {
mm->def_flags = 0;
mmu_notifier_mm_init(mm);
return mm;
}
-@@ -496,6 +505,7 @@ void __mmdrop(struct mm_struct *mm)
+@@ -499,6 +508,7 @@ void __mmdrop(struct mm_struct *mm)
mm_free_pgd(mm);
destroy_context(mm);
mmu_notifier_mm_destroy(mm);
free_mm(mm);
}
EXPORT_SYMBOL_GPL(__mmdrop);
-@@ -631,6 +641,7 @@ struct mm_struct *dup_mm(struct task_str
+@@ -634,6 +644,7 @@ struct mm_struct *dup_mm(struct task_str
goto fail_nomem;
memcpy(mm, oldmm, sizeof(*mm));
/* Initializing for Swap token stuff */
mm->token_priority = 0;
-@@ -669,6 +680,7 @@ fail_nocontext:
+@@ -672,6 +683,7 @@ fail_nocontext:
* If init_new_context() failed, we cannot use mmput() to free the mm
* because it calls destroy_context()
*/
mm_free_pgd(mm);
free_mm(mm);
return NULL;
-@@ -980,6 +992,8 @@ static struct task_struct *copy_process(
+@@ -986,6 +998,8 @@ static struct task_struct *copy_process(
int retval;
struct task_struct *p;
int cgroup_callbacks_done = 0;
if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
return ERR_PTR(-EINVAL);
-@@ -1026,12 +1040,28 @@ static struct task_struct *copy_process(
+@@ -1032,12 +1046,28 @@ static struct task_struct *copy_process(
DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
#endif
}
retval = copy_creds(p, clone_flags);
-@@ -1300,6 +1330,18 @@ static struct task_struct *copy_process(
+@@ -1289,6 +1319,18 @@ static struct task_struct *copy_process(
total_forks++;
spin_unlock(¤t->sighand->siglock);
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
cgroup_post_fork(p);
-@@ -1341,6 +1383,9 @@ bad_fork_cleanup_cgroup:
+@@ -1330,6 +1372,9 @@ bad_fork_cleanup_cgroup:
bad_fork_cleanup_count:
atomic_dec(&p->cred->user->processes);
exit_creds(p);
bad_fork_free:
free_task(p);
fork_out:
-diff -NurpP --minimal linux-2.6.32.6/kernel/kthread.c linux-2.6.32.6-vs2.3.0.36.28/kernel/kthread.c
---- linux-2.6.32.6/kernel/kthread.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/kthread.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/kthread.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/kthread.c
+--- linux-2.6.32.59/kernel/kthread.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/kthread.c 2011-06-10 13:03:02.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/file.h>
#include <linux/module.h>
#include <trace/events/sched.h>
static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-2.6.32.6/kernel/Makefile linux-2.6.32.6-vs2.3.0.36.28/kernel/Makefile
---- linux-2.6.32.6/kernel/Makefile 2009-12-03 20:02:57.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/Makefile 2009-12-03 20:04:56.000000000 +0100
-@@ -23,6 +23,7 @@ CFLAGS_REMOVE_cgroup-debug.o = -pg
- CFLAGS_REMOVE_sched_clock.o = -pg
- endif
-
-+obj-y += vserver/
- obj-$(CONFIG_FREEZER) += freezer.o
- obj-$(CONFIG_PROFILING) += profile.o
- obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o
-diff -NurpP --minimal linux-2.6.32.6/kernel/nsproxy.c linux-2.6.32.6-vs2.3.0.36.28/kernel/nsproxy.c
---- linux-2.6.32.6/kernel/nsproxy.c 2009-09-10 15:26:28.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/nsproxy.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/nsproxy.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/nsproxy.c
+--- linux-2.6.32.59/kernel/nsproxy.c 2009-09-10 15:26:28.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/nsproxy.c 2011-06-10 13:03:02.000000000 +0200
@@ -19,6 +19,8 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
return -EPERM;
*new_nsp = create_new_namespaces(unshare_flags, current,
-diff -NurpP --minimal linux-2.6.32.6/kernel/pid.c linux-2.6.32.6-vs2.3.0.36.28/kernel/pid.c
---- linux-2.6.32.6/kernel/pid.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/pid.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/pid.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/pid.c
+--- linux-2.6.32.59/kernel/pid.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/pid.c 2011-06-10 13:03:02.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/pid_namespace.h>
#include <linux/init_task.h>
#define pid_hashfn(nr, ns) \
hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift)
-@@ -305,7 +306,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns);
+@@ -308,7 +309,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns);
struct pid *find_vpid(int nr)
{
}
EXPORT_SYMBOL_GPL(find_vpid);
-@@ -365,6 +366,9 @@ void transfer_pid(struct task_struct *ol
+@@ -368,6 +369,9 @@ void transfer_pid(struct task_struct *ol
struct task_struct *pid_task(struct pid *pid, enum pid_type type)
{
struct task_struct *result = NULL;
if (pid) {
struct hlist_node *first;
first = rcu_dereference(pid->tasks[type].first);
-@@ -380,7 +384,7 @@ EXPORT_SYMBOL(pid_task);
+@@ -383,7 +387,7 @@ EXPORT_SYMBOL(pid_task);
*/
struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
{
}
struct task_struct *find_task_by_vpid(pid_t vnr)
-@@ -422,7 +426,7 @@ struct pid *find_get_pid(pid_t nr)
+@@ -425,7 +429,7 @@ struct pid *find_get_pid(pid_t nr)
}
EXPORT_SYMBOL_GPL(find_get_pid);
{
struct upid *upid;
pid_t nr = 0;
-@@ -435,6 +439,11 @@ pid_t pid_nr_ns(struct pid *pid, struct
+@@ -438,6 +442,11 @@ pid_t pid_nr_ns(struct pid *pid, struct
return nr;
}
pid_t pid_vnr(struct pid *pid)
{
return pid_nr_ns(pid, current->nsproxy->pid_ns);
-diff -NurpP --minimal linux-2.6.32.6/kernel/pid_namespace.c linux-2.6.32.6-vs2.3.0.36.28/kernel/pid_namespace.c
---- linux-2.6.32.6/kernel/pid_namespace.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/pid_namespace.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/pid_namespace.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/pid_namespace.c
+--- linux-2.6.32.59/kernel/pid_namespace.c 2009-12-03 20:02:58.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/pid_namespace.c 2011-06-10 13:03:02.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/syscalls.h>
#include <linux/err.h>
kmem_cache_free(pid_ns_cachep, ns);
}
-diff -NurpP --minimal linux-2.6.32.6/kernel/posix-timers.c linux-2.6.32.6-vs2.3.0.36.28/kernel/posix-timers.c
---- linux-2.6.32.6/kernel/posix-timers.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/posix-timers.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/posix-timers.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/posix-timers.c
+--- linux-2.6.32.59/kernel/posix-timers.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/posix-timers.c 2011-06-10 13:03:02.000000000 +0200
@@ -46,6 +46,7 @@
#include <linux/wait.h>
#include <linux/workqueue.h>
/* If we failed to send the signal the timer stops. */
return ret > 0;
}
-diff -NurpP --minimal linux-2.6.32.6/kernel/printk.c linux-2.6.32.6-vs2.3.0.36.28/kernel/printk.c
---- linux-2.6.32.6/kernel/printk.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/printk.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/printk.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/printk.c
+--- linux-2.6.32.59/kernel/printk.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/printk.c 2011-06-10 13:03:02.000000000 +0200
@@ -33,6 +33,7 @@
#include <linux/bootmem.h>
#include <linux/syscalls.h>
count = len;
if (count > log_buf_len)
count = log_buf_len;
-diff -NurpP --minimal linux-2.6.32.6/kernel/ptrace.c linux-2.6.32.6-vs2.3.0.36.28/kernel/ptrace.c
---- linux-2.6.32.6/kernel/ptrace.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/ptrace.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/ptrace.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/ptrace.c
+--- linux-2.6.32.59/kernel/ptrace.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/ptrace.c 2011-06-10 14:03:28.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/pid_namespace.h>
#include <linux/syscalls.h>
return security_ptrace_access_check(task, mode);
}
-@@ -621,6 +627,10 @@ SYSCALL_DEFINE4(ptrace, long, request, l
- goto out;
- }
-
-+ ret = -EPERM;
-+ if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
-+ goto out_put_task_struct;
-+
- if (request == PTRACE_ATTACH) {
- ret = ptrace_attach(child);
- /*
-diff -NurpP --minimal linux-2.6.32.6/kernel/sched.c linux-2.6.32.6-vs2.3.0.36.28/kernel/sched.c
---- linux-2.6.32.6/kernel/sched.c 2010-01-26 19:31:27.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/sched.c 2010-01-26 20:35:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/sched.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/sched.c
+--- linux-2.6.32.59/kernel/sched.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/sched.c 2011-06-10 13:15:21.000000000 +0200
@@ -71,6 +71,8 @@
#include <linux/debugfs.h>
#include <linux/ctype.h>
struct cfs_rq;
static LIST_HEAD(task_groups);
-@@ -257,6 +268,9 @@ struct task_group {
+@@ -251,6 +262,9 @@ struct task_group {
/* runqueue "owned" by this group on each cpu */
struct cfs_rq **cfs_rq;
unsigned long shares;
#endif
#ifdef CONFIG_RT_GROUP_SCHED
-@@ -446,6 +460,19 @@ struct cfs_rq {
+@@ -404,6 +418,19 @@ struct cfs_rq {
unsigned long rq_weight;
#endif
#endif
};
/* Real-Time classes' related field in a runqueue: */
-@@ -1609,6 +1636,7 @@ static void update_group_shares_cpu(stru
+@@ -1586,6 +1613,7 @@ static void update_group_shares_cpu(stru
}
}
/*
* Re-compute the task group their per cpu shares over the given domain.
* This needs to be done in a bottom-up fashion because the rq weight of a
-@@ -1636,8 +1664,10 @@ static int tg_shares_up(struct task_grou
+@@ -1614,8 +1642,10 @@ static int tg_shares_up(struct task_grou
* If there are currently no tasks on the cpu pretend there
* is one of average load so that when a new task gets to
* run here it will not get delayed by group starvation.
+ if (!weight || cfs_rq_throttled(tg->cfs_rq[i]))
weight = NICE_0_LOAD;
- rq_weight += weight;
-@@ -1813,6 +1843,175 @@ static void cfs_rq_set_shares(struct cfs
-
+ sum_weight += weight;
+@@ -1792,6 +1822,175 @@ static void cfs_rq_set_shares(struct cfs
static void calc_load_account_active(struct rq *this_rq);
+ static void update_sysctl(void);
+
+#if defined(CONFIG_RT_GROUP_SCHED) || defined(CONFIG_FAIR_GROUP_SCHED)
+
+#endif /* CONFIG_FAIR_GROUP_SCHED */
+
- #include "sched_stats.h"
- #include "sched_idletask.c"
- #include "sched_fair.c"
-@@ -2978,9 +3177,17 @@ EXPORT_SYMBOL(avenrun);
+ static inline void __set_task_cpu(struct task_struct *p, unsigned int cpu)
+ {
+ set_task_rq(p, cpu);
+@@ -3129,9 +3328,17 @@ EXPORT_SYMBOL(avenrun);
*/
void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
{
}
static unsigned long
-@@ -5022,16 +5229,19 @@ void account_user_time(struct task_struc
+@@ -5245,16 +5452,19 @@ void account_user_time(struct task_struc
cputime_t cputime_scaled)
{
struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
cpustat->nice = cputime64_add(cpustat->nice, tmp);
else
cpustat->user = cputime64_add(cpustat->user, tmp);
-@@ -5077,6 +5287,7 @@ void account_system_time(struct task_str
+@@ -5300,6 +5510,7 @@ void account_system_time(struct task_str
cputime_t cputime, cputime_t cputime_scaled)
{
struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
cputime64_t tmp;
if ((p->flags & PF_VCPU) && (irq_count() - hardirq_offset == 0)) {
-@@ -5087,6 +5298,7 @@ void account_system_time(struct task_str
+@@ -5310,6 +5521,7 @@ void account_system_time(struct task_str
/* Add system time to process. */
p->stime = cputime_add(p->stime, cputime);
p->stimescaled = cputime_add(p->stimescaled, cputime_scaled);
account_group_system_time(p, cputime);
/* Add system time to cpustat. */
-@@ -6122,7 +6334,7 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -6393,7 +6605,7 @@ SYSCALL_DEFINE1(nice, int, increment)
nice = 19;
if (increment < 0 && !can_nice(current, nice))
retval = security_task_setnice(current, nice);
if (retval)
-@@ -9182,6 +9394,32 @@ static int update_sched_domains(struct n
+@@ -9470,6 +9682,32 @@ static int update_sched_domains(struct n
}
#endif
static int update_runtime(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
-@@ -9314,6 +9552,7 @@ static void init_tg_cfs_entry(struct tas
+@@ -9602,6 +9840,7 @@ static void init_tg_cfs_entry(struct tas
struct rq *rq = cpu_rq(cpu);
tg->cfs_rq[cpu] = cfs_rq;
init_cfs_rq(cfs_rq, rq);
cfs_rq->tg = tg;
if (add)
list_add(&cfs_rq->leaf_cfs_rq_list, &rq->leaf_cfs_rq_list);
-@@ -9443,6 +9682,10 @@ void __init sched_init(void)
- #endif /* CONFIG_USER_SCHED */
+@@ -9710,6 +9949,10 @@ void __init sched_init(void)
+ global_rt_period(), global_rt_runtime());
#endif /* CONFIG_RT_GROUP_SCHED */
+#ifdef CONFIG_FAIR_GROUP_SCHED
+ init_cfs_bandwidth(&init_task_group);
+#endif
+
- #ifdef CONFIG_GROUP_SCHED
+ #ifdef CONFIG_CGROUP_SCHED
list_add(&init_task_group.list, &task_groups);
INIT_LIST_HEAD(&init_task_group.children);
-@@ -9469,6 +9712,7 @@ void __init sched_init(void)
+@@ -9731,6 +9974,7 @@ void __init sched_init(void)
init_cfs_rq(&rq->cfs, rq);
init_rt_rq(&rq->rt, rq);
#ifdef CONFIG_FAIR_GROUP_SCHED
init_task_group.shares = init_task_group_load;
INIT_LIST_HEAD(&rq->leaf_cfs_rq_list);
#ifdef CONFIG_CGROUP_SCHED
-@@ -9746,6 +9990,7 @@ static void free_fair_sched_group(struct
+@@ -9992,6 +10236,7 @@ static void free_fair_sched_group(struct
{
int i;
for_each_possible_cpu(i) {
if (tg->cfs_rq)
kfree(tg->cfs_rq[i]);
-@@ -9772,6 +10017,7 @@ int alloc_fair_sched_group(struct task_g
+@@ -10018,6 +10263,7 @@ int alloc_fair_sched_group(struct task_g
if (!tg->se)
goto err;
tg->shares = NICE_0_LOAD;
for_each_possible_cpu(i) {
-@@ -10495,6 +10741,100 @@ static u64 cpu_shares_read_u64(struct cg
+@@ -10734,6 +10980,100 @@ static u64 cpu_shares_read_u64(struct cg
return (u64) tg->shares;
}
#endif /* CONFIG_FAIR_GROUP_SCHED */
#ifdef CONFIG_RT_GROUP_SCHED
-@@ -10528,6 +10868,18 @@ static struct cftype cpu_files[] = {
+@@ -10767,6 +11107,18 @@ static struct cftype cpu_files[] = {
.read_u64 = cpu_shares_read_u64,
.write_u64 = cpu_shares_write_u64,
},
#endif
#ifdef CONFIG_RT_GROUP_SCHED
{
-diff -NurpP --minimal linux-2.6.32.6/kernel/sched_debug.c linux-2.6.32.6-vs2.3.0.36.28/kernel/sched_debug.c
---- linux-2.6.32.6/kernel/sched_debug.c 2010-01-26 19:31:27.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/sched_debug.c 2009-12-29 00:36:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/sched_debug.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/sched_debug.c
+--- linux-2.6.32.59/kernel/sched_debug.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/sched_debug.c 2011-06-10 13:03:02.000000000 +0200
@@ -80,6 +80,11 @@ static void print_cfs_group_stats(struct
PN(se->wait_max);
PN(se->wait_sum);
#endif
P(se->load.weight);
#undef PN
-@@ -214,6 +219,16 @@ void print_cfs_rq(struct seq_file *m, in
+@@ -209,6 +214,16 @@ void print_cfs_rq(struct seq_file *m, in
#ifdef CONFIG_SMP
SEQ_printf(m, " .%-30s: %lu\n", "shares", cfs_rq->shares);
#endif
print_cfs_group_stats(m, cpu, cfs_rq->tg);
#endif
}
-@@ -314,7 +329,7 @@ static int sched_debug_show(struct seq_f
+@@ -309,7 +324,7 @@ static int sched_debug_show(struct seq_f
u64 now = ktime_to_ns(ktime_get());
int cpu;
init_utsname()->release,
(int)strcspn(init_utsname()->version, " "),
init_utsname()->version);
-diff -NurpP --minimal linux-2.6.32.6/kernel/sched_fair.c linux-2.6.32.6-vs2.3.0.36.28/kernel/sched_fair.c
---- linux-2.6.32.6/kernel/sched_fair.c 2010-01-26 19:31:27.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/sched_fair.c 2010-01-13 14:37:25.000000000 +0100
-@@ -189,7 +189,308 @@ find_matching_se(struct sched_entity **s
+diff -NurpP --minimal linux-2.6.32.59/kernel/sched_fair.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/sched_fair.c
+--- linux-2.6.32.59/kernel/sched_fair.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/sched_fair.c 2011-06-10 13:08:20.000000000 +0200
+@@ -192,7 +192,308 @@ find_matching_se(struct sched_entity **s
}
}
+}
+
+static void enqueue_entity_locked(struct cfs_rq *cfs_rq,
-+ struct sched_entity *se, int wakeup);
++ struct sched_entity *se, int flags);
+
+static void enqueue_throttled_entity(struct rq *rq, struct sched_entity *se)
+{
static inline struct task_struct *task_of(struct sched_entity *se)
{
-@@ -251,7 +552,6 @@ find_matching_se(struct sched_entity **s
+@@ -254,7 +555,6 @@ find_matching_se(struct sched_entity **s
#endif /* CONFIG_FAIR_GROUP_SCHED */
/**************************************************************
* Scheduling class tree data structure manipulation methods:
*/
-@@ -489,14 +789,25 @@ __update_curr(struct cfs_rq *cfs_rq, str
+@@ -493,14 +793,25 @@ __update_curr(struct cfs_rq *cfs_rq, str
update_min_vruntime(cfs_rq);
}
+static int update_curr_common(struct cfs_rq *cfs_rq, unsigned long *delta)
{
struct sched_entity *curr = cfs_rq->curr;
-- u64 now = rq_of(cfs_rq)->clock;
+- u64 now = rq_of(cfs_rq)->clock_task;
+ struct rq *rq = rq_of(cfs_rq);
-+ u64 now = rq->clock;
++ u64 now = rq->clock_task;
unsigned long delta_exec;
if (unlikely(!curr))
/*
* Get the amount of time the current task was running
-@@ -505,17 +816,29 @@ static void update_curr(struct cfs_rq *c
+@@ -509,17 +820,29 @@ static void update_curr(struct cfs_rq *c
*/
delta_exec = (unsigned long)(now - curr->exec_start);
if (!delta_exec)
}
}
-@@ -740,13 +1063,9 @@ place_entity(struct cfs_rq *cfs_rq, stru
- se->vruntime = vruntime;
- }
+@@ -748,6 +1071,25 @@ place_entity(struct cfs_rq *cfs_rq, stru
+ #define ENQUEUE_MIGRATE 2
--static void
--enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int wakeup)
-+static void enqueue_entity_common(struct cfs_rq *cfs_rq,
-+ struct sched_entity *se, int wakeup)
- {
-- /*
-- * Update run-time statistics of the 'current'.
-- */
-- update_curr(cfs_rq);
- account_entity_enqueue(cfs_rq, se);
-
- if (wakeup) {
-@@ -758,6 +1077,29 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
- check_spread(cfs_rq, se);
- if (se != cfs_rq->curr)
- __enqueue_entity(cfs_rq, se);
+ static void
++enqueue_entity_common(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
++{
++ account_entity_enqueue(cfs_rq, se);
++
++ if (flags & ENQUEUE_WAKEUP) {
++ place_entity(cfs_rq, se, 0);
++ enqueue_sleeper(cfs_rq, se);
++ }
++
++ update_stats_enqueue(cfs_rq, se);
++ check_spread(cfs_rq, se);
++ if (se != cfs_rq->curr)
++ __enqueue_entity(cfs_rq, se);
+
+ if (entity_is_task(se))
+ vx_activate_task(task_of(se));
+}
+
-+static void enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se,
-+ int wakeup)
-+{
-+ /*
-+ * Update run-time statistics of the 'current'.
-+ */
-+ update_curr(cfs_rq);
-+ enqueue_entity_common(cfs_rq, se, wakeup);
++static void
+ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
+ {
+ /*
+@@ -761,17 +1103,17 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
+ * Update run-time statistics of the 'current'.
+ */
+ update_curr(cfs_rq);
+- account_entity_enqueue(cfs_rq, se);
+-
+- if (flags & ENQUEUE_WAKEUP) {
+- place_entity(cfs_rq, se, 0);
+- enqueue_sleeper(cfs_rq, se);
+- }
++ enqueue_entity_common(cfs_rq, se, flags);
+}
-+
+
+- update_stats_enqueue(cfs_rq, se);
+- check_spread(cfs_rq, se);
+- if (se != cfs_rq->curr)
+- __enqueue_entity(cfs_rq, se);
+static void enqueue_entity_locked(struct cfs_rq *cfs_rq,
-+ struct sched_entity *se, int wakeup)
++ struct sched_entity *se, int flags)
+{
+ /*
+ * Update run-time statistics of the 'current'.
+ */
+ // update_curr_locked(cfs_rq);
-+ enqueue_entity_common(cfs_rq, se, wakeup);
++ enqueue_entity_common(cfs_rq, se, flags);
}
static void __clear_buddies(struct cfs_rq *cfs_rq, struct sched_entity *se)
-@@ -801,6 +1143,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st
+@@ -815,6 +1157,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st
if (se != cfs_rq->curr)
__dequeue_entity(cfs_rq, se);
+ vx_deactivate_task(task_of(se));
account_entity_dequeue(cfs_rq, se);
update_min_vruntime(cfs_rq);
- }
-@@ -897,6 +1241,32 @@ static struct sched_entity *pick_next_en
+
+@@ -919,6 +1263,32 @@ static struct sched_entity *pick_next_en
return se;
}
static void put_prev_entity(struct cfs_rq *cfs_rq, struct sched_entity *prev)
{
/*
-@@ -908,6 +1278,8 @@ static void put_prev_entity(struct cfs_r
+@@ -930,6 +1300,8 @@ static void put_prev_entity(struct cfs_r
check_spread(cfs_rq, prev);
if (prev->on_rq) {
update_stats_wait_start(cfs_rq, prev);
/* Put 'current' back into the tree. */
__enqueue_entity(cfs_rq, prev);
-@@ -1004,10 +1376,28 @@ static inline void hrtick_update(struct
+@@ -1026,10 +1398,28 @@ static inline void hrtick_update(struct
}
#endif
+static int enqueue_group_entity(struct cfs_rq *cfs_rq, struct sched_entity *se,
-+ int wakeup)
++ int flags)
+{
+ struct cfs_rq *gcfs_rq = group_cfs_rq(se);
+ int ret = 0;
+ ret = 1;
+ goto out;
+ }
-+ enqueue_entity_locked(cfs_rq, se, wakeup);
++ enqueue_entity_locked(cfs_rq, se, flags);
+out:
+ cfs_rq_runtime_unlock(gcfs_rq);
+ return ret;
* then put the task into the rbtree:
+ * Don't enqueue a throttled entity further into the hierarchy.
*/
- static void enqueue_task_fair(struct rq *rq, struct task_struct *p, int wakeup)
- {
-@@ -1017,11 +1407,15 @@ static void enqueue_task_fair(struct rq
+ static void
+ enqueue_task_fair(struct rq *rq, struct task_struct *p, int wakeup, bool head)
+@@ -1046,11 +1436,15 @@ enqueue_task_fair(struct rq *rq, struct
for_each_sched_entity(se) {
if (se->on_rq)
break;
+
cfs_rq = cfs_rq_of(se);
-- enqueue_entity(cfs_rq, se, wakeup);
+- enqueue_entity(cfs_rq, se, flags);
+ if (entity_is_task(se))
-+ enqueue_entity(cfs_rq, se, wakeup);
++ enqueue_entity(cfs_rq, se, flags);
+ else
-+ if (enqueue_group_entity(cfs_rq, se, wakeup))
++ if (enqueue_group_entity(cfs_rq, se, flags))
+ break;
- wakeup = 1;
+ flags = ENQUEUE_WAKEUP;
}
-
hrtick_update(rq);
}
-@@ -1041,6 +1435,17 @@ static void dequeue_task_fair(struct rq
+@@ -1070,6 +1464,17 @@ static void dequeue_task_fair(struct rq
/* Don't dequeue parent if it has other entities besides us */
if (cfs_rq->load.weight)
break;
sleep = 1;
}
-@@ -1818,9 +2223,10 @@ load_balance_fair(struct rq *this_rq, in
+@@ -1896,9 +2301,10 @@ load_balance_fair(struct rq *this_rq, in
u64 rem_load, moved_load;
/*
continue;
rem_load = (u64)rem_load_move * busiest_weight;
-@@ -1869,6 +2275,12 @@ move_one_task_fair(struct rq *this_rq, i
+@@ -1947,6 +2353,12 @@ move_one_task_fair(struct rq *this_rq, i
for_each_leaf_cfs_rq(busiest, busy_cfs_rq) {
/*
* pass busy_cfs_rq argument into
* load_balance_[start|next]_fair iterators
*/
-diff -NurpP --minimal linux-2.6.32.6/kernel/sched_rt.c linux-2.6.32.6-vs2.3.0.36.28/kernel/sched_rt.c
---- linux-2.6.32.6/kernel/sched_rt.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/sched_rt.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/sched_rt.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/sched_rt.c
+--- linux-2.6.32.59/kernel/sched_rt.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/sched_rt.c 2011-06-10 13:03:02.000000000 +0200
@@ -235,18 +235,6 @@ static int rt_se_boosted(struct sched_rt
return p->prio != p->normal_prio;
}
for_each_cpu(i, span) {
int enqueue = 0;
struct rt_rq *rt_rq = sched_rt_period_rt_rq(rt_b, i);
-@@ -1564,7 +1529,7 @@ static void rq_online_rt(struct rq *rq)
+@@ -1571,7 +1536,7 @@ static void rq_online_rt(struct rq *rq)
if (rq->rt.overloaded)
rt_set_overload(rq);
cpupri_set(&rq->rd->cpupri, rq->cpu, rq->rt.highest_prio.curr);
}
-@@ -1575,7 +1540,7 @@ static void rq_offline_rt(struct rq *rq)
+@@ -1582,7 +1547,7 @@ static void rq_offline_rt(struct rq *rq)
if (rq->rt.overloaded)
rt_clear_overload(rq);
cpupri_set(&rq->rd->cpupri, rq->cpu, CPUPRI_INVALID);
}
-diff -NurpP --minimal linux-2.6.32.6/kernel/signal.c linux-2.6.32.6-vs2.3.0.36.28/kernel/signal.c
---- linux-2.6.32.6/kernel/signal.c 2010-01-26 19:31:27.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/signal.c 2010-01-20 04:21:33.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/signal.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/signal.c
+--- linux-2.6.32.59/kernel/signal.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/signal.c 2011-06-10 13:03:02.000000000 +0200
@@ -27,6 +27,8 @@
#include <linux/freezer.h>
#include <linux/pid_namespace.h>
if (info != SEND_SIG_NOINFO && (is_si_special(info) || SI_FROMKERNEL(info)))
return 0;
-@@ -625,6 +635,20 @@ static int check_kill_permission(int sig
+@@ -627,6 +637,20 @@ static int check_kill_permission(int sig
}
}
return security_task_kill(t, info, sig, 0);
}
-@@ -1113,7 +1137,7 @@ int kill_pid_info(int sig, struct siginf
+@@ -1115,7 +1139,7 @@ int kill_pid_info(int sig, struct siginf
rcu_read_lock();
retry:
p = pid_task(pid, PIDTYPE_PID);
error = group_send_sig_info(sig, info, p);
if (unlikely(error == -ESRCH))
/*
-@@ -1152,7 +1176,7 @@ int kill_pid_info_as_uid(int sig, struct
+@@ -1154,7 +1178,7 @@ int kill_pid_info_as_uid(int sig, struct
read_lock(&tasklist_lock);
p = pid_task(pid, PIDTYPE_PID);
ret = -ESRCH;
goto out_unlock;
}
-@@ -1206,8 +1230,10 @@ static int kill_something_info(int sig,
+@@ -1208,8 +1232,10 @@ static int kill_something_info(int sig,
struct task_struct * p;
for_each_process(p) {
int err = group_send_sig_info(sig, info, p);
++count;
if (err != -EPERM)
-@@ -1872,6 +1898,11 @@ relock:
+@@ -1874,6 +1900,11 @@ relock:
!sig_kernel_only(signr))
continue;
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-2.6.32.6/kernel/softirq.c linux-2.6.32.6-vs2.3.0.36.28/kernel/softirq.c
---- linux-2.6.32.6/kernel/softirq.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/softirq.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/softirq.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/softirq.c
+--- linux-2.6.32.59/kernel/softirq.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/softirq.c 2011-06-10 13:03:02.000000000 +0200
@@ -24,6 +24,7 @@
#include <linux/ftrace.h>
#include <linux/smp.h>
#define CREATE_TRACE_POINTS
#include <trace/events/irq.h>
-diff -NurpP --minimal linux-2.6.32.6/kernel/sys.c linux-2.6.32.6-vs2.3.0.36.28/kernel/sys.c
---- linux-2.6.32.6/kernel/sys.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/sys.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/sys.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/sys.c
+--- linux-2.6.32.59/kernel/sys.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/sys.c 2011-06-10 13:03:02.000000000 +0200
@@ -41,6 +41,7 @@
#include <linux/syscalls.h>
#include <linux/kprobes.h>
lock_kernel();
switch (cmd) {
case LINUX_REBOOT_CMD_RESTART:
-@@ -1133,7 +1147,7 @@ SYSCALL_DEFINE2(sethostname, char __user
+@@ -1129,7 +1143,7 @@ SYSCALL_DEFINE2(sethostname, char __user
int errno;
char tmp[__NEW_UTS_LEN];
return -EPERM;
if (len < 0 || len > __NEW_UTS_LEN)
return -EINVAL;
-@@ -1182,7 +1196,7 @@ SYSCALL_DEFINE2(setdomainname, char __us
+@@ -1178,7 +1192,7 @@ SYSCALL_DEFINE2(setdomainname, char __us
int errno;
char tmp[__NEW_UTS_LEN];
return -EPERM;
if (len < 0 || len > __NEW_UTS_LEN)
return -EINVAL;
-@@ -1251,7 +1265,7 @@ SYSCALL_DEFINE2(setrlimit, unsigned int,
+@@ -1247,7 +1261,7 @@ SYSCALL_DEFINE2(setrlimit, unsigned int,
return -EINVAL;
old_rlim = current->signal->rlim + resource;
if ((new_rlim.rlim_max > old_rlim->rlim_max) &&
return -EPERM;
if (resource == RLIMIT_NOFILE && new_rlim.rlim_max > sysctl_nr_open)
return -EPERM;
-diff -NurpP --minimal linux-2.6.32.6/kernel/sysctl.c linux-2.6.32.6-vs2.3.0.36.28/kernel/sysctl.c
---- linux-2.6.32.6/kernel/sysctl.c 2010-01-26 19:31:27.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/sysctl.c 2010-01-20 04:21:33.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/sysctl.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/sysctl.c
+--- linux-2.6.32.59/kernel/sysctl.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/sysctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -124,6 +124,7 @@ static int ngroups_max = NGROUPS_MAX;
extern char modprobe_path[];
extern int modules_disabled;
#ifdef CONFIG_CHR_DEV_SG
{
.ctl_name = KERN_SG_BIG_BUFF,
-diff -NurpP --minimal linux-2.6.32.6/kernel/sysctl_check.c linux-2.6.32.6-vs2.3.0.36.28/kernel/sysctl_check.c
---- linux-2.6.32.6/kernel/sysctl_check.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/sysctl_check.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/sysctl_check.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/sysctl_check.c
+--- linux-2.6.32.59/kernel/sysctl_check.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/sysctl_check.c 2011-06-10 13:03:02.000000000 +0200
@@ -39,6 +39,7 @@ static const struct trans_ctl_table tran
{ KERN_PANIC, "panic" },
{ KERN_SPARC_REBOOT, "reboot-cmd" },
{ KERN_CTLALTDEL, "ctrl-alt-del" },
-@@ -1217,6 +1218,22 @@ static const struct trans_ctl_table tran
+@@ -1218,6 +1219,22 @@ static const struct trans_ctl_table tran
{}
};
static const struct trans_ctl_table trans_root_table[] = {
{ CTL_KERN, "kernel", trans_kern_table },
{ CTL_VM, "vm", trans_vm_table },
-@@ -1233,6 +1250,7 @@ static const struct trans_ctl_table tran
+@@ -1234,6 +1251,7 @@ static const struct trans_ctl_table tran
{ CTL_SUNRPC, "sunrpc", trans_sunrpc_table },
{ CTL_PM, "pm", trans_pm_table },
{ CTL_FRV, "frv", trans_frv_table },
{}
};
-diff -NurpP --minimal linux-2.6.32.6/kernel/time.c linux-2.6.32.6-vs2.3.0.36.28/kernel/time.c
---- linux-2.6.32.6/kernel/time.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/time.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/time.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/time.c
+--- linux-2.6.32.59/kernel/time.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/time.c 2011-11-17 12:18:26.000000000 +0100
@@ -63,6 +63,7 @@ EXPORT_SYMBOL(sys_tz);
SYSCALL_DEFINE1(time, time_t __user *, tloc)
{
tv->tv_sec = x.tv_sec;
tv->tv_nsec = x.tv_usec * NSEC_PER_USEC;
}
-diff -NurpP --minimal linux-2.6.32.6/kernel/timer.c linux-2.6.32.6-vs2.3.0.36.28/kernel/timer.c
---- linux-2.6.32.6/kernel/timer.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/timer.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/timer.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/timer.c
+--- linux-2.6.32.59/kernel/timer.c 2012-03-20 11:26:30.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/timer.c 2011-06-10 13:03:02.000000000 +0200
@@ -39,6 +39,10 @@
#include <linux/kallsyms.h>
#include <linux/perf_event.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
-@@ -1255,12 +1259,6 @@ SYSCALL_DEFINE1(alarm, unsigned int, sec
+@@ -1261,12 +1265,6 @@ SYSCALL_DEFINE1(alarm, unsigned int, sec
#endif
/**
* sys_getpid - return the thread group id of the current process
-@@ -1289,10 +1287,23 @@ SYSCALL_DEFINE0(getppid)
+@@ -1295,10 +1293,23 @@ SYSCALL_DEFINE0(getppid)
rcu_read_lock();
pid = task_tgid_vnr(current->real_parent);
rcu_read_unlock();
SYSCALL_DEFINE0(getuid)
{
/* Only we change this so SMP safe */
-diff -NurpP --minimal linux-2.6.32.6/kernel/user.c linux-2.6.32.6-vs2.3.0.36.28/kernel/user.c
---- linux-2.6.32.6/kernel/user.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/user.c 2009-12-03 20:04:56.000000000 +0100
-@@ -251,10 +251,10 @@ static struct kobj_type uids_ktype = {
- *
- * See Documentation/scheduler/sched-design-CFS.txt for ramifications.
- */
--static int uids_user_create(struct user_struct *up)
-+static int uids_user_create(struct user_namespace *ns, struct user_struct *up)
- {
- struct kobject *kobj = &up->kobj;
-- int error;
-+ int error = 0;
-
- memset(kobj, 0, sizeof(struct kobject));
- if (up->user_ns != &init_user_ns)
-@@ -282,7 +282,7 @@ int __init uids_sysfs_init(void)
- if (!uids_kset)
- return -ENOMEM;
-
-- return uids_user_create(&root_user);
-+ return uids_user_create(NULL, &root_user);
- }
-
- /* delayed work function to remove sysfs directory for a user and free up
-@@ -353,7 +353,8 @@ static struct user_struct *uid_hash_find
- }
-
- int uids_sysfs_init(void) { return 0; }
--static inline int uids_user_create(struct user_struct *up) { return 0; }
-+static inline int uids_user_create(struct user_namespace *ns,
-+ struct user_struct *up) { return 0; }
- static inline void uids_mutex_lock(void) { }
- static inline void uids_mutex_unlock(void) { }
-
-@@ -450,7 +451,7 @@ struct user_struct *alloc_uid(struct use
-
- new->user_ns = get_user_ns(ns);
-
-- if (uids_user_create(new))
-+ if (uids_user_create(ns, new))
- goto out_destoy_sched;
-
- /*
-diff -NurpP --minimal linux-2.6.32.6/kernel/user_namespace.c linux-2.6.32.6-vs2.3.0.36.28/kernel/user_namespace.c
---- linux-2.6.32.6/kernel/user_namespace.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/user_namespace.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/user_namespace.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/user_namespace.c
+--- linux-2.6.32.59/kernel/user_namespace.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/user_namespace.c 2011-06-10 13:03:02.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/slab.h>
#include <linux/user_namespace.h>
INIT_WORK(&ns->destroyer, free_user_ns_work);
schedule_work(&ns->destroyer);
}
-diff -NurpP --minimal linux-2.6.32.6/kernel/utsname.c linux-2.6.32.6-vs2.3.0.36.28/kernel/utsname.c
---- linux-2.6.32.6/kernel/utsname.c 2009-09-10 15:26:28.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/utsname.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/utsname.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/utsname.c
+--- linux-2.6.32.59/kernel/utsname.c 2009-09-10 15:26:28.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/utsname.c 2011-06-10 13:03:02.000000000 +0200
@@ -14,14 +14,17 @@
#include <linux/utsname.h>
#include <linux/err.h>
+ atomic_dec(&vs_global_uts_ns);
kfree(ns);
}
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/cacct.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/cacct.c
---- linux-2.6.32.6/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/cacct.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/Kconfig
+--- linux-2.6.32.59/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/Kconfig 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,251 @@
++#
++# Linux VServer configuration
++#
++
++menu "Linux VServer"
++
++config VSERVER_AUTO_LBACK
++ bool "Automatically Assign Loopback IP"
++ default y
++ help
++ Automatically assign a guest specific loopback
++ IP and add it to the kernel network stack on
++ startup.
++
++config VSERVER_AUTO_SINGLE
++ bool "Automatic Single IP Special Casing"
++ depends on EXPERIMENTAL
++ default y
++ help
++ This allows network contexts with a single IP to
++ automatically remap 0.0.0.0 bindings to that IP,
++ avoiding further network checks and improving
++ performance.
++
++ (note: such guests do not allow to change the ip
++ on the fly and do not show loopback addresses)
++
++config VSERVER_COWBL
++ bool "Enable COW Immutable Link Breaking"
++ default y
++ help
++ This enables the COW (Copy-On-Write) link break code.
++ It allows you to treat unified files like normal files
++ when writing to them (which will implicitely break the
++ link and create a copy of the unified file)
++
++config VSERVER_VTIME
++ bool "Enable Virtualized Guest Time"
++ depends on EXPERIMENTAL
++ default n
++ help
++ This enables per guest time offsets to allow for
++ adjusting the system clock individually per guest.
++ this adds some overhead to the time functions and
++ therefore should not be enabled without good reason.
++
++config VSERVER_DEVICE
++ bool "Enable Guest Device Mapping"
++ depends on EXPERIMENTAL
++ default n
++ help
++ This enables generic device remapping.
++
++config VSERVER_PROC_SECURE
++ bool "Enable Proc Security"
++ depends on PROC_FS
++ default y
++ help
++ This configures ProcFS security to initially hide
++ non-process entries for all contexts except the main and
++ spectator context (i.e. for all guests), which is a secure
++ default.
++
++ (note: on 1.2x the entries were visible by default)
++
++config VSERVER_HARDCPU
++ bool "Enable Hard CPU Limits"
++ default y
++ help
++ Activate the Hard CPU Limits
++
++ This will compile in code that allows the Token Bucket
++ Scheduler to put processes on hold when a context's
++ tokens are depleted (provided that its per-context
++ sched_hard flag is set).
++
++ Processes belonging to that context will not be able
++ to consume CPU resources again until a per-context
++ configured minimum of tokens has been reached.
++
++config VSERVER_IDLETIME
++ bool "Avoid idle CPUs by skipping Time"
++ depends on VSERVER_HARDCPU
++ default y
++ help
++ This option allows the scheduler to artificially
++ advance time (per cpu) when otherwise the idle
++ task would be scheduled, thus keeping the cpu
++ busy and sharing the available resources among
++ certain contexts.
++
++config VSERVER_IDLELIMIT
++ bool "Limit the IDLE task"
++ depends on VSERVER_HARDCPU
++ default n
++ help
++ Limit the idle slices, so the the next context
++ will be scheduled as soon as possible.
++
++ This might improve interactivity and latency, but
++ will also marginally increase scheduling overhead.
++
++choice
++ prompt "Persistent Inode Tagging"
++ default TAGGING_ID24
++ help
++ This adds persistent context information to filesystems
++ mounted with the tagxid option. Tagging is a requirement
++ for per-context disk limits and per-context quota.
++
++
++config TAGGING_NONE
++ bool "Disabled"
++ help
++ do not store per-context information in inodes.
++
++config TAGGING_UID16
++ bool "UID16/GID32"
++ help
++ reduces UID to 16 bit, but leaves GID at 32 bit.
++
++config TAGGING_GID16
++ bool "UID32/GID16"
++ help
++ reduces GID to 16 bit, but leaves UID at 32 bit.
++
++config TAGGING_ID24
++ bool "UID24/GID24"
++ help
++ uses the upper 8bit from UID and GID for XID tagging
++ which leaves 24bit for UID/GID each, which should be
++ more than sufficient for normal use.
++
++config TAGGING_INTERN
++ bool "UID32/GID32"
++ help
++ this uses otherwise reserved inode fields in the on
++ disk representation, which limits the use to a few
++ filesystems (currently ext2 and ext3)
++
++endchoice
++
++config TAG_NFSD
++ bool "Tag NFSD User Auth and Files"
++ default n
++ help
++ Enable this if you do want the in-kernel NFS
++ Server to use the tagging specified above.
++ (will require patched clients too)
++
++config VSERVER_PRIVACY
++ bool "Honor Privacy Aspects of Guests"
++ default n
++ help
++ When enabled, most context checks will disallow
++ access to structures assigned to a specific context,
++ like ptys or loop devices.
++
++config VSERVER_CONTEXTS
++ int "Maximum number of Contexts (1-65533)" if EMBEDDED
++ range 1 65533
++ default "768" if 64BIT
++ default "256"
++ help
++ This setting will optimize certain data structures
++ and memory allocations according to the expected
++ maximum.
++
++ note: this is not a strict upper limit.
++
++config VSERVER_WARN
++ bool "VServer Warnings"
++ default y
++ help
++ This enables various runtime warnings, which will
++ notify about potential manipulation attempts or
++ resource shortage. It is generally considered to
++ be a good idea to have that enabled.
++
++config VSERVER_DEBUG
++ bool "VServer Debugging Code"
++ default n
++ help
++ Set this to yes if you want to be able to activate
++ debugging output at runtime. It adds a very small
++ overhead to all vserver related functions and
++ increases the kernel size by about 20k.
++
++config VSERVER_HISTORY
++ bool "VServer History Tracing"
++ depends on VSERVER_DEBUG
++ default n
++ help
++ Set this to yes if you want to record the history of
++ linux-vserver activities, so they can be replayed in
++ the event of a kernel panic or oops.
++
++config VSERVER_HISTORY_SIZE
++ int "Per-CPU History Size (32-65536)"
++ depends on VSERVER_HISTORY
++ range 32 65536
++ default 64
++ help
++ This allows you to specify the number of entries in
++ the per-CPU history buffer.
++
++config VSERVER_MONITOR
++ bool "VServer Scheduling Monitor"
++ depends on VSERVER_DISABLED
++ default n
++ help
++ Set this to yes if you want to record the scheduling
++ decisions, so that they can be relayed to userspace
++ for detailed analysis.
++
++config VSERVER_MONITOR_SIZE
++ int "Per-CPU Monitor Queue Size (32-65536)"
++ depends on VSERVER_MONITOR
++ range 32 65536
++ default 1024
++ help
++ This allows you to specify the number of entries in
++ the per-CPU scheduling monitor buffer.
++
++config VSERVER_MONITOR_SYNC
++ int "Per-CPU Monitor Sync Interval (0-65536)"
++ depends on VSERVER_MONITOR
++ range 0 65536
++ default 256
++ help
++ This allows you to specify the interval in ticks
++ when a time sync entry is inserted.
++
++endmenu
++
++
++config VSERVER
++ bool
++ default y
++ select NAMESPACES
++ select UTS_NS
++ select IPC_NS
++ select USER_NS
++ select SYSVIPC
++
++config VSERVER_SECURITY
++ bool
++ depends on SECURITY
++ default y
++ select SECURITY_CAPABILITIES
++
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/Makefile linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/Makefile
+--- linux-2.6.32.59/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/Makefile 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,18 @@
++#
++# Makefile for the Linux vserver routines.
++#
++
++
++obj-y += vserver.o
++
++vserver-y := switch.o context.o space.o sched.o network.o inode.o \
++ limit.o cvirt.o cacct.o signal.o helper.o init.o \
++ dlimit.o tag.o
++
++vserver-$(CONFIG_INET) += inet.o
++vserver-$(CONFIG_PROC_FS) += proc.o
++vserver-$(CONFIG_VSERVER_DEBUG) += sysctl.o debug.o
++vserver-$(CONFIG_VSERVER_HISTORY) += history.o
++vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
++vserver-$(CONFIG_VSERVER_DEVICE) += device.o
++
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/cacct.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/cacct.c
+--- linux-2.6.32.59/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/cacct.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/cacct_init.h linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/cacct_init.h
---- linux-2.6.32.6/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/cacct_init.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/cacct_init.h linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/cacct_init.h
+--- linux-2.6.32.59/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/cacct_init.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,25 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/cacct_proc.h linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/cacct_proc.h
---- linux-2.6.32.6/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/cacct_proc.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/cacct_proc.h linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/cacct_proc.h
+--- linux-2.6.32.59/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/cacct_proc.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,53 @@
+#ifndef _VX_CACCT_PROC_H
+#define _VX_CACCT_PROC_H
+}
+
+#endif /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/context.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/context.c
---- linux-2.6.32.6/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/context.c 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,1057 @@
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/context.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/context.c
+--- linux-2.6.32.59/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/context.c 2011-06-10 14:02:35.000000000 +0200
+@@ -0,0 +1,1058 @@
+/*
+ * linux/kernel/vserver/context.c
+ *
+
+static void __dealloc_vx_info(struct vx_info *vxi)
+{
++#ifdef CONFIG_VSERVER_WARN
+ struct vx_info_save vxis;
+ int cpu;
-+
++#endif
+ vxdprintk(VXD_CBIT(xid, 0),
+ "dealloc_vx_info(%p)", vxi);
+ vxh_dealloc_vx_info(vxi);
+
+void unhash_vx_info(struct vx_info *vxi)
+{
-+ __shutdown_vx_info(vxi);
+ spin_lock(&vx_info_hash_lock);
+ __unhash_vx_info(vxi);
+ spin_unlock(&vx_info_hash_lock);
++ __shutdown_vx_info(vxi);
+ __wakeup_vx_info(vxi);
+}
+
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/cvirt.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/cvirt.c
---- linux-2.6.32.6/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/cvirt.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/cvirt.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/cvirt.c
+--- linux-2.6.32.59/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/cvirt.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,304 @@
+/*
+ * linux/kernel/vserver/cvirt.c
+
+#endif
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/cvirt_init.h linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/cvirt_init.h
---- linux-2.6.32.6/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/cvirt_init.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/cvirt_init.h linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/cvirt_init.h
+--- linux-2.6.32.59/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/cvirt_init.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,69 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/cvirt_proc.h linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/cvirt_proc.h
---- linux-2.6.32.6/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/cvirt_proc.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/cvirt_proc.h linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/cvirt_proc.h
+--- linux-2.6.32.59/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/cvirt_proc.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,135 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/debug.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/debug.c
---- linux-2.6.32.6/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/debug.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/debug.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/debug.c
+--- linux-2.6.32.59/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/debug.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,32 @@
+/*
+ * kernel/vserver/debug.c
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/device.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/device.c
---- linux-2.6.32.6/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/device.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/device.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/device.c
+--- linux-2.6.32.59/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/device.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/device.c
+#endif /* CONFIG_COMPAT */
+
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/dlimit.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/dlimit.c
---- linux-2.6.32.6/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/dlimit.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/dlimit.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/dlimit.c
+--- linux-2.6.32.59/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/dlimit.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,529 @@
+/*
+ * linux/kernel/vserver/dlimit.c
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/helper.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/helper.c
---- linux-2.6.32.6/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/helper.c 2009-12-03 22:20:22.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/helper.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/helper.c
+--- linux-2.6.32.59/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/helper.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,223 @@
+/*
+ * linux/kernel/vserver/helper.c
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/history.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/history.c
---- linux-2.6.32.6/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/history.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/history.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/history.c
+--- linux-2.6.32.59/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/history.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/inet.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/inet.c
---- linux-2.6.32.6/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/inet.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/inet.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/inet.c
+--- linux-2.6.32.59/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/inet.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,225 @@
+
+#include <linux/in.h>
+
+EXPORT_SYMBOL_GPL(ip_v4_find_src);
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/init.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/init.c
---- linux-2.6.32.6/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/init.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/init.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/init.c
+--- linux-2.6.32.59/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/init.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,45 @@
+/*
+ * linux/kernel/init.c
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/inode.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/inode.c
---- linux-2.6.32.6/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/inode.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/inode.c
+--- linux-2.6.32.59/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/inode.c 2011-06-10 18:58:46.000000000 +0200
@@ -0,0 +1,433 @@
+/*
+ * linux/kernel/vserver/inode.c
+
+ opts = s;
+ while ((p = strsep(&opts, ",")) != NULL) {
-+ token = match_token(p, tokens, args);
-+
-+ vxdprintk(VXD_CBIT(tag, 7),
-+ "dx_parse_tag(»%s«): %d:#%d",
-+ p, token, option);
-+
-+ switch (token) {
-+#ifdef CONFIG_PROPAGATE
-+ case Opt_tag:
-+ if (tag)
-+ *tag = 0;
-+ if (remove)
-+ __dx_parse_remove(s, "tag");
-+ *mnt_flags |= MNT_TAGID;
-+ set |= MNT_TAGID;
-+ break;
-+ case Opt_notag:
-+ if (remove)
-+ __dx_parse_remove(s, "notag");
-+ *mnt_flags |= MNT_NOTAG;
-+ set |= MNT_NOTAG;
-+ break;
-+ case Opt_tagid:
-+ if (tag && !match_int(args, &option))
-+ *tag = option;
-+ if (remove)
-+ __dx_parse_remove(s, "tagid");
-+ *mnt_flags |= MNT_TAGID;
-+ set |= MNT_TAGID;
-+ break;
-+#endif
-+ case Opt_notagcheck:
-+ if (remove)
-+ __dx_parse_remove(s, "notagcheck");
-+ *flags |= MS_NOTAGCHECK;
-+ set |= MS_NOTAGCHECK;
-+ break;
-+ }
-+ }
-+ if (set)
-+ strcpy(string, s);
-+ kfree(s);
-+ return set;
-+}
-+
-+#ifdef CONFIG_PROPAGATE
-+
-+void __dx_propagate_tag(struct nameidata *nd, struct inode *inode)
-+{
-+ tag_t new_tag = 0;
-+ struct vfsmount *mnt;
-+ int propagate;
-+
-+ if (!nd)
-+ return;
-+ mnt = nd->path.mnt;
-+ if (!mnt)
-+ return;
-+
-+ propagate = (mnt->mnt_flags & MNT_TAGID);
-+ if (propagate)
-+ new_tag = mnt->mnt_tag;
-+
-+ vxdprintk(VXD_CBIT(tag, 7),
-+ "dx_propagate_tag(%p[#%lu.%d]): %d,%d",
-+ inode, inode->i_ino, inode->i_tag,
-+ new_tag, (propagate) ? 1 : 0);
-+
-+ if (propagate)
-+ inode->i_tag = new_tag;
-+}
-+
-+#include <linux/module.h>
-+
-+EXPORT_SYMBOL_GPL(__dx_propagate_tag);
-+
-+#endif /* CONFIG_PROPAGATE */
-+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/Kconfig linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/Kconfig
---- linux-2.6.32.6/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/Kconfig 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,251 @@
-+#
-+# Linux VServer configuration
-+#
-+
-+menu "Linux VServer"
-+
-+config VSERVER_AUTO_LBACK
-+ bool "Automatically Assign Loopback IP"
-+ default y
-+ help
-+ Automatically assign a guest specific loopback
-+ IP and add it to the kernel network stack on
-+ startup.
-+
-+config VSERVER_AUTO_SINGLE
-+ bool "Automatic Single IP Special Casing"
-+ depends on EXPERIMENTAL
-+ default y
-+ help
-+ This allows network contexts with a single IP to
-+ automatically remap 0.0.0.0 bindings to that IP,
-+ avoiding further network checks and improving
-+ performance.
-+
-+ (note: such guests do not allow to change the ip
-+ on the fly and do not show loopback addresses)
-+
-+config VSERVER_COWBL
-+ bool "Enable COW Immutable Link Breaking"
-+ default y
-+ help
-+ This enables the COW (Copy-On-Write) link break code.
-+ It allows you to treat unified files like normal files
-+ when writing to them (which will implicitely break the
-+ link and create a copy of the unified file)
-+
-+config VSERVER_VTIME
-+ bool "Enable Virtualized Guest Time"
-+ depends on EXPERIMENTAL
-+ default n
-+ help
-+ This enables per guest time offsets to allow for
-+ adjusting the system clock individually per guest.
-+ this adds some overhead to the time functions and
-+ therefore should not be enabled without good reason.
-+
-+config VSERVER_DEVICE
-+ bool "Enable Guest Device Mapping"
-+ depends on EXPERIMENTAL
-+ default n
-+ help
-+ This enables generic device remapping.
-+
-+config VSERVER_PROC_SECURE
-+ bool "Enable Proc Security"
-+ depends on PROC_FS
-+ default y
-+ help
-+ This configures ProcFS security to initially hide
-+ non-process entries for all contexts except the main and
-+ spectator context (i.e. for all guests), which is a secure
-+ default.
-+
-+ (note: on 1.2x the entries were visible by default)
-+
-+config VSERVER_HARDCPU
-+ bool "Enable Hard CPU Limits"
-+ default y
-+ help
-+ Activate the Hard CPU Limits
-+
-+ This will compile in code that allows the Token Bucket
-+ Scheduler to put processes on hold when a context's
-+ tokens are depleted (provided that its per-context
-+ sched_hard flag is set).
-+
-+ Processes belonging to that context will not be able
-+ to consume CPU resources again until a per-context
-+ configured minimum of tokens has been reached.
-+
-+config VSERVER_IDLETIME
-+ bool "Avoid idle CPUs by skipping Time"
-+ depends on VSERVER_HARDCPU
-+ default y
-+ help
-+ This option allows the scheduler to artificially
-+ advance time (per cpu) when otherwise the idle
-+ task would be scheduled, thus keeping the cpu
-+ busy and sharing the available resources among
-+ certain contexts.
-+
-+config VSERVER_IDLELIMIT
-+ bool "Limit the IDLE task"
-+ depends on VSERVER_HARDCPU
-+ default n
-+ help
-+ Limit the idle slices, so the the next context
-+ will be scheduled as soon as possible.
-+
-+ This might improve interactivity and latency, but
-+ will also marginally increase scheduling overhead.
-+
-+choice
-+ prompt "Persistent Inode Tagging"
-+ default TAGGING_ID24
-+ help
-+ This adds persistent context information to filesystems
-+ mounted with the tagxid option. Tagging is a requirement
-+ for per-context disk limits and per-context quota.
-+
-+
-+config TAGGING_NONE
-+ bool "Disabled"
-+ help
-+ do not store per-context information in inodes.
-+
-+config TAGGING_UID16
-+ bool "UID16/GID32"
-+ help
-+ reduces UID to 16 bit, but leaves GID at 32 bit.
-+
-+config TAGGING_GID16
-+ bool "UID32/GID16"
-+ help
-+ reduces GID to 16 bit, but leaves UID at 32 bit.
-+
-+config TAGGING_ID24
-+ bool "UID24/GID24"
-+ help
-+ uses the upper 8bit from UID and GID for XID tagging
-+ which leaves 24bit for UID/GID each, which should be
-+ more than sufficient for normal use.
-+
-+config TAGGING_INTERN
-+ bool "UID32/GID32"
-+ help
-+ this uses otherwise reserved inode fields in the on
-+ disk representation, which limits the use to a few
-+ filesystems (currently ext2 and ext3)
-+
-+endchoice
-+
-+config TAG_NFSD
-+ bool "Tag NFSD User Auth and Files"
-+ default n
-+ help
-+ Enable this if you do want the in-kernel NFS
-+ Server to use the tagging specified above.
-+ (will require patched clients too)
-+
-+config VSERVER_PRIVACY
-+ bool "Honor Privacy Aspects of Guests"
-+ default n
-+ help
-+ When enabled, most context checks will disallow
-+ access to structures assigned to a specific context,
-+ like ptys or loop devices.
-+
-+config VSERVER_CONTEXTS
-+ int "Maximum number of Contexts (1-65533)" if EMBEDDED
-+ range 1 65533
-+ default "768" if 64BIT
-+ default "256"
-+ help
-+ This setting will optimize certain data structures
-+ and memory allocations according to the expected
-+ maximum.
-+
-+ note: this is not a strict upper limit.
++ token = match_token(p, tokens, args);
+
-+config VSERVER_WARN
-+ bool "VServer Warnings"
-+ default y
-+ help
-+ This enables various runtime warnings, which will
-+ notify about potential manipulation attempts or
-+ resource shortage. It is generally considered to
-+ be a good idea to have that enabled.
++ vxdprintk(VXD_CBIT(tag, 7),
++ "dx_parse_tag(»%s«): %d:#%d",
++ p, token, option);
+
-+config VSERVER_DEBUG
-+ bool "VServer Debugging Code"
-+ default n
-+ help
-+ Set this to yes if you want to be able to activate
-+ debugging output at runtime. It adds a very small
-+ overhead to all vserver related functions and
-+ increases the kernel size by about 20k.
++ switch (token) {
++#ifdef CONFIG_PROPAGATE
++ case Opt_tag:
++ if (tag)
++ *tag = 0;
++ if (remove)
++ __dx_parse_remove(s, "tag");
++ *mnt_flags |= MNT_TAGID;
++ set |= MNT_TAGID;
++ break;
++ case Opt_notag:
++ if (remove)
++ __dx_parse_remove(s, "notag");
++ *mnt_flags |= MNT_NOTAG;
++ set |= MNT_NOTAG;
++ break;
++ case Opt_tagid:
++ if (tag && !match_int(args, &option))
++ *tag = option;
++ if (remove)
++ __dx_parse_remove(s, "tagid");
++ *mnt_flags |= MNT_TAGID;
++ set |= MNT_TAGID;
++ break;
++#endif
++ case Opt_notagcheck:
++ if (remove)
++ __dx_parse_remove(s, "notagcheck");
++ *flags |= MS_NOTAGCHECK;
++ set |= MS_NOTAGCHECK;
++ break;
++ }
++ }
++ if (set)
++ strcpy(string, s);
++ kfree(s);
++ return set;
++}
+
-+config VSERVER_HISTORY
-+ bool "VServer History Tracing"
-+ depends on VSERVER_DEBUG
-+ default n
-+ help
-+ Set this to yes if you want to record the history of
-+ linux-vserver activities, so they can be replayed in
-+ the event of a kernel panic or oops.
++#ifdef CONFIG_PROPAGATE
+
-+config VSERVER_HISTORY_SIZE
-+ int "Per-CPU History Size (32-65536)"
-+ depends on VSERVER_HISTORY
-+ range 32 65536
-+ default 64
-+ help
-+ This allows you to specify the number of entries in
-+ the per-CPU history buffer.
++void __dx_propagate_tag(struct nameidata *nd, struct inode *inode)
++{
++ tag_t new_tag = 0;
++ struct vfsmount *mnt;
++ int propagate;
+
-+config VSERVER_MONITOR
-+ bool "VServer Scheduling Monitor"
-+ depends on VSERVER_DISABLED
-+ default n
-+ help
-+ Set this to yes if you want to record the scheduling
-+ decisions, so that they can be relayed to userspace
-+ for detailed analysis.
++ if (!nd)
++ return;
++ mnt = nd->path.mnt;
++ if (!mnt)
++ return;
+
-+config VSERVER_MONITOR_SIZE
-+ int "Per-CPU Monitor Queue Size (32-65536)"
-+ depends on VSERVER_MONITOR
-+ range 32 65536
-+ default 1024
-+ help
-+ This allows you to specify the number of entries in
-+ the per-CPU scheduling monitor buffer.
++ propagate = (mnt->mnt_flags & MNT_TAGID);
++ if (propagate)
++ new_tag = mnt->mnt_tag;
+
-+config VSERVER_MONITOR_SYNC
-+ int "Per-CPU Monitor Sync Interval (0-65536)"
-+ depends on VSERVER_MONITOR
-+ range 0 65536
-+ default 256
-+ help
-+ This allows you to specify the interval in ticks
-+ when a time sync entry is inserted.
++ vxdprintk(VXD_CBIT(tag, 7),
++ "dx_propagate_tag(%p[#%lu.%d]): %d,%d",
++ inode, inode->i_ino, inode->i_tag,
++ new_tag, (propagate) ? 1 : 0);
+
-+endmenu
++ if (propagate)
++ inode->i_tag = new_tag;
++}
+
++#include <linux/module.h>
+
-+config VSERVER
-+ bool
-+ default y
-+ select NAMESPACES
-+ select UTS_NS
-+ select IPC_NS
-+ select USER_NS
-+ select SYSVIPC
++EXPORT_SYMBOL_GPL(__dx_propagate_tag);
+
-+config VSERVER_SECURITY
-+ bool
-+ depends on SECURITY
-+ default y
-+ select SECURITY_CAPABILITIES
++#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/limit.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/limit.c
---- linux-2.6.32.6/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/limit.c 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,333 @@
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/limit.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/limit.c
+--- linux-2.6.32.59/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/limit.c 2011-06-10 13:03:02.000000000 +0200
+@@ -0,0 +1,392 @@
+/*
+ * linux/kernel/vserver/limit.c
+ *
+ * Virtual Server: Context Limits
+ *
-+ * Copyright (C) 2004-2007 Herbert Pötzl
++ * Copyright (C) 2004-2010 Herbert Pötzl
+ *
+ * V0.01 broken out from vcontext V0.05
+ * V0.02 changed vcmds to vxi arg
++ * V0.03 added memory cgroup support
+ *
+ */
+
+#include <linux/sched.h>
+#include <linux/module.h>
++#include <linux/memcontrol.h>
++#include <linux/res_counter.h>
+#include <linux/vs_limit.h>
+#include <linux/vserver/limit.h>
+#include <linux/vserver/limit_cmd.h>
+
+void vx_vsi_meminfo(struct sysinfo *val)
+{
++#ifdef CONFIG_CGROUP_MEM_RES_CTLR
++ struct mem_cgroup *mcg = mem_cgroup_from_task(current);
++ u64 res_limit, res_usage;
++
++ if (!mcg)
++ return;
++
++ res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
++ res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
++
++ if (res_limit != RESOURCE_MAX)
++ val->totalram = (res_limit >> PAGE_SHIFT);
++ val->freeram = val->totalram - (res_usage >> PAGE_SHIFT);
++ val->bufferram = 0;
++#else /* !CONFIG_CGROUP_MEM_RES_CTLR */
+ struct vx_info *vxi = current_vx_info();
+ unsigned long totalram, freeram;
+ rlim_t v;
+
+ val->totalram = totalram;
+ val->freeram = freeram;
-+ val->bufferram = 0;
++#endif /* CONFIG_CGROUP_MEM_RES_CTLR */
+ val->totalhigh = 0;
+ val->freehigh = 0;
+ return;
+
+void vx_vsi_swapinfo(struct sysinfo *val)
+{
++#ifdef CONFIG_CGROUP_MEM_RES_CTLR
++#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
++ struct mem_cgroup *mcg = mem_cgroup_from_task(current);
++ u64 res_limit, res_usage, memsw_limit, memsw_usage;
++ s64 swap_limit, swap_usage;
++
++ if (!mcg)
++ return;
++
++ res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
++ res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
++ memsw_limit = mem_cgroup_memsw_read_u64(mcg, RES_LIMIT);
++ memsw_usage = mem_cgroup_memsw_read_u64(mcg, RES_USAGE);
++
++ if (res_limit == RESOURCE_MAX)
++ return;
++
++ swap_limit = memsw_limit - res_limit;
++ if (memsw_limit != RESOURCE_MAX)
++ val->totalswap = swap_limit >> PAGE_SHIFT;
++
++ swap_usage = memsw_usage - res_usage;
++ val->freeswap = (swap_usage < swap_limit) ?
++ val->totalswap - (swap_usage >> PAGE_SHIFT) : 0;
++#else /* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
++ val->totalswap = 0;
++ val->freeswap = 0;
++#endif /* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
++#else /* !CONFIG_CGROUP_MEM_RES_CTLR */
+ struct vx_info *vxi = current_vx_info();
+ unsigned long totalswap, freeswap;
+ rlim_t v, w;
+
+ val->totalswap = totalswap;
+ val->freeswap = freeswap;
++#endif /* CONFIG_CGROUP_MEM_RES_CTLR */
+ return;
+}
+
++long vx_vsi_cached(struct sysinfo *val)
++{
++#ifdef CONFIG_CGROUP_MEM_RES_CTLR
++ struct mem_cgroup *mcg = mem_cgroup_from_task(current);
++
++ return mem_cgroup_stat_read_cache(mcg);
++#else
++ return 0;
++#endif
++}
++
+
+unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm)
+{
+ return points;
+}
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/limit_init.h linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/limit_init.h
---- linux-2.6.32.6/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/limit_init.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/limit_init.h linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/limit_init.h
+--- linux-2.6.32.59/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/limit_init.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,31 @@
+
+
+ }
+}
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/limit_proc.h linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/limit_proc.h
---- linux-2.6.32.6/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/limit_proc.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/limit_proc.h linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/limit_proc.h
+--- linux-2.6.32.59/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/limit_proc.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,57 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/Makefile linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/Makefile
---- linux-2.6.32.6/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/Makefile 2009-12-03 20:04:56.000000000 +0100
-@@ -0,0 +1,18 @@
-+#
-+# Makefile for the Linux vserver routines.
-+#
-+
-+
-+obj-y += vserver.o
-+
-+vserver-y := switch.o context.o space.o sched.o network.o inode.o \
-+ limit.o cvirt.o cacct.o signal.o helper.o init.o \
-+ dlimit.o tag.o
-+
-+vserver-$(CONFIG_INET) += inet.o
-+vserver-$(CONFIG_PROC_FS) += proc.o
-+vserver-$(CONFIG_VSERVER_DEBUG) += sysctl.o debug.o
-+vserver-$(CONFIG_VSERVER_HISTORY) += history.o
-+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
-+vserver-$(CONFIG_VSERVER_DEVICE) += device.o
-+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/monitor.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/monitor.c
---- linux-2.6.32.6/kernel/vserver/monitor.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/monitor.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/monitor.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/monitor.c
+--- linux-2.6.32.59/kernel/vserver/monitor.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/monitor.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,138 @@
+/*
+ * kernel/vserver/monitor.c
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/network.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/network.c
---- linux-2.6.32.6/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/network.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/network.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/network.c
+--- linux-2.6.32.59/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/network.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,864 @@
+/*
+ * linux/kernel/vserver/network.c
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/proc.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/proc.c
---- linux-2.6.32.6/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/proc.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/proc.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/proc.c
+--- linux-2.6.32.59/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/proc.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,1098 @@
+/*
+ * linux/kernel/vserver/proc.c
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/sched.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/sched.c
---- linux-2.6.32.6/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/sched.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/sched.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/sched.c
+--- linux-2.6.32.59/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/sched.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,414 @@
+/*
+ * linux/kernel/vserver/sched.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/sched_init.h linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/sched_init.h
---- linux-2.6.32.6/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/sched_init.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/sched_init.h linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/sched_init.h
+--- linux-2.6.32.59/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/sched_init.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,50 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
+{
+ return;
+}
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/sched_proc.h linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/sched_proc.h
---- linux-2.6.32.6/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/sched_proc.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/sched_proc.h linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/sched_proc.h
+--- linux-2.6.32.59/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/sched_proc.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,57 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/signal.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/signal.c
---- linux-2.6.32.6/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/signal.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/signal.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/signal.c
+--- linux-2.6.32.59/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/signal.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,132 @@
+/*
+ * linux/kernel/vserver/signal.c
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/space.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/space.c
---- linux-2.6.32.6/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/space.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/space.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/space.c
+--- linux-2.6.32.59/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/space.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,375 @@
+/*
+ * linux/kernel/vserver/space.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/switch.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/switch.c
---- linux-2.6.32.6/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/switch.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/switch.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/switch.c
+--- linux-2.6.32.59/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/switch.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,546 @@
+/*
+ * linux/kernel/vserver/switch.c
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/sysctl.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/sysctl.c
---- linux-2.6.32.6/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/sysctl.c 2010-01-13 15:21:01.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/sysctl.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/sysctl.c
+--- linux-2.6.32.59/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/sysctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,245 @@
+/*
+ * kernel/vserver/sysctl.c
+EXPORT_SYMBOL_GPL(vx_debug_space);
+EXPORT_SYMBOL_GPL(vx_debug_misc);
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/tag.c linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/tag.c
---- linux-2.6.32.6/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/tag.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/tag.c linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/tag.c
+--- linux-2.6.32.59/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/tag.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,63 @@
+/*
+ * linux/kernel/vserver/tag.c
+}
+
+
-diff -NurpP --minimal linux-2.6.32.6/kernel/vserver/vci_config.h linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/vci_config.h
---- linux-2.6.32.6/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/kernel/vserver/vci_config.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/kernel/vserver/vci_config.h linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/vci_config.h
+--- linux-2.6.32.59/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/kernel/vserver/vci_config.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,81 @@
+
+/* interface version */
+ 0;
+}
+
-diff -NurpP --minimal linux-2.6.32.6/mm/allocpercpu.c linux-2.6.32.6-vs2.3.0.36.28/mm/allocpercpu.c
---- linux-2.6.32.6/mm/allocpercpu.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/mm/allocpercpu.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/mm/allocpercpu.c linux-2.6.32.59-vs2.3.0.36.29.9/mm/allocpercpu.c
+--- linux-2.6.32.59/mm/allocpercpu.c 2009-12-03 20:02:58.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/mm/allocpercpu.c 2011-06-10 13:03:02.000000000 +0200
@@ -160,12 +160,14 @@ EXPORT_SYMBOL(__per_cpu_offset);
void __init setup_per_cpu_areas(void)
ptr = alloc_bootmem_pages(size * nr_possible_cpus);
for_each_possible_cpu(i) {
-diff -NurpP --minimal linux-2.6.32.6/mm/filemap_xip.c linux-2.6.32.6-vs2.3.0.36.28/mm/filemap_xip.c
---- linux-2.6.32.6/mm/filemap_xip.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/mm/filemap_xip.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/mm/filemap_xip.c linux-2.6.32.59-vs2.3.0.36.29.9/mm/filemap_xip.c
+--- linux-2.6.32.59/mm/filemap_xip.c 2012-03-20 11:26:31.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/mm/filemap_xip.c 2012-03-23 18:34:19.000000000 +0100
@@ -17,6 +17,7 @@
#include <linux/sched.h>
#include <linux/seqlock.h>
#include <asm/tlbflush.h>
#include <asm/io.h>
-diff -NurpP --minimal linux-2.6.32.6/mm/fremap.c linux-2.6.32.6-vs2.3.0.36.28/mm/fremap.c
---- linux-2.6.32.6/mm/fremap.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/mm/fremap.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/mm/fremap.c linux-2.6.32.59-vs2.3.0.36.29.9/mm/fremap.c
+--- linux-2.6.32.59/mm/fremap.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/mm/fremap.c 2011-06-10 13:03:02.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/module.h>
#include <linux/syscalls.h>
#include <asm/mmu_context.h>
#include <asm/cacheflush.h>
-diff -NurpP --minimal linux-2.6.32.6/mm/hugetlb.c linux-2.6.32.6-vs2.3.0.36.28/mm/hugetlb.c
---- linux-2.6.32.6/mm/hugetlb.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/mm/hugetlb.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/mm/hugetlb.c linux-2.6.32.59-vs2.3.0.36.29.9/mm/hugetlb.c
+--- linux-2.6.32.59/mm/hugetlb.c 2012-03-20 11:26:31.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/mm/hugetlb.c 2011-08-08 22:40:36.000000000 +0200
@@ -24,6 +24,7 @@
#include <asm/io.h>
#include "internal.h"
const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
-diff -NurpP --minimal linux-2.6.32.6/mm/memory.c linux-2.6.32.6-vs2.3.0.36.28/mm/memory.c
---- linux-2.6.32.6/mm/memory.c 2010-01-26 19:31:27.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/mm/memory.c 2009-12-30 00:58:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/mm/memcontrol.c linux-2.6.32.59-vs2.3.0.36.29.9/mm/memcontrol.c
+--- linux-2.6.32.59/mm/memcontrol.c 2012-03-20 11:26:31.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/mm/memcontrol.c 2011-06-10 13:03:02.000000000 +0200
+@@ -549,6 +549,31 @@ struct mem_cgroup *mem_cgroup_from_task(
+ struct mem_cgroup, css);
+ }
+
++u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member)
++{
++ return res_counter_read_u64(&mem->res, member);
++}
++
++u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member)
++{
++ return res_counter_read_u64(&mem->memsw, member);
++}
++
++s64 mem_cgroup_stat_read_cache(struct mem_cgroup *mem)
++{
++ return mem_cgroup_read_stat(&mem->stat, MEM_CGROUP_STAT_CACHE);
++}
++
++s64 mem_cgroup_stat_read_anon(struct mem_cgroup *mem)
++{
++ return mem_cgroup_read_stat(&mem->stat, MEM_CGROUP_STAT_RSS);
++}
++
++s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem)
++{
++ return mem_cgroup_read_stat(&mem->stat, MEM_CGROUP_STAT_MAPPED_FILE);
++}
++
+ static struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
+ {
+ struct mem_cgroup *mem = NULL;
+diff -NurpP --minimal linux-2.6.32.59/mm/memory.c linux-2.6.32.59-vs2.3.0.36.29.9/mm/memory.c
+--- linux-2.6.32.59/mm/memory.c 2012-03-20 11:26:31.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/mm/memory.c 2011-08-08 22:40:36.000000000 +0200
@@ -56,6 +56,7 @@
#include <linux/kallsyms.h>
#include <linux/swapops.h>
again:
rss[1] = rss[0] = 0;
dst_pte = pte_alloc_map_lock(dst_mm, dst_pmd, addr, &dst_ptl);
-@@ -2645,6 +2649,8 @@ static int do_anonymous_page(struct mm_s
- /* Allocate our own private page. */
+@@ -2680,6 +2684,9 @@ static int do_anonymous_page(struct mm_s
+
pte_unmap(page_table);
+ if (!vx_rss_avail(mm, 1))
+ goto oom;
- if (unlikely(anon_vma_prepare(vma)))
- goto oom;
- page = alloc_zeroed_user_highpage_movable(vma, address);
-@@ -2936,6 +2942,7 @@ static inline int handle_pte_fault(struc
++
+ /* Check if we need to add a guard page to the stack */
+ if (check_stack_guard_page(vma, address) < 0)
+ return VM_FAULT_SIGBUS;
+@@ -2986,6 +2993,7 @@ static inline int handle_pte_fault(struc
{
pte_t entry;
spinlock_t *ptl;
entry = *pte;
if (!pte_present(entry)) {
-@@ -2960,9 +2967,12 @@ static inline int handle_pte_fault(struc
+@@ -3010,9 +3018,12 @@ static inline int handle_pte_fault(struc
if (unlikely(!pte_same(*pte, entry)))
goto unlock;
if (flags & FAULT_FLAG_WRITE) {
entry = pte_mkdirty(entry);
}
entry = pte_mkyoung(entry);
-@@ -2980,7 +2990,10 @@ static inline int handle_pte_fault(struc
+@@ -3030,7 +3041,10 @@ static inline int handle_pte_fault(struc
}
unlock:
pte_unmap_unlock(pte, ptl);
}
/*
-diff -NurpP --minimal linux-2.6.32.6/mm/mlock.c linux-2.6.32.6-vs2.3.0.36.28/mm/mlock.c
---- linux-2.6.32.6/mm/mlock.c 2010-01-26 19:31:27.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/mm/mlock.c 2010-01-13 14:33:47.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/mm/mlock.c linux-2.6.32.59-vs2.3.0.36.29.9/mm/mlock.c
+--- linux-2.6.32.59/mm/mlock.c 2012-03-20 11:26:31.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/mm/mlock.c 2011-06-10 13:03:02.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/rmap.h>
#include <linux/mmzone.h>
#include "internal.h"
-@@ -401,7 +402,7 @@ success:
+@@ -414,7 +415,7 @@ success:
nr_pages = (end - start) >> PAGE_SHIFT;
if (!lock)
nr_pages = -nr_pages;
/*
* vm_flags is protected by the mmap_sem held in write mode.
-@@ -474,7 +475,7 @@ static int do_mlock(unsigned long start,
+@@ -487,7 +488,7 @@ static int do_mlock(unsigned long start,
SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
{
unsigned long lock_limit;
int error = -ENOMEM;
-@@ -487,8 +488,10 @@ SYSCALL_DEFINE2(mlock, unsigned long, st
+@@ -500,8 +501,10 @@ SYSCALL_DEFINE2(mlock, unsigned long, st
len = PAGE_ALIGN(len + (start & ~PAGE_MASK));
start &= PAGE_MASK;
lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
lock_limit >>= PAGE_SHIFT;
-@@ -496,6 +499,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st
+@@ -509,6 +512,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st
/* check against resource limits */
if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
error = do_mlock(start, len, 1);
up_write(¤t->mm->mmap_sem);
return error;
}
-@@ -557,6 +561,8 @@ SYSCALL_DEFINE1(mlockall, int, flags)
+@@ -570,6 +574,8 @@ SYSCALL_DEFINE1(mlockall, int, flags)
lock_limit >>= PAGE_SHIFT;
ret = -ENOMEM;
if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
capable(CAP_IPC_LOCK))
ret = do_mlockall(flags);
-@@ -631,8 +637,10 @@ int account_locked_memory(struct mm_stru
+@@ -644,8 +650,10 @@ int account_locked_memory(struct mm_stru
if (lim < vm)
goto out;
error = 0;
out:
-@@ -646,8 +654,10 @@ void refund_locked_memory(struct mm_stru
+@@ -659,8 +667,10 @@ void refund_locked_memory(struct mm_stru
down_write(&mm->mmap_sem);
up_write(&mm->mmap_sem);
}
-diff -NurpP --minimal linux-2.6.32.6/mm/mmap.c linux-2.6.32.6-vs2.3.0.36.28/mm/mmap.c
---- linux-2.6.32.6/mm/mmap.c 2010-01-26 19:31:27.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/mm/mmap.c 2010-01-20 04:21:33.000000000 +0100
-@@ -1214,7 +1214,8 @@ munmap_back:
+diff -NurpP --minimal linux-2.6.32.59/mm/mmap.c linux-2.6.32.59-vs2.3.0.36.29.9/mm/mmap.c
+--- linux-2.6.32.59/mm/mmap.c 2012-03-20 11:26:31.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/mm/mmap.c 2011-11-17 12:18:26.000000000 +0100
+@@ -1224,7 +1224,8 @@ munmap_back:
out:
perf_event_mmap(vma);
vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
if (vm_flags & VM_LOCKED) {
/*
-@@ -1223,7 +1224,8 @@ out:
+@@ -1233,7 +1234,8 @@ out:
long nr_pages = mlock_vma_pages_range(vma, addr, addr + len);
if (nr_pages < 0)
return nr_pages; /* vma gone! */
} else if ((flags & MAP_POPULATE) && !(flags & MAP_NONBLOCK))
make_pages_present(addr, addr + len);
return addr;
-@@ -1578,9 +1580,9 @@ static int acct_stack_growth(struct vm_a
+@@ -1588,9 +1590,9 @@ static int acct_stack_growth(struct vm_a
return -ENOMEM;
/* Ok, everything looks good - let it rip */
vm_stat_account(mm, vma->vm_flags, vma->vm_file, grow);
return 0;
}
-@@ -1755,7 +1757,8 @@ static void remove_vma_list(struct mm_st
+@@ -1768,7 +1770,8 @@ static void remove_vma_list(struct mm_st
do {
long nrpages = vma_pages(vma);
vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
vma = remove_vma(vma);
} while (vma);
-@@ -1927,7 +1930,8 @@ int do_munmap(struct mm_struct *mm, unsi
+@@ -1943,7 +1946,8 @@ int do_munmap(struct mm_struct *mm, unsi
struct vm_area_struct *tmp = vma;
while (tmp && tmp->vm_start < end) {
if (tmp->vm_flags & VM_LOCKED) {
munlock_vma_pages_all(tmp);
}
tmp = tmp->vm_next;
-@@ -2010,6 +2014,8 @@ unsigned long do_brk(unsigned long addr,
+@@ -2026,6 +2030,8 @@ unsigned long do_brk(unsigned long addr,
lock_limit >>= PAGE_SHIFT;
if (locked > lock_limit && !capable(CAP_IPC_LOCK))
return -EAGAIN;
}
/*
-@@ -2036,7 +2042,8 @@ unsigned long do_brk(unsigned long addr,
+@@ -2052,7 +2058,8 @@ unsigned long do_brk(unsigned long addr,
if (mm->map_count > sysctl_max_map_count)
return -ENOMEM;
return -ENOMEM;
/* Can we just expand an old private anonymous mapping? */
-@@ -2062,10 +2069,13 @@ unsigned long do_brk(unsigned long addr,
+@@ -2078,10 +2085,13 @@ unsigned long do_brk(unsigned long addr,
vma->vm_page_prot = vm_get_page_prot(flags);
vma_link(mm, vma, prev, rb_link, rb_parent);
out:
}
return addr;
}
-@@ -2109,6 +2119,11 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2125,6 +2135,11 @@ void exit_mmap(struct mm_struct *mm)
free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
tlb_finish_mmu(tlb, 0, end);
/*
* Walk the list again, actually closing and freeing it,
* with preemption enabled, without holding any MM locks.
-@@ -2148,7 +2163,8 @@ int insert_vm_struct(struct mm_struct *
+@@ -2164,7 +2179,8 @@ int insert_vm_struct(struct mm_struct *
if (__vma && __vma->vm_start < vma->vm_end)
return -ENOMEM;
if ((vma->vm_flags & VM_ACCOUNT) &&
return -ENOMEM;
vma_link(mm, vma, prev, rb_link, rb_parent);
return 0;
-@@ -2224,6 +2240,8 @@ int may_expand_vm(struct mm_struct *mm,
+@@ -2240,6 +2256,8 @@ int may_expand_vm(struct mm_struct *mm,
if (cur + npages > lim)
return 0;
return 1;
}
-@@ -2301,7 +2319,7 @@ int install_special_mapping(struct mm_st
- return -ENOMEM;
- }
+@@ -2321,7 +2339,7 @@ int install_special_mapping(struct mm_st
+ if (ret)
+ goto out;
- mm->total_vm += len >> PAGE_SHIFT;
+ vx_vmpages_add(mm, len >> PAGE_SHIFT);
perf_event_mmap(vma);
-diff -NurpP --minimal linux-2.6.32.6/mm/mremap.c linux-2.6.32.6-vs2.3.0.36.28/mm/mremap.c
---- linux-2.6.32.6/mm/mremap.c 2010-01-26 19:31:27.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/mm/mremap.c 2010-01-20 04:28:22.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/mm/mremap.c linux-2.6.32.59-vs2.3.0.36.29.9/mm/mremap.c
+--- linux-2.6.32.59/mm/mremap.c 2012-03-20 11:26:31.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/mm/mremap.c 2011-06-10 13:03:02.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
#include <asm/uaccess.h>
#include <asm/cacheflush.h>
-@@ -234,7 +235,7 @@ static unsigned long move_vma(struct vm_
+@@ -232,7 +233,7 @@ static unsigned long move_vma(struct vm_
* If this were a serious issue, we'd add a flag to do_munmap().
*/
hiwater_vm = mm->hiwater_vm;
vm_stat_account(mm, vma->vm_flags, vma->vm_file, new_len>>PAGE_SHIFT);
if (do_munmap(mm, old_addr, old_len) < 0) {
-@@ -252,7 +253,7 @@ static unsigned long move_vma(struct vm_
+@@ -250,7 +251,7 @@ static unsigned long move_vma(struct vm_
}
if (vm_flags & VM_LOCKED) {
if (new_len > old_len)
mlock_vma_pages_range(new_vma, new_addr + old_len,
new_addr + new_len);
-@@ -463,10 +464,12 @@ unsigned long do_mremap(unsigned long ad
+@@ -468,10 +469,12 @@ unsigned long do_mremap(unsigned long ad
vma_adjust(vma, vma->vm_start,
addr + new_len, vma->vm_pgoff, NULL);
mlock_vma_pages_range(vma, addr + old_len,
addr + new_len);
}
-diff -NurpP --minimal linux-2.6.32.6/mm/nommu.c linux-2.6.32.6-vs2.3.0.36.28/mm/nommu.c
---- linux-2.6.32.6/mm/nommu.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/mm/nommu.c 2009-12-03 20:04:56.000000000 +0100
-@@ -1346,7 +1346,7 @@ unsigned long do_mmap_pgoff(struct file
+diff -NurpP --minimal linux-2.6.32.59/mm/nommu.c linux-2.6.32.59-vs2.3.0.36.29.9/mm/nommu.c
+--- linux-2.6.32.59/mm/nommu.c 2012-03-20 11:26:31.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/mm/nommu.c 2011-06-10 13:03:02.000000000 +0200
+@@ -1349,7 +1349,7 @@ unsigned long do_mmap_pgoff(struct file
/* okay... we have a mapping; now we have to register it */
result = vma->vm_start;
share:
add_vma_to_mm(current->mm, vma);
-@@ -1606,7 +1606,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -1609,7 +1609,7 @@ void exit_mmap(struct mm_struct *mm)
kenter("");
while ((vma = mm->mmap)) {
mm->mmap = vma->vm_next;
-diff -NurpP --minimal linux-2.6.32.6/mm/oom_kill.c linux-2.6.32.6-vs2.3.0.36.28/mm/oom_kill.c
---- linux-2.6.32.6/mm/oom_kill.c 2010-01-26 19:31:27.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/mm/oom_kill.c 2010-01-13 14:33:47.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/mm/oom_kill.c linux-2.6.32.59-vs2.3.0.36.29.9/mm/oom_kill.c
+--- linux-2.6.32.59/mm/oom_kill.c 2012-03-20 11:26:31.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/mm/oom_kill.c 2011-06-10 13:03:02.000000000 +0200
@@ -27,6 +27,9 @@
#include <linux/notifier.h>
#include <linux/memcontrol.h>
/* Try to kill a child first */
list_for_each_entry(c, &p->children, sibling) {
-@@ -519,6 +538,8 @@ void clear_zonelist_oom(struct zonelist
+@@ -521,6 +540,8 @@ void clear_zonelist_oom(struct zonelist
spin_unlock(&zone_scan_lock);
}
/*
* Must be called with tasklist_lock held for read.
*/
-@@ -544,7 +565,11 @@ retry:
+@@ -546,7 +567,11 @@ retry:
/* Found nothing?!?! Either we hang forever, or we panic. */
if (!p) {
read_unlock(&tasklist_lock);
}
if (oom_kill_process(p, gfp_mask, order, points, NULL,
-diff -NurpP --minimal linux-2.6.32.6/mm/page_alloc.c linux-2.6.32.6-vs2.3.0.36.28/mm/page_alloc.c
---- linux-2.6.32.6/mm/page_alloc.c 2010-01-26 19:31:27.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/mm/page_alloc.c 2010-01-26 20:35:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/mm/page_alloc.c linux-2.6.32.59-vs2.3.0.36.29.9/mm/page_alloc.c
+--- linux-2.6.32.59/mm/page_alloc.c 2012-03-20 11:26:31.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/mm/page_alloc.c 2011-08-08 22:40:36.000000000 +0200
@@ -48,6 +48,8 @@
#include <linux/page_cgroup.h>
#include <linux/debugobjects.h>
#include <trace/events/kmem.h>
#include <asm/tlbflush.h>
-@@ -2130,6 +2132,9 @@ void si_meminfo(struct sysinfo *val)
+@@ -2144,6 +2146,9 @@ void si_meminfo(struct sysinfo *val)
val->totalhigh = totalhigh_pages;
val->freehigh = nr_free_highpages();
val->mem_unit = PAGE_SIZE;
}
EXPORT_SYMBOL(si_meminfo);
-@@ -2150,6 +2155,9 @@ void si_meminfo_node(struct sysinfo *val
+@@ -2164,6 +2169,9 @@ void si_meminfo_node(struct sysinfo *val
val->freehigh = 0;
#endif
val->mem_unit = PAGE_SIZE;
}
#endif
-diff -NurpP --minimal linux-2.6.32.6/mm/rmap.c linux-2.6.32.6-vs2.3.0.36.28/mm/rmap.c
---- linux-2.6.32.6/mm/rmap.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/mm/rmap.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/mm/rmap.c linux-2.6.32.59-vs2.3.0.36.29.9/mm/rmap.c
+--- linux-2.6.32.59/mm/rmap.c 2009-12-03 20:02:58.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/mm/rmap.c 2011-06-10 13:03:02.000000000 +0200
@@ -55,6 +55,7 @@
#include <linux/memcontrol.h>
#include <linux/mmu_notifier.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.32.6/mm/shmem.c linux-2.6.32.6-vs2.3.0.36.28/mm/shmem.c
---- linux-2.6.32.6/mm/shmem.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/mm/shmem.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/mm/shmem.c linux-2.6.32.59-vs2.3.0.36.29.9/mm/shmem.c
+--- linux-2.6.32.59/mm/shmem.c 2012-03-20 11:26:31.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/mm/shmem.c 2011-06-10 13:03:02.000000000 +0200
@@ -1781,7 +1781,7 @@ static int shmem_statfs(struct dentry *d
{
struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
#ifdef CONFIG_TMPFS_POSIX_ACL
-diff -NurpP --minimal linux-2.6.32.6/mm/slab.c linux-2.6.32.6-vs2.3.0.36.28/mm/slab.c
---- linux-2.6.32.6/mm/slab.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/mm/slab.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/mm/slab.c linux-2.6.32.59-vs2.3.0.36.29.9/mm/slab.c
+--- linux-2.6.32.59/mm/slab.c 2012-03-20 11:26:31.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/mm/slab.c 2011-06-10 13:03:02.000000000 +0200
@@ -431,6 +431,8 @@ static void kmem_list3_init(struct kmem_
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
#if DEBUG
/*
-@@ -3253,6 +3255,7 @@ retry:
+@@ -3251,6 +3253,7 @@ retry:
obj = slab_get_obj(cachep, slabp, nodeid);
check_slabp(cachep, slabp);
l3->free_objects--;
/* move slabp to correct slabp list: */
list_del(&slabp->list);
-@@ -3329,6 +3332,7 @@ __cache_alloc_node(struct kmem_cache *ca
+@@ -3327,6 +3330,7 @@ __cache_alloc_node(struct kmem_cache *ca
/* ___cache_alloc_node can fall back to other nodes */
ptr = ____cache_alloc_node(cachep, flags, nodeid);
out:
local_irq_restore(save_flags);
ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
kmemleak_alloc_recursive(ptr, obj_size(cachep), 1, cachep->flags,
-@@ -3515,6 +3519,7 @@ static inline void __cache_free(struct k
+@@ -3513,6 +3517,7 @@ static inline void __cache_free(struct k
check_irq_off();
kmemleak_free_recursive(objp, cachep->flags);
objp = cache_free_debugcheck(cachep, objp, __builtin_return_address(0));
kmemcheck_slab_free(cachep, objp, obj_size(cachep));
-diff -NurpP --minimal linux-2.6.32.6/mm/slab_vs.h linux-2.6.32.6-vs2.3.0.36.28/mm/slab_vs.h
---- linux-2.6.32.6/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/mm/slab_vs.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/mm/slab_vs.h linux-2.6.32.59-vs2.3.0.36.29.9/mm/slab_vs.h
+--- linux-2.6.32.59/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/mm/slab_vs.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,29 @@
+
+#include <linux/vserver/context.h>
+ atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-2.6.32.6/mm/swapfile.c linux-2.6.32.6-vs2.3.0.36.28/mm/swapfile.c
---- linux-2.6.32.6/mm/swapfile.c 2009-12-03 20:02:58.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/mm/swapfile.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/mm/swapfile.c linux-2.6.32.59-vs2.3.0.36.29.9/mm/swapfile.c
+--- linux-2.6.32.59/mm/swapfile.c 2012-03-20 11:26:31.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/mm/swapfile.c 2011-06-10 13:03:02.000000000 +0200
@@ -34,6 +34,8 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
static DEFINE_SPINLOCK(swap_lock);
static unsigned int nr_swapfiles;
-@@ -1680,6 +1682,8 @@ static void *swap_next(struct seq_file *
+@@ -1682,6 +1684,8 @@ static void *swap_next(struct seq_file *
if (v == SEQ_START_TOKEN)
ptr = swap_info;
else {
ptr = v;
ptr++;
}
-@@ -1707,6 +1711,16 @@ static int swap_show(struct seq_file *sw
+@@ -1709,6 +1713,16 @@ static int swap_show(struct seq_file *sw
if (ptr == SEQ_START_TOKEN) {
seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n");
return 0;
}
-@@ -2064,6 +2078,8 @@ void si_swapinfo(struct sysinfo *val)
+@@ -2066,6 +2080,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);
}
/*
-diff -NurpP --minimal linux-2.6.32.6/net/core/dev.c linux-2.6.32.6-vs2.3.0.36.28/net/core/dev.c
---- linux-2.6.32.6/net/core/dev.c 2010-01-26 19:31:28.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/core/dev.c 2010-01-04 18:37:03.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/core/dev.c linux-2.6.32.59-vs2.3.0.36.29.9/net/core/dev.c
+--- linux-2.6.32.59/net/core/dev.c 2012-03-20 11:26:31.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/core/dev.c 2012-01-10 09:18:12.000000000 +0100
@@ -126,6 +126,7 @@
#include <linux/in.h>
#include <linux/jhash.h>
/* avoid cases where sscanf is not exact inverse of printf */
snprintf(buf, IFNAMSIZ, name, i);
-@@ -2984,6 +2993,8 @@ static int dev_ifconf(struct net *net, c
+@@ -3003,6 +3012,8 @@ static int dev_ifconf(struct net *net, c
total = 0;
for_each_netdev(net, dev) {
for (i = 0; i < NPROTO; i++) {
if (gifconf_list[i]) {
int done;
-@@ -3052,6 +3063,9 @@ static void dev_seq_printf_stats(struct
+@@ -3071,6 +3082,9 @@ static void dev_seq_printf_stats(struct
{
const struct net_device_stats *stats = dev_get_stats(dev);
seq_printf(seq, "%6s:%8lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu "
"%8lu %7lu %4lu %4lu %4lu %5lu %7lu %10lu\n",
dev->name, stats->rx_bytes, stats->rx_packets,
-@@ -5317,7 +5331,6 @@ int dev_change_net_namespace(struct net_
+@@ -5336,7 +5350,6 @@ int dev_change_net_namespace(struct net_
if (dev->dev.parent)
goto out;
#endif
/* Ensure the device has been registrered */
err = -EINVAL;
if (dev->reg_state != NETREG_REGISTERED)
-diff -NurpP --minimal linux-2.6.32.6/net/core/rtnetlink.c linux-2.6.32.6-vs2.3.0.36.28/net/core/rtnetlink.c
---- linux-2.6.32.6/net/core/rtnetlink.c 2010-01-26 19:31:28.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/core/rtnetlink.c 2009-12-29 00:36:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/core/rtnetlink.c linux-2.6.32.59-vs2.3.0.36.29.9/net/core/rtnetlink.c
+--- linux-2.6.32.59/net/core/rtnetlink.c 2012-03-20 11:26:31.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/core/rtnetlink.c 2011-06-10 13:03:02.000000000 +0200
@@ -688,6 +688,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
idx = 0;
skb = nlmsg_new(if_nlmsg_size(dev), GFP_KERNEL);
if (skb == NULL)
goto errout;
-diff -NurpP --minimal linux-2.6.32.6/net/core/sock.c linux-2.6.32.6-vs2.3.0.36.28/net/core/sock.c
---- linux-2.6.32.6/net/core/sock.c 2009-12-03 20:02:59.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/core/sock.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/core/sock.c linux-2.6.32.59-vs2.3.0.36.29.9/net/core/sock.c
+--- linux-2.6.32.59/net/core/sock.c 2012-03-20 11:26:31.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/core/sock.c 2011-06-10 13:03:02.000000000 +0200
@@ -125,6 +125,10 @@
#include <linux/ipsec.h>
/*
* Increment the counter in the same struct proto as the master
* sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
-@@ -1882,6 +1901,12 @@ void sock_init_data(struct socket *sock,
+@@ -1886,6 +1905,12 @@ void sock_init_data(struct socket *sock,
sk->sk_stamp = ktime_set(-1L, 0);
/*
* Before updating sk_refcnt, we must commit prior changes to memory
* (Documentation/RCU/rculist_nulls.txt for details)
-diff -NurpP --minimal linux-2.6.32.6/net/ipv4/af_inet.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/af_inet.c
---- linux-2.6.32.6/net/ipv4/af_inet.c 2009-12-03 20:02:59.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/af_inet.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv4/af_inet.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/af_inet.c
+--- linux-2.6.32.59/net/ipv4/af_inet.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/af_inet.c 2011-08-08 22:42:21.000000000 +0200
@@ -115,6 +115,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
unsigned short snum;
int chk_addr_ret;
int err;
-@@ -460,7 +465,11 @@ int inet_bind(struct socket *sock, struc
- if (addr_len < sizeof(struct sockaddr_in))
+@@ -463,7 +468,11 @@ int inet_bind(struct socket *sock, struc
+ if (addr->sin_family != AF_INET)
goto out;
- chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);
/* Not specified by any standard per-se, however it breaks too
* many applications when removed. It is unfortunate since
-@@ -472,7 +481,7 @@ int inet_bind(struct socket *sock, struc
+@@ -475,7 +484,7 @@ int inet_bind(struct socket *sock, struc
err = -EADDRNOTAVAIL;
if (!sysctl_ip_nonlocal_bind &&
!(inet->freebind || inet->transparent) &&
chk_addr_ret != RTN_LOCAL &&
chk_addr_ret != RTN_MULTICAST &&
chk_addr_ret != RTN_BROADCAST)
-@@ -497,7 +506,7 @@ int inet_bind(struct socket *sock, struc
+@@ -500,7 +509,7 @@ int inet_bind(struct socket *sock, struc
if (sk->sk_state != TCP_CLOSE || inet->num)
goto out_release_sock;
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->saddr = 0; /* Use device */
-@@ -694,11 +703,13 @@ int inet_getname(struct socket *sock, st
+@@ -697,11 +706,13 @@ int inet_getname(struct socket *sock, st
peer == 1))
return -ENOTCONN;
sin->sin_port = inet->dport;
sin->sin_port = inet->sport;
sin->sin_addr.s_addr = addr;
}
-diff -NurpP --minimal linux-2.6.32.6/net/ipv4/devinet.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/devinet.c
---- linux-2.6.32.6/net/ipv4/devinet.c 2009-12-03 20:02:59.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/devinet.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv4/devinet.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/devinet.c
+--- linux-2.6.32.59/net/ipv4/devinet.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/devinet.c 2011-06-10 13:03:02.000000000 +0200
@@ -413,6 +413,7 @@ struct in_device *inetdev_by_index(struc
return in_dev;
}
if (!buf) {
done += sizeof(ifr);
continue;
-@@ -1174,6 +1184,7 @@ static int inet_dump_ifaddr(struct sk_bu
+@@ -1185,6 +1195,7 @@ static int inet_dump_ifaddr(struct sk_bu
struct net_device *dev;
struct in_device *in_dev;
struct in_ifaddr *ifa;
int s_ip_idx, s_idx = cb->args[0];
s_ip_idx = ip_idx = cb->args[1];
-@@ -1188,6 +1199,8 @@ static int inet_dump_ifaddr(struct sk_bu
+@@ -1199,6 +1210,8 @@ static int inet_dump_ifaddr(struct sk_bu
for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
ifa = ifa->ifa_next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid,
-diff -NurpP --minimal linux-2.6.32.6/net/ipv4/fib_hash.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/fib_hash.c
---- linux-2.6.32.6/net/ipv4/fib_hash.c 2009-09-10 15:26:29.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/fib_hash.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv4/fib_hash.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/fib_hash.c
+--- linux-2.6.32.59/net/ipv4/fib_hash.c 2009-09-10 15:26:29.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/fib_hash.c 2011-06-10 13:03:02.000000000 +0200
@@ -1021,7 +1021,7 @@ static int fib_seq_show(struct seq_file
prefix = f->fn_key;
mask = FZ_MASK(iter->zone);
seq_printf(seq,
"%s\t%08X\t%08X\t%04X\t%d\t%u\t%d\t%08X\t%d\t%u\t%u%n",
fi->fib_dev ? fi->fib_dev->name : "*", prefix,
-diff -NurpP --minimal linux-2.6.32.6/net/ipv4/inet_connection_sock.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/inet_connection_sock.c
---- linux-2.6.32.6/net/ipv4/inet_connection_sock.c 2009-12-03 20:02:59.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/inet_connection_sock.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv4/inet_connection_sock.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/inet_connection_sock.c
+--- linux-2.6.32.59/net/ipv4/inet_connection_sock.c 2009-12-03 20:02:59.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/inet_connection_sock.c 2011-06-10 13:03:02.000000000 +0200
@@ -49,10 +49,40 @@ void inet_get_local_port_range(int *low,
}
EXPORT_SYMBOL(inet_get_local_port_range);
break;
}
}
-diff -NurpP --minimal linux-2.6.32.6/net/ipv4/inet_diag.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/inet_diag.c
---- linux-2.6.32.6/net/ipv4/inet_diag.c 2009-09-10 15:26:29.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/inet_diag.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv4/inet_diag.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/inet_diag.c
+--- linux-2.6.32.59/net/ipv4/inet_diag.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/inet_diag.c 2011-08-08 22:40:36.000000000 +0200
@@ -32,6 +32,8 @@
#include <linux/stddef.h>
entry.saddr = &inet->rcv_saddr;
entry.daddr = &inet->daddr;
}
-@@ -540,6 +544,7 @@ static int inet_twsk_diag_dump(struct in
+@@ -542,6 +546,7 @@ static int inet_twsk_diag_dump(struct in
} else
#endif
{
entry.saddr = &tw->tw_rcv_saddr;
entry.daddr = &tw->tw_daddr;
}
-@@ -586,8 +591,8 @@ static int inet_diag_fill_req(struct sk_
+@@ -588,8 +593,8 @@ static int inet_diag_fill_req(struct sk_
r->id.idiag_sport = inet->sport;
r->id.idiag_dport = ireq->rmt_port;
r->idiag_expires = jiffies_to_msecs(tmo);
r->idiag_rqueue = 0;
r->idiag_wqueue = 0;
-@@ -657,6 +662,7 @@ static int inet_diag_dump_reqs(struct sk
+@@ -660,6 +665,7 @@ static int inet_diag_dump_reqs(struct sk
continue;
if (bc) {
entry.saddr =
#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
(entry.family == AF_INET6) ?
-@@ -727,6 +733,8 @@ static int inet_diag_dump(struct sk_buff
+@@ -730,6 +736,8 @@ static int inet_diag_dump(struct sk_buff
sk_nulls_for_each(sk, node, &ilb->head) {
struct inet_sock *inet = inet_sk(sk);
if (num < s_num) {
num++;
continue;
-@@ -793,6 +801,8 @@ skip_listen_ht:
+@@ -796,6 +804,8 @@ skip_listen_ht:
sk_nulls_for_each(sk, node, &head->chain) {
struct inet_sock *inet = inet_sk(sk);
if (num < s_num)
goto next_normal;
if (!(r->idiag_states & (1 << sk->sk_state)))
-@@ -817,6 +827,8 @@ next_normal:
+@@ -820,6 +830,8 @@ next_normal:
inet_twsk_for_each(tw, node,
&head->twchain) {
if (num < s_num)
goto next_dying;
if (r->id.idiag_sport != tw->tw_sport &&
-diff -NurpP --minimal linux-2.6.32.6/net/ipv4/inet_hashtables.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/inet_hashtables.c
---- linux-2.6.32.6/net/ipv4/inet_hashtables.c 2009-06-11 17:13:29.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/inet_hashtables.c 2009-12-03 20:04:56.000000000 +0100
-@@ -21,6 +21,7 @@
-
+diff -NurpP --minimal linux-2.6.32.59/net/ipv4/inet_hashtables.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/inet_hashtables.c
+--- linux-2.6.32.59/net/ipv4/inet_hashtables.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/inet_hashtables.c 2011-11-17 12:19:00.000000000 +0100
+@@ -22,6 +22,7 @@
#include <net/inet_connection_sock.h>
#include <net/inet_hashtables.h>
+ #include <net/secure_seq.h>
+#include <net/route.h>
#include <net/ip.h>
/*
-@@ -134,6 +135,11 @@ static inline int compute_score(struct s
+@@ -135,6 +136,11 @@ static inline int compute_score(struct s
if (rcv_saddr != daddr)
return -1;
score += 2;
}
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
-@@ -151,7 +157,6 @@ static inline int compute_score(struct s
+@@ -152,7 +158,6 @@ static inline int compute_score(struct s
* wildcarded during the search since they can never be otherwise.
*/
struct sock *__inet_lookup_listener(struct net *net,
struct inet_hashinfo *hashinfo,
const __be32 daddr, const unsigned short hnum,
-@@ -174,6 +179,7 @@ begin:
+@@ -175,6 +180,7 @@ begin:
hiscore = score;
}
}
/*
* if the nulls value we got at the end of this lookup is
* not the expected one, we must restart lookup.
-diff -NurpP --minimal linux-2.6.32.6/net/ipv4/netfilter/nf_nat_helper.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/netfilter/nf_nat_helper.c
---- linux-2.6.32.6/net/ipv4/netfilter/nf_nat_helper.c 2009-12-03 20:02:59.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/netfilter/nf_nat_helper.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv4/netfilter/nf_nat_helper.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/netfilter/nf_nat_helper.c
+--- linux-2.6.32.59/net/ipv4/netfilter/nf_nat_helper.c 2009-12-03 20:02:59.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/netfilter/nf_nat_helper.c 2011-06-10 13:03:02.000000000 +0200
@@ -19,6 +19,7 @@
#include <net/route.h>
#include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_conntrack_helper.h>
#include <net/netfilter/nf_conntrack_ecache.h>
-diff -NurpP --minimal linux-2.6.32.6/net/ipv4/netfilter.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/netfilter.c
---- linux-2.6.32.6/net/ipv4/netfilter.c 2009-09-10 15:26:29.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/netfilter.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv4/netfilter.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/netfilter.c
+--- linux-2.6.32.59/net/ipv4/netfilter.c 2009-09-10 15:26:29.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/netfilter.c 2011-06-10 13:03:02.000000000 +0200
@@ -4,7 +4,7 @@
#include <linux/netfilter_ipv4.h>
#include <linux/ip.h>
#include <net/xfrm.h>
#include <net/ip.h>
#include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-2.6.32.6/net/ipv4/raw.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/raw.c
---- linux-2.6.32.6/net/ipv4/raw.c 2009-12-03 20:02:59.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/raw.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv4/raw.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/raw.c
+--- linux-2.6.32.59/net/ipv4/raw.c 2009-12-03 20:02:59.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/raw.c 2011-06-10 13:03:02.000000000 +0200
@@ -117,7 +117,7 @@ static struct sock *__raw_v4_lookup(stru
if (net_eq(sock_net(sk), net) && inet->num == num &&
sk_wmem_alloc_get(sp),
sk_rmem_alloc_get(sp),
0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
-diff -NurpP --minimal linux-2.6.32.6/net/ipv4/tcp.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/tcp.c
---- linux-2.6.32.6/net/ipv4/tcp.c 2009-12-03 20:02:59.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/tcp.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv4/tcp.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/tcp.c
+--- linux-2.6.32.59/net/ipv4/tcp.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/tcp.c 2011-06-10 13:03:02.000000000 +0200
@@ -264,6 +264,7 @@
#include <linux/cache.h>
#include <linux/err.h>
#include <net/icmp.h>
#include <net/tcp.h>
-diff -NurpP --minimal linux-2.6.32.6/net/ipv4/tcp_ipv4.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/tcp_ipv4.c
---- linux-2.6.32.6/net/ipv4/tcp_ipv4.c 2009-12-03 20:03:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/tcp_ipv4.c 2009-12-03 20:04:56.000000000 +0100
-@@ -1925,6 +1925,12 @@ static void *listening_get_next(struct s
+diff -NurpP --minimal linux-2.6.32.59/net/ipv4/tcp_ipv4.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/tcp_ipv4.c
+--- linux-2.6.32.59/net/ipv4/tcp_ipv4.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/tcp_ipv4.c 2011-11-17 12:18:26.000000000 +0100
+@@ -1926,6 +1926,12 @@ static void *listening_get_next(struct s
req = req->dl_next;
while (1) {
while (req) {
if (req->rsk_ops->family == st->family) {
cur = req;
goto out;
-@@ -1949,6 +1955,10 @@ get_req:
+@@ -1950,6 +1956,10 @@ get_req:
}
get_sk:
sk_nulls_for_each_from(sk, node) {
if (sk->sk_family == st->family && net_eq(sock_net(sk), net)) {
cur = sk;
goto out;
-@@ -2012,6 +2022,11 @@ static void *established_get_first(struc
+@@ -2013,6 +2023,11 @@ static void *established_get_first(struc
spin_lock_bh(lock);
sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
if (sk->sk_family != st->family ||
!net_eq(sock_net(sk), net)) {
continue;
-@@ -2022,6 +2037,11 @@ static void *established_get_first(struc
+@@ -2023,6 +2038,11 @@ static void *established_get_first(struc
st->state = TCP_SEQ_STATE_TIME_WAIT;
inet_twsk_for_each(tw, node,
&tcp_hashinfo.ehash[st->bucket].twchain) {
if (tw->tw_family != st->family ||
!net_eq(twsk_net(tw), net)) {
continue;
-@@ -2050,7 +2070,9 @@ static void *established_get_next(struct
+@@ -2051,7 +2071,9 @@ static void *established_get_next(struct
tw = cur;
tw = tw_next(tw);
get_tw:
tw = tw_next(tw);
}
if (tw) {
-@@ -2073,6 +2095,11 @@ get_tw:
+@@ -2074,6 +2096,11 @@ get_tw:
sk = sk_nulls_next(sk);
sk_nulls_for_each_from(sk, node) {
if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
goto found;
}
-@@ -2224,9 +2251,9 @@ static void get_openreq4(struct sock *sk
+@@ -2225,9 +2252,9 @@ static void get_openreq4(struct sock *sk
seq_printf(f, "%4d: %08X:%04X %08X:%04X"
" %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %p%n",
i,
ntohs(ireq->rmt_port),
TCP_SYN_RECV,
0, 0, /* could print option size, but that is af dependent. */
-@@ -2269,7 +2296,10 @@ static void get_tcp4_sock(struct sock *s
+@@ -2270,7 +2297,10 @@ static void get_tcp4_sock(struct sock *s
seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX "
"%08X %5d %8d %lu %d %p %lu %lu %u %u %d%n",
tp->write_seq - tp->snd_una,
sk->sk_state == TCP_LISTEN ? sk->sk_ack_backlog :
(tp->rcv_nxt - tp->copied_seq),
-@@ -2305,7 +2335,10 @@ static void get_timewait4_sock(struct in
+@@ -2306,7 +2336,10 @@ static void get_timewait4_sock(struct in
seq_printf(f, "%4d: %08X:%04X %08X:%04X"
" %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %p%n",
3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
atomic_read(&tw->tw_refcnt), tw, len);
}
-diff -NurpP --minimal linux-2.6.32.6/net/ipv4/tcp_minisocks.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/tcp_minisocks.c
---- linux-2.6.32.6/net/ipv4/tcp_minisocks.c 2009-12-03 20:03:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/tcp_minisocks.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv4/tcp_minisocks.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/tcp_minisocks.c
+--- linux-2.6.32.59/net/ipv4/tcp_minisocks.c 2009-12-03 20:03:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/tcp_minisocks.c 2011-06-10 13:03:02.000000000 +0200
@@ -26,6 +26,10 @@
#include <net/inet_common.h>
#include <net/xfrm.h>
#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.32.6/net/ipv4/udp.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/udp.c
---- linux-2.6.32.6/net/ipv4/udp.c 2009-12-03 20:03:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv4/udp.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv4/udp.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/udp.c
+--- linux-2.6.32.59/net/ipv4/udp.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv4/udp.c 2012-03-23 18:34:19.000000000 +0100
@@ -224,14 +224,7 @@ fail:
}
EXPORT_SYMBOL(udp_lib_get_port);
memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
}
if (inet->cmsg_flags)
-@@ -1627,6 +1639,8 @@ static struct sock *udp_get_first(struct
+@@ -1630,6 +1642,8 @@ static struct sock *udp_get_first(struct
sk_nulls_for_each(sk, node, &hslot->head) {
if (!net_eq(sock_net(sk), net))
continue;
if (sk->sk_family == state->family)
goto found;
}
-@@ -1644,7 +1658,9 @@ static struct sock *udp_get_next(struct
+@@ -1647,7 +1661,9 @@ static struct sock *udp_get_next(struct
do {
sk = sk_nulls_next(sk);
if (!sk) {
if (state->bucket < UDP_HTABLE_SIZE)
-@@ -1751,7 +1767,10 @@ static void udp4_format_sock(struct sock
+@@ -1754,7 +1770,10 @@ static void udp4_format_sock(struct sock
seq_printf(f, "%4d: %08X:%04X %08X:%04X"
" %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d%n",
sk_wmem_alloc_get(sp),
sk_rmem_alloc_get(sp),
0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
-diff -NurpP --minimal linux-2.6.32.6/net/ipv6/addrconf.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/addrconf.c
---- linux-2.6.32.6/net/ipv6/addrconf.c 2009-12-03 20:03:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/addrconf.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv6/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/Kconfig
+--- linux-2.6.32.59/net/ipv6/Kconfig 2009-09-10 15:26:30.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/Kconfig 2011-06-10 13:03:02.000000000 +0200
+@@ -4,8 +4,8 @@
+
+ # IPv6 as module will cause a CRASH if you try to unload it
+ menuconfig IPV6
+- tristate "The IPv6 protocol"
+- default m
++ bool "The IPv6 protocol"
++ default n
+ ---help---
+ This is complemental support for the IP version 6.
+ You will still be able to do traditional IPv4 networking as well.
+diff -NurpP --minimal linux-2.6.32.59/net/ipv6/addrconf.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/addrconf.c
+--- linux-2.6.32.59/net/ipv6/addrconf.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/addrconf.c 2011-06-10 13:03:02.000000000 +0200
@@ -86,6 +86,8 @@
#include <linux/proc_fs.h>
if ((idev = in6_dev_get(dev)) == NULL)
goto cont;
err = inet6_fill_ifinfo(skb, idev, NETLINK_CB(cb->skb).pid,
-diff -NurpP --minimal linux-2.6.32.6/net/ipv6/af_inet6.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/af_inet6.c
---- linux-2.6.32.6/net/ipv6/af_inet6.c 2009-12-03 20:03:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/af_inet6.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv6/af_inet6.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/af_inet6.c
+--- linux-2.6.32.59/net/ipv6/af_inet6.c 2009-12-03 20:03:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/af_inet6.c 2011-06-10 13:03:02.000000000 +0200
@@ -41,6 +41,8 @@
#include <linux/netdevice.h>
#include <linux/icmpv6.h>
if (ipv6_addr_any(&np->rcv_saddr))
ipv6_addr_copy(&sin->sin6_addr, &np->saddr);
else
-diff -NurpP --minimal linux-2.6.32.6/net/ipv6/fib6_rules.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/fib6_rules.c
---- linux-2.6.32.6/net/ipv6/fib6_rules.c 2009-09-10 15:26:30.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/fib6_rules.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv6/fib6_rules.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/fib6_rules.c
+--- linux-2.6.32.59/net/ipv6/fib6_rules.c 2009-09-10 15:26:30.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/fib6_rules.c 2011-06-10 13:03:02.000000000 +0200
@@ -96,7 +96,7 @@ static int fib6_rule_action(struct fib_r
if (ipv6_dev_get_saddr(net,
ip6_dst_idev(&rt->u.dst)->dev,
goto again;
if (!ipv6_prefix_equal(&saddr, &r->src.addr,
r->src.plen))
-diff -NurpP --minimal linux-2.6.32.6/net/ipv6/inet6_hashtables.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/inet6_hashtables.c
---- linux-2.6.32.6/net/ipv6/inet6_hashtables.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/inet6_hashtables.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv6/inet6_hashtables.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/inet6_hashtables.c
+--- linux-2.6.32.59/net/ipv6/inet6_hashtables.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/inet6_hashtables.c 2011-11-17 12:18:26.000000000 +0100
@@ -16,6 +16,7 @@
#include <linux/module.h>
#include <net/inet_connection_sock.h>
#include <net/inet_hashtables.h>
-@@ -76,7 +77,6 @@ struct sock *__inet6_lookup_established(
+@@ -77,7 +78,6 @@ struct sock *__inet6_lookup_established(
unsigned int slot = hash & (hashinfo->ehash_size - 1);
struct inet_ehash_bucket *head = &hashinfo->ehash[slot];
rcu_read_lock();
begin:
sk_nulls_for_each_rcu(sk, node, &head->chain) {
-@@ -88,7 +88,7 @@ begin:
+@@ -89,7 +89,7 @@ begin:
sock_put(sk);
goto begin;
}
}
}
if (get_nulls_value(node) != slot)
-@@ -134,6 +134,9 @@ static int inline compute_score(struct s
+@@ -135,6 +135,9 @@ static int inline compute_score(struct s
if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
return -1;
score++;
}
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
-diff -NurpP --minimal linux-2.6.32.6/net/ipv6/ip6_output.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/ip6_output.c
---- linux-2.6.32.6/net/ipv6/ip6_output.c 2009-12-03 20:03:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/ip6_output.c 2009-12-03 20:04:56.000000000 +0100
-@@ -934,7 +934,7 @@ static int ip6_dst_lookup_tail(struct so
+diff -NurpP --minimal linux-2.6.32.59/net/ipv6/ip6_output.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/ip6_output.c
+--- linux-2.6.32.59/net/ipv6/ip6_output.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/ip6_output.c 2011-11-17 12:18:26.000000000 +0100
+@@ -942,7 +942,7 @@ static int ip6_dst_lookup_tail(struct so
err = ipv6_dev_get_saddr(net, ip6_dst_idev(*dst)->dev,
&fl->fl6_dst,
sk ? inet6_sk(sk)->srcprefs : 0,
if (err)
goto out_err_release;
}
-diff -NurpP --minimal linux-2.6.32.6/net/ipv6/Kconfig linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/Kconfig
---- linux-2.6.32.6/net/ipv6/Kconfig 2009-09-10 15:26:30.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/Kconfig 2009-12-03 20:04:56.000000000 +0100
-@@ -4,8 +4,8 @@
-
- # IPv6 as module will cause a CRASH if you try to unload it
- menuconfig IPV6
-- tristate "The IPv6 protocol"
-- default m
-+ bool "The IPv6 protocol"
-+ default n
- ---help---
- This is complemental support for the IP version 6.
- You will still be able to do traditional IPv4 networking as well.
-diff -NurpP --minimal linux-2.6.32.6/net/ipv6/ndisc.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/ndisc.c
---- linux-2.6.32.6/net/ipv6/ndisc.c 2009-12-03 20:03:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/ndisc.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv6/ndisc.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/ndisc.c
+--- linux-2.6.32.59/net/ipv6/ndisc.c 2009-12-03 20:03:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/ndisc.c 2011-06-10 13:03:02.000000000 +0200
@@ -589,7 +589,7 @@ static void ndisc_send_na(struct net_dev
} else {
if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
return;
src_addr = &tmpaddr;
}
-diff -NurpP --minimal linux-2.6.32.6/net/ipv6/raw.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/raw.c
---- linux-2.6.32.6/net/ipv6/raw.c 2009-12-03 20:03:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/raw.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv6/raw.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/raw.c
+--- linux-2.6.32.59/net/ipv6/raw.c 2009-12-03 20:03:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/raw.c 2011-06-10 13:03:02.000000000 +0200
@@ -29,6 +29,7 @@
#include <linux/icmpv6.h>
#include <linux/netfilter.h>
/* ipv4 addr of the socket is invalid. Only the
* unspecified and mapped address have a v4 equivalent.
*/
-diff -NurpP --minimal linux-2.6.32.6/net/ipv6/route.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/route.c
---- linux-2.6.32.6/net/ipv6/route.c 2009-12-03 20:03:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/route.c 2009-12-03 20:04:56.000000000 +0100
-@@ -2257,7 +2257,8 @@ static int rt6_fill_node(struct net *net
+diff -NurpP --minimal linux-2.6.32.59/net/ipv6/route.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/route.c
+--- linux-2.6.32.59/net/ipv6/route.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/route.c 2011-06-10 13:03:02.000000000 +0200
+@@ -2277,7 +2277,8 @@ static int rt6_fill_node(struct net *net
struct inet6_dev *idev = ip6_dst_idev(&rt->u.dst);
struct in6_addr saddr_buf;
if (ipv6_dev_get_saddr(net, idev ? idev->dev : NULL,
NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
}
-diff -NurpP --minimal linux-2.6.32.6/net/ipv6/tcp_ipv6.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/tcp_ipv6.c
---- linux-2.6.32.6/net/ipv6/tcp_ipv6.c 2009-12-03 20:03:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/tcp_ipv6.c 2009-12-03 20:04:56.000000000 +0100
-@@ -68,6 +68,7 @@
+diff -NurpP --minimal linux-2.6.32.59/net/ipv6/tcp_ipv6.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/tcp_ipv6.c
+--- linux-2.6.32.59/net/ipv6/tcp_ipv6.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/tcp_ipv6.c 2011-11-17 12:18:26.000000000 +0100
+@@ -69,6 +69,7 @@
#include <linux/crypto.h>
#include <linux/scatterlist.h>
static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb);
static void tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
-@@ -156,8 +157,15 @@ static int tcp_v6_connect(struct sock *s
+@@ -157,8 +158,15 @@ static int tcp_v6_connect(struct sock *s
* connect() to INADDR_ANY means loopback (BSD'ism).
*/
addr_type = ipv6_addr_type(&usin->sin6_addr);
-diff -NurpP --minimal linux-2.6.32.6/net/ipv6/udp.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/udp.c
---- linux-2.6.32.6/net/ipv6/udp.c 2009-12-03 20:03:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/udp.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv6/udp.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/udp.c
+--- linux-2.6.32.59/net/ipv6/udp.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/udp.c 2012-01-10 09:18:12.000000000 +0100
@@ -47,6 +47,7 @@
#include <linux/proc_fs.h>
}
if (!ipv6_addr_any(&np->daddr)) {
if (!ipv6_addr_equal(&np->daddr, saddr))
-diff -NurpP --minimal linux-2.6.32.6/net/ipv6/xfrm6_policy.c linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/xfrm6_policy.c
---- linux-2.6.32.6/net/ipv6/xfrm6_policy.c 2009-12-03 20:03:00.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/ipv6/xfrm6_policy.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/ipv6/xfrm6_policy.c linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/xfrm6_policy.c
+--- linux-2.6.32.59/net/ipv6/xfrm6_policy.c 2009-12-03 20:03:00.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/ipv6/xfrm6_policy.c 2011-06-10 13:03:02.000000000 +0200
@@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n
dev = ip6_dst_idev(dst)->dev;
ipv6_dev_get_saddr(dev_net(dev), dev,
dst_release(dst);
return 0;
}
-diff -NurpP --minimal linux-2.6.32.6/net/netlink/af_netlink.c linux-2.6.32.6-vs2.3.0.36.28/net/netlink/af_netlink.c
---- linux-2.6.32.6/net/netlink/af_netlink.c 2009-12-03 20:03:01.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/netlink/af_netlink.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/netlink/af_netlink.c linux-2.6.32.59-vs2.3.0.36.29.9/net/netlink/af_netlink.c
+--- linux-2.6.32.59/net/netlink/af_netlink.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/netlink/af_netlink.c 2011-06-10 13:03:02.000000000 +0200
@@ -55,6 +55,9 @@
#include <linux/types.h>
#include <linux/audit.h>
#include <net/net_namespace.h>
#include <net/sock.h>
-@@ -1899,6 +1902,8 @@ static struct sock *netlink_seq_socket_i
+@@ -1885,6 +1888,8 @@ static struct sock *netlink_seq_socket_i
sk_for_each(s, node, &hash->table[j]) {
if (sock_net(s) != seq_file_net(seq))
continue;
if (off == pos) {
iter->link = i;
iter->hash_idx = j;
-@@ -1933,7 +1938,8 @@ static void *netlink_seq_next(struct seq
+@@ -1919,7 +1924,8 @@ static void *netlink_seq_next(struct seq
s = v;
do {
s = sk_next(s);
if (s)
return s;
-@@ -1945,7 +1951,8 @@ static void *netlink_seq_next(struct seq
+@@ -1931,7 +1937,8 @@ static void *netlink_seq_next(struct seq
for (; j <= hash->mask; j++) {
s = sk_head(&hash->table[j]);
s = sk_next(s);
if (s) {
iter->link = i;
-diff -NurpP --minimal linux-2.6.32.6/net/sctp/ipv6.c linux-2.6.32.6-vs2.3.0.36.28/net/sctp/ipv6.c
---- linux-2.6.32.6/net/sctp/ipv6.c 2009-12-03 20:03:01.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/sctp/ipv6.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/sctp/ipv6.c linux-2.6.32.59-vs2.3.0.36.29.9/net/sctp/ipv6.c
+--- linux-2.6.32.59/net/sctp/ipv6.c 2009-12-03 20:03:01.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/sctp/ipv6.c 2011-06-10 13:03:02.000000000 +0200
@@ -316,7 +316,8 @@ static void sctp_v6_get_saddr(struct sct
dst ? ip6_dst_idev(dst)->dev : NULL,
&daddr->v6.sin6_addr,
SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: %pI6\n",
&saddr->v6.sin6_addr);
return;
-diff -NurpP --minimal linux-2.6.32.6/net/socket.c linux-2.6.32.6-vs2.3.0.36.28/net/socket.c
---- linux-2.6.32.6/net/socket.c 2009-12-03 20:03:01.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/socket.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/socket.c linux-2.6.32.59-vs2.3.0.36.29.9/net/socket.c
+--- linux-2.6.32.59/net/socket.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/socket.c 2011-06-10 13:03:02.000000000 +0200
@@ -96,6 +96,10 @@
#include <net/sock.h>
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-2.6.32.6/net/sunrpc/auth.c linux-2.6.32.6-vs2.3.0.36.28/net/sunrpc/auth.c
---- linux-2.6.32.6/net/sunrpc/auth.c 2009-12-03 20:03:01.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/sunrpc/auth.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/sunrpc/auth.c linux-2.6.32.59-vs2.3.0.36.29.9/net/sunrpc/auth.c
+--- linux-2.6.32.59/net/sunrpc/auth.c 2009-12-03 20:03:01.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/sunrpc/auth.c 2011-06-10 13:03:02.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/hash.h>
#include <linux/sunrpc/clnt.h>
};
struct rpc_cred *ret;
-diff -NurpP --minimal linux-2.6.32.6/net/sunrpc/auth_unix.c linux-2.6.32.6-vs2.3.0.36.28/net/sunrpc/auth_unix.c
---- linux-2.6.32.6/net/sunrpc/auth_unix.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/sunrpc/auth_unix.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/sunrpc/auth_unix.c linux-2.6.32.59-vs2.3.0.36.29.9/net/sunrpc/auth_unix.c
+--- linux-2.6.32.59/net/sunrpc/auth_unix.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/sunrpc/auth_unix.c 2012-01-10 09:18:12.000000000 +0100
@@ -11,12 +11,14 @@
#include <linux/module.h>
#include <linux/sunrpc/clnt.h>
return 0;
if (acred->group_info != NULL)
-@@ -142,7 +147,7 @@ unx_marshal(struct rpc_task *task, __be3
+@@ -145,7 +150,7 @@ unx_marshal(struct rpc_task *task, __be3
struct rpc_clnt *clnt = task->tk_client;
struct unx_cred *cred = container_of(task->tk_msg.rpc_cred, struct unx_cred, uc_base);
__be32 *base, *hold;
*p++ = htonl(RPC_AUTH_UNIX);
base = p++;
-@@ -152,9 +157,12 @@ unx_marshal(struct rpc_task *task, __be3
+@@ -155,9 +160,12 @@ unx_marshal(struct rpc_task *task, __be3
* Copy the UTS nodename captured when the client was created.
*/
p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen);
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.32.6/net/sunrpc/clnt.c linux-2.6.32.6-vs2.3.0.36.28/net/sunrpc/clnt.c
---- linux-2.6.32.6/net/sunrpc/clnt.c 2009-12-03 20:03:01.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/sunrpc/clnt.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/sunrpc/clnt.c linux-2.6.32.59-vs2.3.0.36.29.9/net/sunrpc/clnt.c
+--- linux-2.6.32.59/net/sunrpc/clnt.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/sunrpc/clnt.c 2011-11-17 12:18:26.000000000 +0100
@@ -33,6 +33,7 @@
#include <linux/utsname.h>
#include <linux/workqueue.h>
return clnt;
}
EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-2.6.32.6/net/unix/af_unix.c linux-2.6.32.6-vs2.3.0.36.28/net/unix/af_unix.c
---- linux-2.6.32.6/net/unix/af_unix.c 2009-12-03 20:03:01.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/unix/af_unix.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/net/unix/af_unix.c linux-2.6.32.59-vs2.3.0.36.29.9/net/unix/af_unix.c
+--- linux-2.6.32.59/net/unix/af_unix.c 2012-03-20 11:26:32.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/net/unix/af_unix.c 2011-06-10 13:03:02.000000000 +0200
@@ -114,6 +114,8 @@
#include <linux/mount.h>
#include <net/checksum.h>
if (u->addr->len == len &&
!memcmp(u->addr->name, sunname, len))
goto found;
-@@ -2114,6 +2118,8 @@ static struct sock *unix_seq_idx(struct
+@@ -2164,6 +2168,8 @@ static struct sock *unix_seq_idx(struct
for (s = first_unix_socket(&iter->i); s; s = next_unix_socket(&iter->i, s)) {
if (sock_net(s) != seq_file_net(seq))
continue;
if (off == pos)
return s;
++off;
-@@ -2138,7 +2144,8 @@ static void *unix_seq_next(struct seq_fi
+@@ -2188,7 +2194,8 @@ static void *unix_seq_next(struct seq_fi
sk = first_unix_socket(&iter->i);
else
sk = next_unix_socket(&iter->i, sk);
sk = next_unix_socket(&iter->i, sk);
return sk;
}
-diff -NurpP --minimal linux-2.6.32.6/net/x25/af_x25.c linux-2.6.32.6-vs2.3.0.36.28/net/x25/af_x25.c
---- linux-2.6.32.6/net/x25/af_x25.c 2009-12-03 20:03:01.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/net/x25/af_x25.c 2009-12-03 20:04:56.000000000 +0100
-@@ -519,7 +519,10 @@ static int x25_create(struct net *net, s
-
- x25 = x25_sk(sk);
-
-- sock_init_data(sock, sk);
-+ sk->sk_socket = sock;
-+ sk->sk_type = sock->type;
-+ sk->sk_sleep = &sock->wait;
-+ sock->sk = sk;
-
- x25_init_timers(sk);
-
-diff -NurpP --minimal linux-2.6.32.6/scripts/checksyscalls.sh linux-2.6.32.6-vs2.3.0.36.28/scripts/checksyscalls.sh
---- linux-2.6.32.6/scripts/checksyscalls.sh 2009-09-10 15:26:31.000000000 +0200
-+++ linux-2.6.32.6-vs2.3.0.36.28/scripts/checksyscalls.sh 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/scripts/checksyscalls.sh linux-2.6.32.59-vs2.3.0.36.29.9/scripts/checksyscalls.sh
+--- linux-2.6.32.59/scripts/checksyscalls.sh 2009-09-10 15:26:31.000000000 +0200
++++ linux-2.6.32.59-vs2.3.0.36.29.9/scripts/checksyscalls.sh 2011-06-10 13:03:02.000000000 +0200
@@ -194,7 +194,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
EOF
}
-diff -NurpP --minimal linux-2.6.32.6/security/commoncap.c linux-2.6.32.6-vs2.3.0.36.28/security/commoncap.c
---- linux-2.6.32.6/security/commoncap.c 2009-12-03 20:03:02.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/security/commoncap.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/security/commoncap.c linux-2.6.32.59-vs2.3.0.36.29.9/security/commoncap.c
+--- linux-2.6.32.59/security/commoncap.c 2009-12-03 20:03:02.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/security/commoncap.c 2011-06-10 13:03:02.000000000 +0200
@@ -27,6 +27,7 @@
#include <linux/sched.h>
#include <linux/prctl.h>
if (!strncmp(name, XATTR_SECURITY_PREFIX,
sizeof(XATTR_SECURITY_PREFIX) - 1) &&
- !capable(CAP_SYS_ADMIN))
++ !vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY))
+ return -EPERM;
+ return 0;
+ }
+@@ -644,7 +661,7 @@ int cap_inode_removexattr(struct dentry
+
+ if (!strncmp(name, XATTR_SECURITY_PREFIX,
+ sizeof(XATTR_SECURITY_PREFIX) - 1) &&
+- !capable(CAP_SYS_ADMIN))
+ !vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY))
return -EPERM;
return 0;
return -EPERM;
return 0;
}
-@@ -1014,3 +1032,4 @@ int cap_file_mmap(struct file *file, uns
- }
- return ret;
- }
-+
-diff -NurpP --minimal linux-2.6.32.6/security/selinux/hooks.c linux-2.6.32.6-vs2.3.0.36.28/security/selinux/hooks.c
---- linux-2.6.32.6/security/selinux/hooks.c 2009-12-03 20:03:02.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/security/selinux/hooks.c 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/security/selinux/hooks.c linux-2.6.32.59-vs2.3.0.36.29.9/security/selinux/hooks.c
+--- linux-2.6.32.59/security/selinux/hooks.c 2012-03-20 11:26:34.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/security/selinux/hooks.c 2011-06-10 13:03:02.000000000 +0200
@@ -64,7 +64,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>
#include <linux/parser.h>
#include <linux/nfs_mount.h>
#include <net/ipv6.h>
-diff -NurpP --minimal linux-2.6.32.6/security/selinux/include/av_permissions.h linux-2.6.32.6-vs2.3.0.36.28/security/selinux/include/av_permissions.h
---- linux-2.6.32.6/security/selinux/include/av_permissions.h 2009-12-03 20:03:02.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/security/selinux/include/av_permissions.h 2009-12-03 20:04:56.000000000 +0100
-@@ -565,6 +565,7 @@
- #define CAPABILITY__SETFCAP 0x80000000UL
- #define CAPABILITY2__MAC_OVERRIDE 0x00000001UL
- #define CAPABILITY2__MAC_ADMIN 0x00000002UL
-+#define CAPABILITY2__CONTEXT 0x00000004UL
- #define NETLINK_ROUTE_SOCKET__IOCTL 0x00000001UL
- #define NETLINK_ROUTE_SOCKET__READ 0x00000002UL
- #define NETLINK_ROUTE_SOCKET__WRITE 0x00000004UL
-diff -NurpP --minimal linux-2.6.32.6/security/selinux/include/av_perm_to_string.h linux-2.6.32.6-vs2.3.0.36.28/security/selinux/include/av_perm_to_string.h
---- linux-2.6.32.6/security/selinux/include/av_perm_to_string.h 2009-12-03 20:03:02.000000000 +0100
-+++ linux-2.6.32.6-vs2.3.0.36.28/security/selinux/include/av_perm_to_string.h 2009-12-03 20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.59/security/selinux/include/av_perm_to_string.h linux-2.6.32.59-vs2.3.0.36.29.9/security/selinux/include/av_perm_to_string.h
+--- linux-2.6.32.59/security/selinux/include/av_perm_to_string.h 2009-12-03 20:03:02.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/security/selinux/include/av_perm_to_string.h 2011-06-10 13:03:02.000000000 +0200
@@ -142,6 +142,7 @@
S_(SECCLASS_CAPABILITY, CAPABILITY__SETFCAP, "setfcap")
S_(SECCLASS_CAPABILITY2, CAPABILITY2__MAC_OVERRIDE, "mac_override")
S_(SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_READ, "nlmsg_read")
S_(SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_WRITE, "nlmsg_write")
S_(SECCLASS_NETLINK_FIREWALL_SOCKET, NETLINK_FIREWALL_SOCKET__NLMSG_READ, "nlmsg_read")
+diff -NurpP --minimal linux-2.6.32.59/security/selinux/include/av_permissions.h linux-2.6.32.59-vs2.3.0.36.29.9/security/selinux/include/av_permissions.h
+--- linux-2.6.32.59/security/selinux/include/av_permissions.h 2009-12-03 20:03:02.000000000 +0100
++++ linux-2.6.32.59-vs2.3.0.36.29.9/security/selinux/include/av_permissions.h 2011-06-10 13:03:02.000000000 +0200
+@@ -565,6 +565,7 @@
+ #define CAPABILITY__SETFCAP 0x80000000UL
+ #define CAPABILITY2__MAC_OVERRIDE 0x00000001UL
+ #define CAPABILITY2__MAC_ADMIN 0x00000002UL
++#define CAPABILITY2__CONTEXT 0x00000004UL
+ #define NETLINK_ROUTE_SOCKET__IOCTL 0x00000001UL
+ #define NETLINK_ROUTE_SOCKET__READ 0x00000002UL
+ #define NETLINK_ROUTE_SOCKET__WRITE 0x00000004UL