-diff -NurpP --minimal linux-2.6.29.1/arch/alpha/Kconfig linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/alpha/Kconfig
---- linux-2.6.29.1/arch/alpha/Kconfig 2009-03-24 14:18:07.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/alpha/Kconfig 2009-03-24 14:48:16.000000000 +0100
-@@ -666,6 +666,8 @@ config DUMMY_CONSOLE
+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.29.1/arch/alpha/kernel/entry.S linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/alpha/kernel/entry.S
---- linux-2.6.29.1/arch/alpha/kernel/entry.S 2009-03-24 14:18:07.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/alpha/kernel/entry.S 2009-03-24 14:48:16.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.29.1/arch/alpha/kernel/osf_sys.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/alpha/kernel/osf_sys.c
---- linux-2.6.29.1/arch/alpha/kernel/osf_sys.c 2009-03-24 14:18:07.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/alpha/kernel/osf_sys.c 2009-03-24 14:48:16.000000000 +0100
-@@ -877,7 +877,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
+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) {
struct timeval ktv;
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.29.1/arch/alpha/kernel/ptrace.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/alpha/kernel/ptrace.c
---- linux-2.6.29.1/arch/alpha/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/alpha/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100
-@@ -15,6 +15,7 @@
+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 <linux/signal.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.29.1/arch/alpha/kernel/systbls.S linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/alpha/kernel/systbls.S
---- linux-2.6.29.1/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/alpha/kernel/systbls.S 2009-03-24 14:48:16.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.29.1/arch/alpha/kernel/traps.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/alpha/kernel/traps.c
---- linux-2.6.29.1/arch/alpha/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/alpha/kernel/traps.c 2009-02-22 22:54:24.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.29.1/arch/alpha/mm/fault.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/alpha/mm/fault.c
---- linux-2.6.29.1/arch/alpha/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/alpha/mm/fault.c 2009-02-22 22:54:24.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.29.1/arch/arm/Kconfig linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/arm/Kconfig
---- linux-2.6.29.1/arch/arm/Kconfig 2009-03-24 14:18:08.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/arm/Kconfig 2009-03-24 14:48:16.000000000 +0100
-@@ -1333,6 +1333,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.29.1/arch/arm/kernel/calls.S linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/arm/kernel/calls.S
---- linux-2.6.29.1/arch/arm/kernel/calls.S 2009-03-24 14:18:09.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/arm/kernel/calls.S 2009-02-22 22:54:24.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.29.1/arch/arm/kernel/process.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/arm/kernel/process.c
---- linux-2.6.29.1/arch/arm/kernel/process.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/arm/kernel/process.c 2009-02-22 22:54:24.000000000 +0100
-@@ -262,7 +262,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.29.1/arch/arm/kernel/traps.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/arm/kernel/traps.c
---- linux-2.6.29.1/arch/arm/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/arm/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
-@@ -214,8 +214,8 @@ static void __die(const char *str, int e
- str, err, ++die_counter);
+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();
__show_regs(regs);
-- printk("Process %s (pid: %d, stack limit = 0x%p)\n",
-- tsk->comm, task_pid_nr(tsk), thread + 1);
-+ printk("Process %s (pid: %d:#%u, stack limit = 0x%p)\n",
-+ tsk->comm, task_pid_nr(tsk), tsk->xid, thread + 1);
+- printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n",
+- TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), thread + 1);
++ printk(KERN_EMERG "Process %.*s (pid: %d:#%u, stack limit = 0x%p)\n",
++ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, thread + 1);
if (!user_mode(regs) || in_interrupt()) {
- dump_mem("Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.29.1/arch/arm/mm/fault.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/arm/mm/fault.c
---- linux-2.6.29.1/arch/arm/mm/fault.c 2009-03-24 14:18:17.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/arm/mm/fault.c 2009-03-24 14:48:17.000000000 +0100
-@@ -294,7 +294,8 @@ do_page_fault(unsigned long addr, unsign
- * happened to us that made us unable to handle
- * the page fault gracefully.
- */
-- printk("VM: killing process %s\n", tsk->comm);
-+ printk("VM: killing process %s(%d:#%u)\n",
-+ tsk->comm, task_pid_nr(tsk), tsk->xid);
- do_group_exit(SIGKILL);
- return 0;
+ dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
+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;
}
-diff -NurpP --minimal linux-2.6.29.1/arch/cris/Kconfig linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/cris/Kconfig
---- linux-2.6.29.1/arch/cris/Kconfig 2009-03-24 14:18:23.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/cris/Kconfig 2009-03-24 14:48:19.000000000 +0100
+- printk("VM: Killing process %s\n", tsk->comm);
++ printk("VM: Killing process %s(%d:#%u)\n",
++ tsk->comm, task_pid_nr(tsk), tsk->xid);
+ if (user_mode(regs))
+ do_group_exit(SIGKILL);
+ goto no_context;
+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.29.1/arch/frv/kernel/kernel_thread.S linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/frv/kernel/kernel_thread.S
---- linux-2.6.29.1/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/frv/kernel/kernel_thread.S 2009-02-22 22:54:24.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:
+ up_read(&mm->mmap_sem);
+- printk("VM: killing process %s\n", tsk->comm);
++ printk("VM: killing process %s(%d:#%u)\n",
++ tsk->comm, task_pid_nr(tsk), tsk->xid);
+ if (user_mode(regs))
+ do_exit(SIGKILL);
+ goto no_context;
+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.29.1/arch/h8300/Kconfig linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/h8300/Kconfig
---- linux-2.6.29.1/arch/h8300/Kconfig 2009-03-24 14:18:24.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/h8300/Kconfig 2009-03-24 14:48:19.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:
+ up_read(&mm->mmap_sem);
+- printk("VM: killing process %s\n", current->comm);
++ printk("VM: killing process %s(%d:#%u)\n",
++ current->comm, task_pid_nr(current), current->xid);
+ if (user_mode(__frame))
+ do_group_exit(SIGKILL);
+ goto no_context;
+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.29.1/arch/ia64/ia32/ia32_entry.S linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.29.1/arch/ia64/ia32/ia32_entry.S 2009-03-24 14:18:24.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/ia64/ia32/ia32_entry.S 2009-02-22 22:54:24.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.29.1/arch/ia64/Kconfig linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/ia64/Kconfig
---- linux-2.6.29.1/arch/ia64/Kconfig 2009-03-24 14:18:24.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/ia64/Kconfig 2009-03-24 14:48:19.000000000 +0100
-@@ -672,6 +672,8 @@ source "fs/Kconfig"
-
- source "arch/ia64/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
+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 <linux/swap.h>
++#include <linux/vs_memory.h>
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.29.1/arch/ia64/kernel/entry.S linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/ia64/kernel/entry.S
---- linux-2.6.29.1/arch/ia64/kernel/entry.S 2009-03-24 14:18:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/ia64/kernel/entry.S 2009-02-22 22:54:24.000000000 +0100
-@@ -1653,7 +1653,7 @@ sys_call_table:
+ #include <asm/pgalloc.h>
+ #include <asm/processor.h>
+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_kexec_load
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.29.1/arch/ia64/kernel/perfmon.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/ia64/kernel/perfmon.c
---- linux-2.6.29.1/arch/ia64/kernel/perfmon.c 2009-03-24 14:18:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/ia64/kernel/perfmon.c 2009-03-24 14:48:19.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.29.1/arch/ia64/kernel/process.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/ia64/kernel/process.c
---- linux-2.6.29.1/arch/ia64/kernel/process.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/ia64/kernel/process.c 2009-02-22 22:54:24.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.29.1/arch/ia64/kernel/ptrace.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/ia64/kernel/ptrace.c
---- linux-2.6.29.1/arch/ia64/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/ia64/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100
-@@ -23,6 +23,7 @@
+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 <linux/tracehook.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.29.1/arch/ia64/kernel/traps.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/ia64/kernel/traps.c
---- linux-2.6.29.1/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/ia64/kernel/traps.c 2009-02-22 22:54:24.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.29.1/arch/ia64/mm/fault.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/ia64/mm/fault.c
---- linux-2.6.29.1/arch/ia64/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/ia64/mm/fault.c 2009-02-22 22:54:24.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>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.29.1/arch/m32r/kernel/traps.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/m32r/kernel/traps.c
---- linux-2.6.29.1/arch/m32r/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/m32r/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
+@@ -281,7 +282,8 @@ ia64_do_page_fault (unsigned long addres
+ down_read(&mm->mmap_sem);
+ goto survive;
+ }
+- printk(KERN_CRIT "VM: killing process %s\n", current->comm);
++ printk(KERN_CRIT "VM: killing process %s(%d:#%u)\n",
++ current->comm, task_pid_nr(current), current->xid);
+ if (user_mode(regs))
+ do_group_exit(SIGKILL);
+ goto no_context;
+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.29.1/arch/m68k/Kconfig linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/m68k/Kconfig
---- linux-2.6.29.1/arch/m68k/Kconfig 2009-03-24 14:18:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/m68k/Kconfig 2009-03-24 14:48:20.000000000 +0100
-@@ -616,6 +616,8 @@ source "fs/Kconfig"
+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;
+ }
+- printk("VM: killing process %s\n", tsk->comm);
++ printk("VM: killing process %s(%d:#%u)\n",
++ tsk->comm, task_pid_nr(tsk), tsk->xid);
+ if (error_code & ACE_USERMODE)
+ do_group_exit(SIGKILL);
+ goto no_context;
+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.29.1/arch/m68k/kernel/ptrace.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/m68k/kernel/ptrace.c
---- linux-2.6.29.1/arch/m68k/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/m68k/kernel/ptrace.c 2009-02-22 22:54:24.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.29.1/arch/m68k/kernel/traps.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/m68k/kernel/traps.c
---- linux-2.6.29.1/arch/m68k/kernel/traps.c 2009-03-24 14:18:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/m68k/kernel/traps.c 2009-03-24 14:48:20.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.29.1/arch/m68knommu/Kconfig linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/m68knommu/Kconfig
---- linux-2.6.29.1/arch/m68knommu/Kconfig 2009-03-24 14:18:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/m68knommu/Kconfig 2009-03-24 14:48:20.000000000 +0100
-@@ -720,6 +720,8 @@ source "fs/Kconfig"
+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;
+ }
+
+- printk("VM: killing process %s\n", current->comm);
++ printk("VM: killing process %s(%d:#%u)\n",
++ current->comm, task_pid_nr(current), current->xid);
+ if (user_mode(regs))
+ do_group_exit(SIGKILL);
+
+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.29.1/arch/m68knommu/kernel/traps.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/m68knommu/kernel/traps.c
---- linux-2.6.29.1/arch/m68knommu/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/m68knommu/kernel/traps.c 2009-02-22 22:54:24.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.29.1/arch/mips/Kconfig linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/mips/Kconfig
---- linux-2.6.29.1/arch/mips/Kconfig 2009-03-24 14:18:29.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/mips/Kconfig 2009-03-24 14:48:21.000000000 +0100
-@@ -2142,6 +2142,8 @@ source "fs/Kconfig"
+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;
+ }
+ up_read(&mm->mmap_sem);
+- printk(KERN_WARNING "VM: killing process %s\n", current->comm);
++ printk(KERN_WARNING "VM: killing process %s(%d:#%u)\n",
++ current->comm, task_pid_nr(current), current->xid);
+ if (user_mode(regs))
+ do_exit(SIGKILL);
+ bad_page_fault(regs, address, SIGKILL);
+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.29.1/arch/mips/kernel/ptrace.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/mips/kernel/ptrace.c
---- linux-2.6.29.1/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/mips/kernel/ptrace.c 2009-02-22 22:54:24.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.29.1/arch/mips/kernel/scall32-o32.S linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/mips/kernel/scall32-o32.S
---- linux-2.6.29.1/arch/mips/kernel/scall32-o32.S 2009-03-24 14:18:31.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/mips/kernel/scall32-o32.S 2009-03-24 14:48:21.000000000 +0100
-@@ -597,7 +597,7 @@ einval: li v0, -ENOSYS
+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_mq_getsetattr 3
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-2.6.29.1/arch/mips/kernel/scall64-64.S linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/mips/kernel/scall64-64.S
---- linux-2.6.29.1/arch/mips/kernel/scall64-64.S 2009-03-24 14:18:31.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/mips/kernel/scall64-64.S 2009-03-24 14:48:21.000000000 +0100
-@@ -434,7 +434,7 @@ sys_call_table:
+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_mq_getsetattr /* 5235 */
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.29.1/arch/mips/kernel/scall64-n32.S linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/mips/kernel/scall64-n32.S
---- linux-2.6.29.1/arch/mips/kernel/scall64-n32.S 2009-03-24 14:18:31.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/mips/kernel/scall64-n32.S 2009-03-24 14:48:21.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.29.1/arch/mips/kernel/scall64-o32.S linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/mips/kernel/scall64-o32.S
---- linux-2.6.29.1/arch/mips/kernel/scall64-o32.S 2009-03-24 14:18:31.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/mips/kernel/scall64-o32.S 2009-03-24 14:59:48.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.29.1/arch/mips/kernel/traps.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/mips/kernel/traps.c
---- linux-2.6.29.1/arch/mips/kernel/traps.c 2009-03-24 14:18:31.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/mips/kernel/traps.c 2009-03-24 14:48:21.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.29.1/arch/parisc/Kconfig linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/parisc/Kconfig
---- linux-2.6.29.1/arch/parisc/Kconfig 2009-03-24 14:18:32.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/parisc/Kconfig 2009-03-24 14:48:21.000000000 +0100
-@@ -281,6 +281,8 @@ source "fs/Kconfig"
+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);
+ monitor_signal(regs);
+- printk(KERN_ALERT "VM: killing process %s\n", tsk->comm);
++ printk(KERN_ALERT "VM: killing process %s(%d:#%u)\n",
++ tsk->comm, task_pid_nr(tsk), tsk->xid);
+ if ((fault_code & MMUFCR_xFC_ACCESS) == MMUFCR_xFC_ACCESS_USR)
+ do_exit(SIGKILL);
+ goto no_context;
+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.29.1/arch/parisc/kernel/syscall_table.S linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/parisc/kernel/syscall_table.S
---- linux-2.6.29.1/arch/parisc/kernel/syscall_table.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/parisc/kernel/syscall_table.S 2009-02-22 22:54:24.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.29.1/arch/parisc/kernel/traps.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/parisc/kernel/traps.c
---- linux-2.6.29.1/arch/parisc/kernel/traps.c 2009-03-24 14:18:32.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/parisc/kernel/traps.c 2009-03-24 14:48:21.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 */
#ifdef PRINT_USER_FAULTS
/* XXX for debugging only */
show_regs(regs);
-@@ -269,8 +270,8 @@ KERN_CRIT " || |
+@@ -270,8 +271,8 @@ void die_if_kernel(char *str, struct pt_
pdc_console_restart();
if (err)
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-2.6.29.1/arch/parisc/mm/fault.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/parisc/mm/fault.c
---- linux-2.6.29.1/arch/parisc/mm/fault.c 2009-03-24 14:18:33.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/parisc/mm/fault.c 2009-03-24 14:48:21.000000000 +0100
-@@ -238,8 +238,9 @@ bad_area:
+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
printk(KERN_DEBUG "\n");
if (vma) {
printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
vma->vm_start, vma->vm_end);
-@@ -265,7 +266,8 @@ no_context:
+@@ -264,7 +265,8 @@ no_context:
out_of_memory:
up_read(&mm->mmap_sem);
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.29.1/arch/powerpc/Kconfig linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/powerpc/Kconfig
---- linux-2.6.29.1/arch/powerpc/Kconfig 2009-03-24 14:18:33.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/powerpc/Kconfig 2009-03-24 14:48:22.000000000 +0100
-@@ -882,6 +882,8 @@ source "lib/Kconfig"
+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.29.1/arch/powerpc/kernel/irq.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/powerpc/kernel/irq.c
---- linux-2.6.29.1/arch/powerpc/kernel/irq.c 2009-03-24 14:18:35.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/powerpc/kernel/irq.c 2009-03-24 14:48:22.000000000 +0100
-@@ -53,6 +53,7 @@
- #include <linux/bootmem.h>
- #include <linux/pci.h>
- #include <linux/debugfs.h>
-+#include <linux/vs_context.h>
-
- #include <asm/uaccess.h>
- #include <asm/system.h>
-diff -NurpP --minimal linux-2.6.29.1/arch/powerpc/kernel/process.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/powerpc/kernel/process.c
---- linux-2.6.29.1/arch/powerpc/kernel/process.c 2009-03-24 14:18:35.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/powerpc/kernel/process.c 2009-03-24 14:48:22.000000000 +0100
-@@ -516,8 +516,9 @@ void show_regs(struct pt_regs * regs)
+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);
#endif
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-2.6.29.1/arch/powerpc/kernel/traps.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/powerpc/kernel/traps.c
---- linux-2.6.29.1/arch/powerpc/kernel/traps.c 2009-03-24 14:18:35.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/powerpc/kernel/traps.c 2009-03-24 14:48:22.000000000 +0100
-@@ -940,8 +940,9 @@ void nonrecoverable_exception(struct pt_
+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.29.1/arch/powerpc/kernel/vdso.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/powerpc/kernel/vdso.c
---- linux-2.6.29.1/arch/powerpc/kernel/vdso.c 2009-03-24 14:18:35.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/powerpc/kernel/vdso.c 2009-03-24 14:48:22.000000000 +0100
-@@ -22,6 +22,7 @@
+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 <linux/lmb.h>
#include <asm/pgtable.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.29.1/arch/powerpc/mm/fault.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/powerpc/mm/fault.c
---- linux-2.6.29.1/arch/powerpc/mm/fault.c 2009-03-24 14:18:36.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/powerpc/mm/fault.c 2009-03-24 14:48:22.000000000 +0100
-@@ -362,7 +362,8 @@ out_of_memory:
+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.29.1/arch/s390/Kconfig linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/s390/Kconfig
---- linux-2.6.29.1/arch/s390/Kconfig 2009-03-24 14:18:38.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/s390/Kconfig 2009-03-24 14:48:22.000000000 +0100
-@@ -586,6 +586,8 @@ source "fs/Kconfig"
+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"
source "arch/s390/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.29.1/arch/s390/kernel/ptrace.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/s390/kernel/ptrace.c
---- linux-2.6.29.1/arch/s390/kernel/ptrace.c 2009-03-24 14:18:40.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/s390/kernel/ptrace.c 2009-03-24 14:48:22.000000000 +0100
-@@ -36,6 +36,7 @@
- #include <linux/elf.h>
- #include <linux/regset.h>
- #include <linux/tracehook.h>
-+#include <linux/vs_base.h>
+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 <asm/segment.h>
- #include <asm/page.h>
-diff -NurpP --minimal linux-2.6.29.1/arch/s390/kernel/syscalls.S linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/s390/kernel/syscalls.S
---- linux-2.6.29.1/arch/s390/kernel/syscalls.S 2009-03-24 14:18:40.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/s390/kernel/syscalls.S 2009-03-24 14:48:22.000000000 +0100
-@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
+ #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.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_clock_nanosleep (__NR_timer_create+8)
+-/* Number 263 is reserved for vserver */
++#define __NR_vserver 263
+ #define __NR_statfs64 265
+ #define __NR_fstatfs64 266
+ #define __NR_remap_file_pages 267
+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/segment.h>
+ #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_clock_nanosleep,sys_clock_nanosleep,sys32_clock_nanosleep_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.29.1/arch/s390/mm/fault.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/s390/mm/fault.c
---- linux-2.6.29.1/arch/s390/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/s390/mm/fault.c 2009-02-22 22:54:24.000000000 +0100
-@@ -216,7 +216,8 @@ static int do_out_of_memory(struct pt_re
+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);
- return 1;
+ goto survive;
}
-- printk("VM: killing process %s\n", tsk->comm);
+- printk("VM: killing process %s\n", current->comm);
+ printk("VM: killing process %s(%d:#%u)\n",
-+ tsk->comm, tsk->pid, tsk->xid);
- if (regs->psw.mask & PSW_MASK_PSTATE)
- do_group_exit(SIGKILL);
- do_no_context(regs, error_code, address);
-diff -NurpP --minimal linux-2.6.29.1/arch/sh/Kconfig linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/sh/Kconfig
---- linux-2.6.29.1/arch/sh/Kconfig 2009-03-24 14:18:40.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/sh/Kconfig 2009-03-24 14:48:22.000000000 +0100
-@@ -694,6 +694,8 @@ source "fs/Kconfig"
++ current->comm, task_pid_nr(current), current->xid);
+ return ret;
+
+ out_sigbus:
+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.29.1/arch/sh/kernel/irq.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/sh/kernel/irq.c
---- linux-2.6.29.1/arch/sh/kernel/irq.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/sh/kernel/irq.c 2009-02-22 22:54:24.000000000 +0100
-@@ -11,6 +11,7 @@
- #include <linux/module.h>
+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 <linux/vs_context.h>
+ #include <linux/ftrace.h>
++// #include <linux/vs_context.h>
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.29.1/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/sh/kernel/vsyscall/vsyscall.c
---- linux-2.6.29.1/arch/sh/kernel/vsyscall/vsyscall.c 2009-03-24 14:18:42.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/sh/kernel/vsyscall/vsyscall.c 2009-03-24 14:48:22.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.29.1/arch/sparc/include/asm/tlb_64.h linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/sparc/include/asm/tlb_64.h
---- linux-2.6.29.1/arch/sparc/include/asm/tlb_64.h 2009-04-15 22:53:11.000000000 +0200
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/sparc/include/asm/tlb_64.h 2009-04-15 22:58:30.000000000 +0200
+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;
+ }
+- printk("VM: killing process %s\n", tsk->comm);
++ printk("VM: killing process %s(%d:#%u)\n",
++ tsk->comm, task_pid_nr(tsk), tsk->xid);
+ if (user_mode(regs))
+ do_group_exit(SIGKILL);
+ goto no_context;
+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;
+ }
+- printk("VM: killing process %s\n", tsk->comm);
++ printk("VM: killing process %s(%d:#%u)\n",
++ tsk->comm, task_pid_nr(tsk), tsk->xid);
+ if (user_mode(regs))
+ do_group_exit(SIGKILL);
+ goto no_context;
+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.29.1/arch/sparc/include/asm/unistd.h linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/sparc/include/asm/unistd.h
---- linux-2.6.29.1/arch/sparc/include/asm/unistd.h 2009-03-24 14:18:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/sparc/include/asm/unistd.h 2009-04-08 15:52:53.000000000 +0200
+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.29.1/arch/sparc/Kconfig linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/sparc/Kconfig
---- linux-2.6.29.1/arch/sparc/Kconfig 2009-03-24 14:18:43.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/sparc/Kconfig 2009-03-24 14:48:22.000000000 +0100
-@@ -522,6 +522,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.29.1/arch/sparc/kernel/systbls_32.S linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/sparc/kernel/systbls_32.S
---- linux-2.6.29.1/arch/sparc/kernel/systbls_32.S 2009-03-24 14:18:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/sparc/kernel/systbls_32.S 2009-04-08 15:57:59.000000000 +0200
+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 sparc_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
+ /*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
/*260*/ .long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
-/*265*/ .long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_io_setup, sys_io_destroy
/*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.29.1/arch/sparc/kernel/systbls_64.S linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/sparc/kernel/systbls_64.S
---- linux-2.6.29.1/arch/sparc/kernel/systbls_64.S 2009-03-24 14:18:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/sparc/kernel/systbls_64.S 2009-04-08 15:56:23.000000000 +0200
+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 sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink
.word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
/*280*/ .word sys32_tee, sys_add_key, sys_request_key, sys_keyctl, compat_sys_openat
-@@ -145,7 +145,7 @@ sys_call_table:
+@@ -146,7 +146,7 @@ sys_call_table:
/*250*/ .word sys_64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
.word sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
/*260*/ .word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
/*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.29.1/arch/x86/ia32/ia32entry.S linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/x86/ia32/ia32entry.S
---- linux-2.6.29.1/arch/x86/ia32/ia32entry.S 2009-03-24 14:18:48.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/x86/ia32/ia32entry.S 2009-03-22 23:29:11.000000000 +0100
-@@ -768,7 +768,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.29.1/arch/x86/include/asm/unistd_64.h linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/x86/include/asm/unistd_64.h
---- linux-2.6.29.1/arch/x86/include/asm/unistd_64.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/x86/include/asm/unistd_64.h 2009-02-22 22:54:24.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.29.1/arch/x86/Kconfig linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/x86/Kconfig
---- linux-2.6.29.1/arch/x86/Kconfig 2009-03-24 14:18:47.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/x86/Kconfig 2009-03-24 14:48:23.000000000 +0100
-@@ -1990,6 +1990,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.29.1/arch/x86/kernel/syscall_table_32.S linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.29.1/arch/x86/kernel/syscall_table_32.S 2009-03-24 14:18:51.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/arch/x86/kernel/syscall_table_32.S 2009-02-22 22:54:24.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.29.1/Documentation/vserver/debug.txt linux-2.6.29.1-vs2.3.0.36.9-pre5/Documentation/vserver/debug.txt
---- linux-2.6.29.1/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/Documentation/vserver/debug.txt 2009-02-22 22:54:24.000000000 +0100
-@@ -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.29.1/drivers/block/Kconfig linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/block/Kconfig
---- linux-2.6.29.1/drivers/block/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/block/Kconfig 2009-02-22 22:54:24.000000000 +0100
-@@ -264,6 +264,13 @@ config BLK_DEV_CRYPTOLOOP
+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;
+ }
+- printk("VM: killing process %s\n", current->comm);
++ printk("VM: killing process %s(%d:#%u)\n",
++ current->comm, task_pid_nr(current), current->xid);
+ if (user_mode(regs))
+ do_group_exit(SIGKILL);
+ bad_page_fault(regs, address, SIGKILL);
+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_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-2.6.29.1/drivers/block/loop.c linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/block/loop.c
---- linux-2.6.29.1/drivers/block/loop.c 2009-03-24 14:18:56.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/block/loop.c 2009-03-24 15:09:29.000000000 +0100
-@@ -75,6 +75,7 @@
+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 <asm/uaccess.h>
-@@ -809,6 +810,7 @@ static int loop_set_fd(struct loop_devic
+@@ -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_backing_file = file;
lo->transfer = transfer_none;
lo->ioctl = NULL;
-@@ -931,6 +933,7 @@ static int loop_clr_fd(struct loop_devic
+@@ -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;
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);
-@@ -958,7 +961,7 @@ loop_set_status(struct loop_device *lo,
+@@ -973,7 +976,7 @@ loop_set_status(struct loop_device *lo,
if (lo->lo_encrypt_key_size &&
lo->lo_key_owner != uid &&
return -EPERM;
if (lo->lo_state != Lo_bound)
return -ENXIO;
-@@ -1042,7 +1045,8 @@ loop_get_status(struct loop_device *lo,
+@@ -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;
info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
lo->lo_encrypt_key_size);
-@@ -1351,6 +1355,9 @@ static int lo_open(struct block_device *
+@@ -1401,6 +1405,9 @@ static int lo_open(struct block_device *
{
struct loop_device *lo = bdev->bd_disk->private_data;
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-2.6.29.1/drivers/block/Makefile linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/block/Makefile
---- linux-2.6.29.1/drivers/block/Makefile 2009-03-24 14:18:55.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/block/Makefile 2009-03-24 14:48:25.000000000 +0100
-@@ -31,5 +31,6 @@ 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.29.1/drivers/block/vroot.c linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/block/vroot.c
---- linux-2.6.29.1/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/block/vroot.c 2009-02-22 22:54:24.000000000 +0100
+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
+
+#endif
+
-diff -NurpP --minimal linux-2.6.29.1/drivers/char/sysrq.c linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/char/sysrq.c
---- linux-2.6.29.1/drivers/char/sysrq.c 2009-03-24 14:18:57.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/char/sysrq.c 2009-03-24 15:15:27.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/irq.h>
+ #include <linux/workqueue.h>
#include <linux/hrtimer.h>
#include <linux/oom.h>
+#include <linux/vserver/debug.h>
#include <asm/ptrace.h>
#include <asm/irq_regs.h>
-@@ -369,6 +370,21 @@ static struct sysrq_key_op sysrq_unrt_op
+@@ -391,6 +392,21 @@ static struct sysrq_key_op sysrq_unrt_op
.enable_mask = SYSRQ_ENABLE_RTNICE,
};
/* Key Operations table and lock */
static DEFINE_SPINLOCK(sysrq_key_table_lock);
-@@ -419,7 +435,11 @@ static struct sysrq_key_op *sysrq_key_ta
+@@ -445,7 +461,11 @@ static struct sysrq_key_op *sysrq_key_ta
NULL, /* v */
&sysrq_showstate_blocked_op, /* w */
/* x: May be registered on ppc/powerpc for xmon */
/* y: May be registered on sparc64 for global register dump */
NULL, /* y */
&sysrq_ftrace_dump_op, /* z */
-@@ -434,6 +454,8 @@ static int sysrq_key_table_key2index(int
+@@ -460,6 +480,8 @@ static int sysrq_key_table_key2index(int
retval = key - '0';
else if ((key >= 'a') && (key <= 'z'))
retval = key + 10 - 'a';
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-2.6.29.1/drivers/char/tty_io.c linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/char/tty_io.c
---- linux-2.6.29.1/drivers/char/tty_io.c 2009-03-24 14:18:57.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/char/tty_io.c 2009-03-24 14:48:25.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
-@@ -2303,6 +2304,7 @@ static int tiocspgrp(struct tty_struct *
+@@ -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) &&
++ !vx_capable(CAP_SYS_ADMIN, VXC_TIOCSTI)))
+ return -EPERM;
+ if (get_user(ch, p))
+ return -EFAULT;
+@@ -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.29.1/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-2.6.29.1/drivers/infiniband/hw/ipath/ipath_user_pages.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/infiniband/hw/ipath/ipath_user_pages.c 2009-02-22 22:54:24.000000000 +0100
-@@ -33,6 +33,7 @@
-
+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>
+ #include <linux/sched.h>
+#include <linux/vs_memory.h>
#include "ipath_kernel.h"
-@@ -61,7 +62,8 @@ static int __get_user_pages(unsigned lon
+@@ -62,7 +63,8 @@ static int __get_user_pages(unsigned lon
lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >>
PAGE_SHIFT;
ret = -ENOMEM;
goto bail;
}
-@@ -78,7 +80,7 @@ static int __get_user_pages(unsigned lon
+@@ -79,7 +81,7 @@ static int __get_user_pages(unsigned lon
goto bail_release;
}
ret = 0;
goto bail;
-@@ -177,7 +179,7 @@ void ipath_release_user_pages(struct pag
+@@ -178,7 +180,7 @@ void ipath_release_user_pages(struct pag
__ipath_release_user_pages(p, num_pages, 1);
up_write(¤t->mm->mmap_sem);
}
-@@ -194,7 +196,7 @@ static void user_pages_account(struct wo
+@@ -195,7 +197,7 @@ static void user_pages_account(struct wo
container_of(_work, struct ipath_user_pages_work, work);
down_write(&work->mm->mmap_sem);
up_write(&work->mm->mmap_sem);
mmput(work->mm);
kfree(work);
-diff -NurpP --minimal linux-2.6.29.1/drivers/md/dm.c linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/md/dm.c
---- linux-2.6.29.1/drivers/md/dm.c 2009-03-24 14:19:05.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/md/dm.c 2009-03-24 15:15:57.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <linux/hdreg.h>
- #include <linux/blktrace_api.h>
- #include <trace/block.h>
-+#include <linux/vs_base.h>
-
- #define DM_MSG_PREFIX "core"
-
-@@ -115,6 +116,7 @@ struct mapped_device {
- rwlock_t map_lock;
- atomic_t holders;
- atomic_t open_count;
-+ xid_t xid;
-
- unsigned long flags;
-
-@@ -295,6 +297,7 @@ static void __exit dm_exit(void)
- static int dm_blk_open(struct block_device *bdev, fmode_t mode)
- {
- struct mapped_device *md;
-+ int ret = -ENXIO;
-
- spin_lock(&_minor_lock);
-
-@@ -303,18 +306,19 @@ static int dm_blk_open(struct block_devi
- goto out;
-
- if (test_bit(DMF_FREEING, &md->flags) ||
-- test_bit(DMF_DELETING, &md->flags)) {
-- md = NULL;
-+ test_bit(DMF_DELETING, &md->flags))
-+ goto out;
-+
-+ ret = -EACCES;
-+ if (!vx_check(md->xid, VS_IDENT|VS_HOSTID))
- goto out;
-- }
-
- dm_get(md);
- atomic_inc(&md->open_count);
--
-+ ret = 0;
- out:
- spin_unlock(&_minor_lock);
--
-- return md ? 0 : -ENXIO;
-+ return ret;
- }
-
- static int dm_blk_close(struct gendisk *disk, fmode_t mode)
-@@ -504,6 +508,14 @@ int dm_set_geometry(struct mapped_device
- return 0;
- }
-
-+/*
-+ * Get the xid associated with a dm device
-+ */
-+xid_t dm_get_xid(struct mapped_device *md)
-+{
-+ return md->xid;
-+}
-+
- /*-----------------------------------------------------------------
- * CRUD START:
- * A more elegant soln is in the works that uses the queue
-@@ -1110,6 +1122,7 @@ static struct mapped_device *alloc_dev(i
- INIT_LIST_HEAD(&md->uevent_list);
- spin_lock_init(&md->uevent_lock);
-
-+ md->xid = vx_current_xid();
- md->queue = blk_alloc_queue(GFP_KERNEL);
- if (!md->queue)
- goto bad_queue;
-diff -NurpP --minimal linux-2.6.29.1/drivers/md/dm.h linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/md/dm.h
---- linux-2.6.29.1/drivers/md/dm.h 2009-03-24 14:19:05.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/md/dm.h 2009-03-24 14:48:26.000000000 +0100
-@@ -54,6 +54,8 @@ int dm_table_any_congested(struct dm_tab
- #define dm_target_is_valid(t) ((t)->table)
- int dm_table_barrier_ok(struct dm_table *t);
-
-+xid_t dm_get_xid(struct mapped_device *md);
-+
- /*-----------------------------------------------------------------
- * A registry of target types.
- *---------------------------------------------------------------*/
-diff -NurpP --minimal linux-2.6.29.1/drivers/md/dm-ioctl.c linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/md/dm-ioctl.c
---- linux-2.6.29.1/drivers/md/dm-ioctl.c 2009-03-24 14:19:05.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/md/dm-ioctl.c 2009-03-24 14:48:26.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 <asm/uaccess.h>
-@@ -101,7 +102,8 @@ static struct hash_cell *__get_name_cell
+@@ -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)
dm_get(hc->md);
return hc;
}
-@@ -115,7 +117,8 @@ static struct hash_cell *__get_uuid_cell
+@@ -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)
dm_get(hc->md);
return hc;
}
-@@ -352,6 +355,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
+@@ -369,6 +372,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
static int remove_all(struct dm_ioctl *param, size_t param_size)
{
dm_hash_remove_all(1);
param->data_size = 0;
return 0;
-@@ -399,6 +405,8 @@ static int list_devices(struct dm_ioctl
+@@ -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) {
needed += sizeof(struct dm_name_list);
needed += strlen(hc->name) + 1;
needed += ALIGN_MASK;
-@@ -422,6 +430,8 @@ static int list_devices(struct dm_ioctl
+@@ -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 (old_nl)
old_nl->next = (uint32_t) ((void *) nl -
(void *) old_nl);
-@@ -612,10 +622,11 @@ static struct hash_cell *__find_device_h
+@@ -629,10 +639,11 @@ static struct hash_cell *__find_device_h
if (!md)
goto out;
out:
return mdptr;
}
-@@ -1405,8 +1416,8 @@ static int ctl_ioctl(uint command, struc
+@@ -1462,8 +1473,8 @@ static int ctl_ioctl(uint command, struc
ioctl_fn fn = NULL;
size_t param_size;
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-2.6.29.1/drivers/net/tun.c linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/net/tun.c
---- linux-2.6.29.1/drivers/net/tun.c 2009-03-24 14:19:23.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/drivers/net/tun.c 2009-03-25 01:51:59.000000000 +0100
+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 <linux/hdreg.h>
++#include <linux/vs_base.h>
+
+ #include <trace/events/block.h>
+
+@@ -121,6 +122,7 @@ struct mapped_device {
+ rwlock_t map_lock;
+ atomic_t holders;
+ atomic_t open_count;
++ xid_t xid;
+
+ unsigned long flags;
+
+@@ -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;
++ int ret = -ENXIO;
+
+ spin_lock(&_minor_lock);
+
+@@ -339,18 +342,19 @@ static int dm_blk_open(struct block_devi
+ goto out;
+
+ if (test_bit(DMF_FREEING, &md->flags) ||
+- test_bit(DMF_DELETING, &md->flags)) {
+- md = NULL;
++ test_bit(DMF_DELETING, &md->flags))
++ goto out;
++
++ ret = -EACCES;
++ if (!vx_check(md->xid, VS_IDENT|VS_HOSTID))
+ goto out;
+- }
+
+ dm_get(md);
+ atomic_inc(&md->open_count);
+-
++ ret = 0;
+ out:
+ spin_unlock(&_minor_lock);
+-
+- return md ? 0 : -ENXIO;
++ return ret;
+ }
+
+ static int dm_blk_close(struct gendisk *disk, fmode_t mode)
+@@ -561,6 +565,14 @@ int dm_set_geometry(struct mapped_device
+ return 0;
+ }
+
++/*
++ * Get the xid associated with a dm device
++ */
++xid_t dm_get_xid(struct mapped_device *md)
++{
++ return md->xid;
++}
++
+ /*-----------------------------------------------------------------
+ * CRUD START:
+ * A more elegant soln is in the works that uses the queue
+@@ -1781,6 +1793,7 @@ static struct mapped_device *alloc_dev(i
+ INIT_LIST_HEAD(&md->uevent_list);
+ spin_lock_init(&md->uevent_lock);
+
++ md->xid = vx_current_xid();
+ md->queue = blk_init_queue(dm_request_fn, NULL);
+ if (!md->queue)
+ goto bad_queue;
+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;
+
++xid_t dm_get_xid(struct mapped_device *md);
++
+ /*-----------------------------------------------------------------
+ * Internal table functions.
+ *---------------------------------------------------------------*/
+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>
+#include <linux/vs_network.h>
#include <net/net_namespace.h>
#include <net/netns/generic.h>
-
-@@ -93,6 +94,7 @@ struct tun_struct {
- int attached;
+ #include <net/rtnetlink.h>
+@@ -102,6 +103,7 @@ struct tun_struct {
+ unsigned int flags;
uid_t owner;
gid_t group;
+ nid_t nid;
- wait_queue_head_t read_wait;
- struct sk_buff_head readq;
-@@ -697,6 +699,7 @@ static void tun_setup(struct net_device
+ struct net_device *dev;
+ struct fasync_struct *fasync;
+@@ -816,6 +818,7 @@ static void tun_setup(struct net_device
tun->owner = -1;
tun->group = -1;
+ tun->nid = current->nid;
dev->ethtool_ops = &tun_ethtool_ops;
- dev->destructor = free_netdev;
-@@ -727,6 +730,9 @@ static int tun_set_iff(struct net *net,
- tn = net_generic(net, tun_net_id);
- tun = tun_get_by_name(tn, ifr->ifr_name);
- if (tun) {
-+ if (!nx_check(tun->nid, VS_IDENT | VS_HOSTID | VS_ADMIN_P))
-+ return -EPERM;
-+
- if (tun->attached)
- return -EBUSY;
+ dev->destructor = tun_free_netdev;
+@@ -932,7 +935,7 @@ static int tun_set_iff(struct net *net,
-@@ -735,7 +741,7 @@ static int tun_set_iff(struct net *net,
- cred->euid != tun->owner) ||
- (tun->group != -1 &&
- cred->egid != tun->group)) &&
-- !capable(CAP_NET_ADMIN)) {
-+ !cap_raised(current_cap(), CAP_NET_ADMIN)) {
+ if (((tun->owner != -1 && cred->euid != tun->owner) ||
+ (tun->group != -1 && !in_egroup_p(tun->group))) &&
+- !capable(CAP_NET_ADMIN))
++ !cap_raised(current_cap(), CAP_NET_ADMIN))
return -EPERM;
- }
- }
-@@ -747,7 +753,7 @@ static int tun_set_iff(struct net *net,
-
- err = -EINVAL;
+ err = security_tun_dev_attach(tun->socket.sk);
+ if (err < 0)
+@@ -946,7 +949,7 @@ static int tun_set_iff(struct net *net,
+ char *name;
+ unsigned long flags = 0;
- if (!capable(CAP_NET_ADMIN))
+ if (!nx_capable(CAP_NET_ADMIN, NXC_TUN_CREATE))
return -EPERM;
+ err = security_tun_dev_create();
+ if (err < 0)
+@@ -1014,6 +1017,9 @@ static int tun_set_iff(struct net *net,
+
+ sk->sk_destruct = tun_sock_destruct;
- /* Set dev type */
-@@ -987,6 +993,16 @@ static int tun_chr_ioctl(struct inode *i
++ if (!nx_check(tun->nid, VS_IDENT | VS_HOSTID | VS_ADMIN_P))
++ return -EPERM;
++
+ err = tun_attach(tun, file);
+ if (err < 0)
+ goto failed;
+@@ -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 */
- rtnl_lock();
-diff -NurpP --minimal linux-2.6.29.1/fs/attr.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/attr.c
---- linux-2.6.29.1/fs/attr.c 2009-03-24 14:22:24.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/attr.c 2009-03-24 14:48:34.000000000 +0100
+ if (tun->dev->flags & IFF_UP) {
+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>
/* Taken over from the old code... */
-@@ -55,6 +58,10 @@ int inode_change_ok(struct inode *inode,
+@@ -55,6 +58,10 @@ int inode_change_ok(const struct inode *
if (!is_owner_or_cap(inode))
goto error;
}
fine:
retval = 0;
error:
-@@ -78,6 +85,8 @@ int inode_setattr(struct inode * inode,
+@@ -120,6 +127,8 @@ int inode_setattr(struct inode * inode,
inode->i_uid = attr->ia_uid;
if (ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
if (ia_valid & ATTR_ATIME)
inode->i_atime = timespec_trunc(attr->ia_atime,
inode->i_sb->s_time_gran);
-@@ -172,7 +181,8 @@ int notify_change(struct dentry * dentry
+@@ -214,7 +223,8 @@ int notify_change(struct dentry * dentry
error = inode_change_ok(inode, attr);
if (!error) {
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
- (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
+ (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) ||
+ (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag))
- error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;
+ error = vfs_dq_transfer(inode, attr) ?
+ -EDQUOT : 0;
if (!error)
- error = inode_setattr(inode, attr);
-diff -NurpP --minimal linux-2.6.29.1/fs/binfmt_aout.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/binfmt_aout.c
---- linux-2.6.29.1/fs/binfmt_aout.c 2009-03-24 14:22:24.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/binfmt_aout.c 2009-03-24 14:48:34.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.29.1/fs/binfmt_elf.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/binfmt_elf.c
---- linux-2.6.29.1/fs/binfmt_elf.c 2009-03-24 14:22:24.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/binfmt_elf.c 2009-03-24 14:48:34.000000000 +0100
-@@ -38,6 +38,7 @@
+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 <linux/utsname.h>
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-2.6.29.1/fs/binfmt_flat.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/binfmt_flat.c
---- linux-2.6.29.1/fs/binfmt_flat.c 2009-03-24 14:22:24.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/binfmt_flat.c 2009-03-24 14:48:34.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.29.1/fs/binfmt_som.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/binfmt_som.c
---- linux-2.6.29.1/fs/binfmt_som.c 2009-03-24 14:22:24.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/binfmt_som.c 2009-03-24 14:48:34.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.29.1/fs/block_dev.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/block_dev.c
---- linux-2.6.29.1/fs/block_dev.c 2009-03-24 14:22:24.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/block_dev.c 2009-03-24 14:48:34.000000000 +0100
-@@ -24,6 +24,7 @@
- #include <linux/uio.h>
+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 <linux/kmemleak.h>
+#include <linux/vs_device.h>
#include <asm/uaccess.h>
#include "internal.h"
-@@ -392,6 +393,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);
-@@ -428,6 +430,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;
-@@ -438,7 +445,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.29.1/fs/char_dev.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/char_dev.c
---- linux-2.6.29.1/fs/char_dev.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/char_dev.c 2009-03-24 14:48:35.000000000 +0100
-@@ -21,6 +21,8 @@
- #include <linux/cdev.h>
- #include <linux/mutex.h>
- #include <linux/backing-dev.h>
-+#include <linux/vs_context.h>
-+#include <linux/vs_device.h>
+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;
+
++ __le16 tag;
+ /*
+ * a little future expansion, for more than this we can
+ * just grow the inode item and version it
+ */
+- __le64 reserved[4];
++ __le16 reserved16;
++ __le32 reserved32;
++ __le64 reserved[3];
+ struct btrfs_timespec atime;
+ struct btrfs_timespec ctime;
+ struct btrfs_timespec mtime;
+@@ -1162,6 +1165,8 @@ struct btrfs_root {
+ #define BTRFS_MOUNT_NOSSD (1 << 9)
+ #define BTRFS_MOUNT_DISCARD (1 << 10)
+
++#define BTRFS_MOUNT_TAGGED (1 << 24)
++
+ #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 & \
+@@ -1181,6 +1186,10 @@ struct btrfs_root {
+ #define BTRFS_INODE_NOATIME (1 << 9)
+ #define BTRFS_INODE_DIRSYNC (1 << 10)
+
++#define BTRFS_INODE_IXUNLINK (1 << 24)
++#define BTRFS_INODE_BARRIER (1 << 25)
++#define BTRFS_INODE_COW (1 << 26)
++
+
+ #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_tag, struct btrfs_inode_item, tag, 16);
+ 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);
+@@ -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);
++int btrfs_sync_flags(struct inode *inode, int, int);
+
+ /* file.c */
+ int btrfs_sync_file(struct file *file, struct dentry *dentry, int datasync);
+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;
+ }
- #include "internal.h"
++ if (btrfs_test_opt(tree_root, TAGGED))
++ sb->s_flags |= MS_TAGGED;
++
+ features = btrfs_super_incompat_flags(disk_super) &
+ ~BTRFS_FEATURE_INCOMPAT_SUPP;
+ if (features) {
+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 <linux/falloc.h>
++#include <linux/vs_tag.h>
++
+ #include "compat.h"
+ #include "ctree.h"
+ #include "disk-io.h"
+@@ -2263,6 +2265,8 @@ static void btrfs_read_locked_inode(stru
+ int maybe_acls;
+ u64 alloc_group_block;
+ u32 rdev;
++ uid_t uid;
++ gid_t gid;
+ int ret;
-@@ -358,14 +360,21 @@ static int chrdev_open(struct inode *ino
- struct cdev *p;
- struct cdev *new = NULL;
- int ret = 0;
-+ dev_t mdev;
+ path = btrfs_alloc_path();
+@@ -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);
+- inode->i_uid = btrfs_inode_uid(leaf, inode_item);
+- inode->i_gid = btrfs_inode_gid(leaf, inode_item);
+
-+ if (!vs_map_chrdev(inode->i_rdev, &mdev, DATTR_OPEN))
-+ return -EPERM;
-+ inode->i_mdev = mdev;
++ uid = btrfs_inode_uid(leaf, inode_item);
++ gid = btrfs_inode_gid(leaf, inode_item);
++ 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,
++ btrfs_inode_tag(leaf, inode_item));
+ btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
- spin_lock(&cdev_lock);
- p = inode->i_cdev;
- if (!p) {
- struct kobject *kobj;
- int idx;
+ tspec = btrfs_inode_atime(inode_item);
+@@ -2362,8 +2371,15 @@ static void fill_inode_item(struct btrfs
+ struct btrfs_inode_item *item,
+ struct inode *inode)
+ {
+- btrfs_set_inode_uid(leaf, item, inode->i_uid);
+- btrfs_set_inode_gid(leaf, item, inode->i_gid);
++ uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
++ gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
+
- spin_unlock(&cdev_lock);
-- kobj = kobj_lookup(cdev_map, inode->i_rdev, &idx);
++ btrfs_set_inode_uid(leaf, item, uid);
++ btrfs_set_inode_gid(leaf, item, gid);
++#ifdef CONFIG_TAGGING_INTERN
++ btrfs_set_inode_tag(leaf, item, inode->i_tag);
++#endif
+
-+ kobj = kobj_lookup(cdev_map, mdev, &idx);
- if (!kobj)
- return -ENXIO;
- new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-2.6.29.1/fs/dcache.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/dcache.c
---- linux-2.6.29.1/fs/dcache.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/dcache.c 2009-03-24 14:48:35.000000000 +0100
-@@ -32,6 +32,7 @@
- #include <linux/seqlock.h>
- #include <linux/swap.h>
- #include <linux/bootmem.h>
-+#include <linux/vs_limit.h>
- #include "internal.h"
-
- int sysctl_vfs_cache_pressure __read_mostly = 100;
-@@ -229,6 +230,8 @@ repeat:
- return;
- }
+ 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);
+@@ -4153,6 +4169,7 @@ static struct inode *btrfs_new_inode(str
+ } else
+ inode->i_gid = current_fsgid();
-+ vx_dentry_dec(dentry);
-+
- /*
- * AV: ->d_delete() is _NOT_ allowed to block now.
- */
-@@ -320,6 +323,7 @@ static inline struct dentry * __dget_loc
++ inode->i_tag = dx_current_fstag(root->fs_info->sb);
+ inode->i_mode = mode;
+ inode->i_ino = objectid;
+ inode_set_bytes(inode, 0);
+@@ -5954,6 +5971,7 @@ static const struct inode_operations btr
+ .listxattr = btrfs_listxattr,
+ .removexattr = btrfs_removexattr,
+ .permission = btrfs_permission,
++ .sync_flags = btrfs_sync_flags,
+ };
+ static const struct inode_operations btrfs_dir_ro_inode_operations = {
+ .lookup = btrfs_lookup,
+@@ -6029,6 +6047,7 @@ static const struct inode_operations btr
+ .permission = btrfs_permission,
+ .fallocate = btrfs_fallocate,
+ .fiemap = btrfs_fiemap,
++ .sync_flags = btrfs_sync_flags,
+ };
+ static const struct inode_operations btrfs_special_inode_operations = {
+ .getattr = btrfs_getattr,
+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
{
- atomic_inc(&dentry->d_count);
- dentry_lru_del_init(dentry);
-+ vx_dentry_inc(dentry);
- return dentry;
+ unsigned int iflags = 0;
+
+- if (flags & BTRFS_INODE_SYNC)
+- iflags |= FS_SYNC_FL;
+ if (flags & BTRFS_INODE_IMMUTABLE)
+ iflags |= FS_IMMUTABLE_FL;
++ if (flags & BTRFS_INODE_IXUNLINK)
++ iflags |= FS_IXUNLINK_FL;
++
++ if (flags & BTRFS_INODE_SYNC)
++ iflags |= FS_SYNC_FL;
+ if (flags & BTRFS_INODE_APPEND)
+ iflags |= FS_APPEND_FL;
+ if (flags & BTRFS_INODE_NODUMP)
+@@ -80,28 +83,78 @@ static unsigned int btrfs_flags_to_ioctl
+ if (flags & BTRFS_INODE_DIRSYNC)
+ iflags |= FS_DIRSYNC_FL;
+
++ if (flags & BTRFS_INODE_BARRIER)
++ iflags |= FS_BARRIER_FL;
++ if (flags & BTRFS_INODE_COW)
++ iflags |= FS_COW_FL;
+ return iflags;
}
-@@ -918,6 +922,9 @@ struct dentry *d_alloc(struct dentry * p
- struct dentry *dentry;
- char *dname;
+ /*
+- * Update inode->i_flags based on the btrfs internal flags.
++ * Update inode->i_(v)flags based on the btrfs internal flags.
+ */
+ void btrfs_update_iflags(struct inode *inode)
+ {
+ struct btrfs_inode *ip = BTRFS_I(inode);
-+ if (!vx_dentry_avail(1))
-+ return NULL;
+- inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
++ inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
++ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
+
+- if (ip->flags & BTRFS_INODE_SYNC)
+- inode->i_flags |= S_SYNC;
+ if (ip->flags & BTRFS_INODE_IMMUTABLE)
+ inode->i_flags |= S_IMMUTABLE;
++ if (ip->flags & BTRFS_INODE_IXUNLINK)
++ inode->i_flags |= S_IXUNLINK;
+
- dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
- if (!dentry)
- return NULL;
-@@ -963,6 +970,7 @@ struct dentry *d_alloc(struct dentry * p
++ if (ip->flags & BTRFS_INODE_SYNC)
++ inode->i_flags |= S_SYNC;
+ if (ip->flags & BTRFS_INODE_APPEND)
+ inode->i_flags |= S_APPEND;
+ if (ip->flags & BTRFS_INODE_NOATIME)
+ inode->i_flags |= S_NOATIME;
+ if (ip->flags & BTRFS_INODE_DIRSYNC)
+ inode->i_flags |= S_DIRSYNC;
++
++ inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++ if (ip->flags & BTRFS_INODE_BARRIER)
++ inode->i_vflags |= V_BARRIER;
++ if (ip->flags & BTRFS_INODE_COW)
++ inode->i_vflags |= V_COW;
++}
++
++/*
++ * Update btrfs internal flags from inode->i_(v)flags.
++ */
++void btrfs_update_flags(struct inode *inode)
++{
++ struct btrfs_inode *ip = BTRFS_I(inode);
++
++ unsigned int flags = inode->i_flags;
++ unsigned int vflags = inode->i_vflags;
++
++ ip->flags &= ~(BTRFS_INODE_SYNC | BTRFS_INODE_APPEND |
++ BTRFS_INODE_IMMUTABLE | BTRFS_INODE_IXUNLINK |
++ BTRFS_INODE_NOATIME | BTRFS_INODE_DIRSYNC |
++ BTRFS_INODE_BARRIER | BTRFS_INODE_COW);
++
++ if (flags & S_IMMUTABLE)
++ ip->flags |= BTRFS_INODE_IMMUTABLE;
++ if (flags & S_IXUNLINK)
++ ip->flags |= BTRFS_INODE_IXUNLINK;
++
++ if (flags & S_SYNC)
++ ip->flags |= BTRFS_INODE_SYNC;
++ if (flags & S_APPEND)
++ ip->flags |= BTRFS_INODE_APPEND;
++ if (flags & S_NOATIME)
++ ip->flags |= BTRFS_INODE_NOATIME;
++ if (flags & S_DIRSYNC)
++ ip->flags |= BTRFS_INODE_DIRSYNC;
++
++ if (vflags & V_BARRIER)
++ ip->flags |= BTRFS_INODE_BARRIER;
++ if (vflags & V_COW)
++ ip->flags |= BTRFS_INODE_COW;
+ }
+
+ /*
+@@ -119,7 +172,7 @@ void btrfs_inherit_iflags(struct inode *
+ flags = BTRFS_I(dir)->flags;
+
+ if (S_ISREG(inode->i_mode))
+- flags &= ~BTRFS_INODE_DIRSYNC;
++ flags &= ~(BTRFS_INODE_DIRSYNC | BTRFS_INODE_BARRIER);
+ else if (!S_ISDIR(inode->i_mode))
+ flags &= (BTRFS_INODE_NODUMP | BTRFS_INODE_NOATIME);
+
+@@ -127,6 +180,30 @@ void btrfs_inherit_iflags(struct inode *
+ btrfs_update_iflags(inode);
+ }
+
++int btrfs_sync_flags(struct inode *inode, int flags, int vflags)
++{
++ struct btrfs_inode *ip = BTRFS_I(inode);
++ struct btrfs_root *root = ip->root;
++ struct btrfs_trans_handle *trans;
++ int ret;
++
++ trans = btrfs_join_transaction(root, 1);
++ BUG_ON(!trans);
++
++ inode->i_flags = flags;
++ inode->i_vflags = vflags;
++ btrfs_update_flags(inode);
++
++ ret = btrfs_update_inode(trans, root, inode);
++ BUG_ON(ret);
++
++ btrfs_update_iflags(inode);
++ inode->i_ctime = CURRENT_TIME;
++ btrfs_end_transaction(trans, root);
++
++ return 0;
++}
++
+ static int btrfs_ioctl_getflags(struct file *file, void __user *arg)
+ {
+ struct btrfs_inode *ip = BTRFS_I(file->f_path.dentry->d_inode);
+@@ -149,6 +226,7 @@ static int btrfs_ioctl_setflags(struct f
+ if (copy_from_user(&flags, arg, sizeof(flags)))
+ return -EFAULT;
+
++ /* maybe add FS_IXUNLINK_FL ? */
+ if (flags & ~(FS_IMMUTABLE_FL | FS_APPEND_FL | \
+ FS_NOATIME_FL | FS_NODUMP_FL | \
+ FS_SYNC_FL | FS_DIRSYNC_FL))
+@@ -161,7 +239,8 @@ static int btrfs_ioctl_setflags(struct f
+
+ flags = btrfs_mask_flags(inode->i_mode, flags);
+ oldflags = btrfs_flags_to_ioctl(ip->flags);
+- if ((flags ^ oldflags) & (FS_APPEND_FL | FS_IMMUTABLE_FL)) {
++ if ((flags ^ oldflags) & (FS_APPEND_FL |
++ FS_IMMUTABLE_FL | FS_IXUNLINK_FL)) {
+ if (!capable(CAP_LINUX_IMMUTABLE)) {
+ ret = -EPERM;
+ goto out_unlock;
+@@ -172,14 +251,19 @@ static int btrfs_ioctl_setflags(struct f
+ if (ret)
+ goto out_unlock;
+
+- if (flags & FS_SYNC_FL)
+- ip->flags |= BTRFS_INODE_SYNC;
+- else
+- ip->flags &= ~BTRFS_INODE_SYNC;
+ if (flags & FS_IMMUTABLE_FL)
+ ip->flags |= BTRFS_INODE_IMMUTABLE;
+ else
+ ip->flags &= ~BTRFS_INODE_IMMUTABLE;
++ if (flags & FS_IXUNLINK_FL)
++ ip->flags |= BTRFS_INODE_IXUNLINK;
++ else
++ ip->flags &= ~BTRFS_INODE_IXUNLINK;
++
++ if (flags & FS_SYNC_FL)
++ ip->flags |= BTRFS_INODE_SYNC;
++ else
++ ip->flags &= ~BTRFS_INODE_SYNC;
+ if (flags & FS_APPEND_FL)
+ ip->flags |= BTRFS_INODE_APPEND;
+ else
+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_compress, Opt_notreelog, Opt_ratio, Opt_flushoncommit,
+- Opt_discard, Opt_err,
++ Opt_tag, Opt_notag, Opt_tagid, Opt_discard, Opt_err,
+ };
+
+ static match_table_t tokens = {
+@@ -90,6 +90,9 @@ static match_table_t tokens = {
+ {Opt_flushoncommit, "flushoncommit"},
+ {Opt_ratio, "metadata_ratio=%d"},
+ {Opt_discard, "discard"},
++ {Opt_tag, "tag"},
++ {Opt_notag, "notag"},
++ {Opt_tagid, "tagid=%u"},
+ {Opt_err, NULL},
+ };
+
+@@ -264,6 +267,22 @@ int btrfs_parse_options(struct btrfs_roo
+ case Opt_discard:
+ btrfs_set_opt(info->mount_opt, DISCARD);
+ break;
++#ifndef CONFIG_TAGGING_NONE
++ case Opt_tag:
++ printk(KERN_INFO "btrfs: use tagging\n");
++ btrfs_set_opt(info->mount_opt, TAGGED);
++ break;
++ case Opt_notag:
++ printk(KERN_INFO "btrfs: disabled tagging\n");
++ btrfs_clear_opt(info->mount_opt, TAGGED);
++ break;
++#endif
++#ifdef CONFIG_PROPAGATE
++ case Opt_tagid:
++ /* use args[0] */
++ btrfs_set_opt(info->mount_opt, TAGGED);
++ break;
++#endif
+ 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 (btrfs_test_opt(root, TAGGED) && !(sb->s_flags & MS_TAGGED)) {
++ printk("btrfs: %s: tagging not permitted on remount.\n",
++ sb->s_id);
++ return -EINVAL;
++ }
++
+ if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
+ return 0;
+
+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 <linux/backing-dev.h>
++#include <linux/vs_context.h>
++#include <linux/vs_device.h>
+
+ #include "internal.h"
+
+@@ -370,14 +372,21 @@ static int chrdev_open(struct inode *ino
+ struct cdev *p;
+ struct cdev *new = NULL;
+ int ret = 0;
++ dev_t mdev;
++
++ if (!vs_map_chrdev(inode->i_rdev, &mdev, DATTR_OPEN))
++ return -EPERM;
++ inode->i_mdev = mdev;
+
+ spin_lock(&cdev_lock);
+ p = inode->i_cdev;
+ if (!p) {
+ struct kobject *kobj;
+ int idx;
++
+ spin_unlock(&cdev_lock);
+- kobj = kobj_lookup(cdev_map, inode->i_rdev, &idx);
++
++ kobj = kobj_lookup(cdev_map, mdev, &idx);
+ if (!kobj)
+ return -ENXIO;
+ new = container_of(kobj, struct cdev, kobj);
+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>
+ #include <linux/hardirq.h>
++#include <linux/vs_limit.h>
+ #include "internal.h"
+
+ int sysctl_vfs_cache_pressure __read_mostly = 100;
+@@ -230,6 +231,8 @@ repeat:
+ return;
+ }
+
++ vx_dentry_dec(dentry);
++
+ /*
+ * AV: ->d_delete() is _NOT_ allowed to block now.
+ */
+@@ -321,6 +324,7 @@ static inline struct dentry * __dget_loc
+ {
+ atomic_inc(&dentry->d_count);
+ dentry_lru_del_init(dentry);
++ vx_dentry_inc(dentry);
+ return dentry;
+ }
+
+@@ -919,6 +923,9 @@ struct dentry *d_alloc(struct dentry * p
+ struct dentry *dentry;
+ char *dname;
+
++ if (!vx_dentry_avail(1))
++ return NULL;
++
+ dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
+ if (!dentry)
+ return NULL;
+@@ -964,6 +971,7 @@ struct dentry *d_alloc(struct dentry * p
if (parent)
list_add(&dentry->d_u.d_child, &parent->d_subdirs);
dentry_stat.nr_dentry++;
spin_unlock(&dcache_lock);
return dentry;
-@@ -1418,6 +1426,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.29.1/fs/devpts/inode.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/devpts/inode.c
---- linux-2.6.29.1/fs/devpts/inode.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/devpts/inode.c 2009-03-24 15:32:47.000000000 +0100
-@@ -19,12 +19,12 @@
- #include <linux/tty.h>
- #include <linux/mutex.h>
- #include <linux/idr.h>
-+#include <linux/magic.h>
- #include <linux/devpts_fs.h>
+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>
#include <linux/seq_file.h>
--
--#define DEVPTS_SUPER_MAGIC 0x1cd1
+#include <linux/vs_base.h>
#define DEVPTS_DEFAULT_MODE 0600
/*
-@@ -36,6 +36,20 @@
+@@ -35,6 +36,20 @@
#define DEVPTS_DEFAULT_PTMX_MODE 0000
#define PTMX_MINOR 2
extern int pty_limit; /* Config limit on Unix98 ptys */
static DEFINE_MUTEX(allocated_ptys_lock);
-@@ -254,6 +268,25 @@ static int devpts_show_options(struct se
+@@ -262,6 +277,25 @@ static int devpts_show_options(struct se
return 0;
}
static const struct super_operations devpts_sops = {
.statfs = simple_statfs,
.remount_fs = devpts_remount,
-@@ -293,12 +326,15 @@ devpts_fill_super(struct super_block *s,
+@@ -301,12 +335,15 @@ devpts_fill_super(struct super_block *s,
inode = new_inode(s);
if (!inode)
goto free_fsi;
s->s_root = d_alloc_root(inode);
if (s->s_root)
-@@ -479,6 +515,7 @@ static int init_pts_mount(struct file_sy
- return err;
- }
-
-+
- static int devpts_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data, struct vfsmount *mnt)
- {
-@@ -590,6 +627,9 @@ int devpts_pty_new(struct inode *ptmx_in
+@@ -497,6 +534,9 @@ int devpts_pty_new(struct inode *ptmx_in
inode->i_gid = opts->setgid ? opts->gid : current_fsgid();
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
init_special_inode(inode, S_IFCHR|opts->mode, device);
inode->i_private = tty;
tty->driver_data = inode;
-diff -NurpP --minimal linux-2.6.29.1/fs/exec.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/exec.c
---- linux-2.6.29.1/fs/exec.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/exec.c 2009-03-24 15:34:21.000000000 +0100
-@@ -257,7 +257,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;
-@@ -1450,7 +1452,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.29.1/fs/ext2/balloc.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/balloc.c
---- linux-2.6.29.1/fs/ext2/balloc.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/balloc.c 2009-03-24 14:48:35.000000000 +0100
-@@ -16,6 +16,8 @@
- #include <linux/sched.h>
- #include <linux/buffer_head.h>
- #include <linux/capability.h>
-+#include <linux/vs_dlimit.h>
-+#include <linux/vs_tag.h>
-
- /*
- * balloc.c contains the blocks allocation and deallocation routines
-@@ -569,6 +571,7 @@ do_more:
- }
- error_return:
- brelse(bitmap_bh);
-+ DLIMIT_FREE_BLOCK(inode, freed);
- release_blocks(sb, freed);
- DQUOT_FREE_BLOCK(inode, freed);
- }
-@@ -701,7 +704,6 @@ ext2_try_to_allocate(struct super_block
+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:
-@@ -1251,6 +1253,11 @@ ext2_fsblk_t ext2_new_blocks(struct inod
- *errp = -EDQUOT;
- return 0;
- }
-+ if (DLIMIT_ALLOC_BLOCK(inode, num)) {
-+ *errp = -ENOSPC;
-+ DQUOT_FREE_BLOCK(inode, num);
-+ return 0;
-+ }
-
- sbi = EXT2_SB(sb);
- es = EXT2_SB(sb)->s_es;
-@@ -1409,6 +1416,7 @@ allocated:
-
- *errp = 0;
- brelse(bitmap_bh);
-+ DLIMIT_FREE_BLOCK(inode, *count-num);
- DQUOT_FREE_BLOCK(inode, *count-num);
- *count = num;
- return ret_block;
-@@ -1419,8 +1427,10 @@ out:
- /*
- * Undo the block allocation
- */
-- if (!performed_allocation)
-+ if (!performed_allocation) {
-+ DLIMIT_FREE_BLOCK(inode, *count);
- DQUOT_FREE_BLOCK(inode, *count);
-+ }
- brelse(bitmap_bh);
- return 0;
- }
-diff -NurpP --minimal linux-2.6.29.1/fs/ext2/ext2.h linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/ext2.h
---- linux-2.6.29.1/fs/ext2/ext2.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/ext2.h 2009-02-22 22:54:25.000000000 +0100
-@@ -170,6 +170,7 @@ extern const struct file_operations ext2
- extern const struct address_space_operations ext2_aops;
- extern const struct address_space_operations ext2_aops_xip;
- extern const struct address_space_operations ext2_nobh_aops;
-+extern int ext2_sync_flags(struct inode *inode);
-
- /* namei.c */
- extern const struct inode_operations ext2_dir_inode_operations;
-diff -NurpP --minimal linux-2.6.29.1/fs/ext2/file.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/file.c
---- linux-2.6.29.1/fs/ext2/file.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/file.c 2009-02-22 22:54:25.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,
+ struct page **pagep, void **fsdata);
++extern int ext2_sync_flags(struct inode *, int, int);
+
+ /* ioctl.c */
+ extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
+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,
- .permission = ext2_permission,
+ .check_acl = ext2_check_acl,
.fiemap = ext2_fiemap,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.29.1/fs/ext2/ialloc.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/ialloc.c
---- linux-2.6.29.1/fs/ext2/ialloc.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/ialloc.c 2009-03-24 15:36:12.000000000 +0100
-@@ -17,6 +17,8 @@
+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>
#include <linux/random.h>
-+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
-@@ -123,6 +125,7 @@ void ext2_free_inode (struct inode * ino
- ext2_xattr_delete_inode(inode);
- DQUOT_FREE_INODE(inode);
- DQUOT_DROP(inode);
-+ DLIMIT_FREE_INODE(inode);
- }
-
- es = EXT2_SB(sb)->s_es;
-@@ -454,6 +457,11 @@ struct inode *ext2_new_inode(struct inod
- if (!inode)
- return ERR_PTR(-ENOMEM);
-
+@@ -560,6 +561,7 @@ got:
+ } else
+ inode->i_gid = current_fsgid();
+ inode->i_mode = mode;
+ inode->i_tag = dx_current_fstag(sb);
-+ if (DLIMIT_ALLOC_INODE(inode)) {
-+ err = -ENOSPC;
-+ goto fail_dlim;
-+ }
- ei = EXT2_I(inode);
- sbi = EXT2_SB(sb);
- es = sbi->s_es;
-@@ -609,6 +617,7 @@ fail_free_drop:
-
- fail_drop:
- DQUOT_DROP(inode);
-+ DLIMIT_FREE_INODE(inode);
- inode->i_flags |= S_NOQUOTA;
- inode->i_nlink = 0;
- unlock_new_inode(inode);
-@@ -616,6 +625,8 @@ fail_drop:
- return ERR_PTR(err);
- fail:
-+ DLIMIT_FREE_INODE(inode);
-+fail_dlim:
- make_bad_inode(inode);
- iput(inode);
- return ERR_PTR(err);
-diff -NurpP --minimal linux-2.6.29.1/fs/ext2/inode.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/inode.c
---- linux-2.6.29.1/fs/ext2/inode.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/inode.c 2009-03-24 15:41:38.000000000 +0100
+ inode->i_ino = ino;
+ inode->i_blocks = 0;
+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>
#include "ext2.h"
#include "acl.h"
#include "xip.h"
-@@ -1018,7 +1019,7 @@ void ext2_truncate(struct inode *inode)
+@@ -1040,7 +1041,7 @@ void ext2_truncate(struct inode *inode)
return;
if (ext2_inode_is_fast_symlink(inode))
return;
return;
blocksize = inode->i_sb->s_blocksize;
-@@ -1156,38 +1157,72 @@ void ext2_set_inode_flags(struct inode *
+@@ -1178,36 +1179,61 @@ void ext2_set_inode_flags(struct inode *
{
unsigned int flags = EXT2_I(inode)->i_flags;
+ ei->i_flags |= EXT2_COW_FL;
}
-+int ext2_sync_flags(struct inode *inode)
-+{
-+ ext2_get_inode_flags(EXT2_I(inode));
-+ inode->i_ctime = CURRENT_TIME;
-+ mark_inode_dirty(inode);
-+ return 0;
-+}
-+
-+
struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
- {
- struct ext2_inode_info *ei;
-@@ -1195,6 +1230,8 @@ struct inode *ext2_iget (struct super_bl
+@@ -1217,6 +1243,8 @@ struct inode *ext2_iget (struct super_bl
struct ext2_inode *raw_inode;
struct inode *inode;
long ret = -EIO;
int n;
inode = iget_locked(sb, ino);
-@@ -1217,12 +1254,17 @@ struct inode *ext2_iget (struct super_bl
+@@ -1235,12 +1263,17 @@ struct inode *ext2_iget (struct super_bl
}
inode->i_mode = le16_to_cpu(raw_inode->i_mode);
inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
inode->i_size = le32_to_cpu(raw_inode->i_size);
inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
-@@ -1320,8 +1362,8 @@ static int ext2_update_inode(struct inod
+@@ -1338,8 +1371,8 @@ int ext2_write_inode(struct inode *inode
struct ext2_inode_info *ei = EXT2_I(inode);
struct super_block *sb = inode->i_sb;
ino_t ino = inode->i_ino;
struct buffer_head * bh;
struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh);
int n;
-@@ -1357,6 +1399,9 @@ static int ext2_update_inode(struct inod
+@@ -1375,6 +1408,9 @@ int ext2_write_inode(struct inode *inode
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
raw_inode->i_size = cpu_to_le32(inode->i_size);
raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
-@@ -1443,7 +1488,8 @@ int ext2_setattr(struct dentry *dentry,
+@@ -1456,7 +1492,8 @@ int ext2_setattr(struct dentry *dentry,
if (error)
return error;
if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
- (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {
+ (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid) ||
+ (iattr->ia_valid & ATTR_TAG && iattr->ia_tag != inode->i_tag)) {
- error = DQUOT_TRANSFER(inode, iattr) ? -EDQUOT : 0;
+ error = vfs_dq_transfer(inode, iattr) ? -EDQUOT : 0;
if (error)
return error;
-diff -NurpP --minimal linux-2.6.29.1/fs/ext2/ioctl.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/ioctl.c
---- linux-2.6.29.1/fs/ext2/ioctl.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/ioctl.c 2009-03-24 14:48:35.000000000 +0100
-@@ -14,6 +14,7 @@
- #include <linux/compat.h>
- #include <linux/mount.h>
- #include <linux/smp_lock.h>
-+#include <linux/mount.h>
- #include <asm/current.h>
+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>
-@@ -52,6 +53,11 @@ long ext2_ioctl(struct file *filp, unsig
+
++int ext2_sync_flags(struct inode *inode, int flags, int vflags)
++{
++ inode->i_flags = flags;
++ inode->i_vflags = vflags;
++ ext2_get_inode_flags(EXT2_I(inode));
++ inode->i_ctime = CURRENT_TIME_SEC;
++ mark_inode_dirty(inode);
++ return 0;
++}
++
+ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ struct inode *inode = filp->f_dentry->d_inode;
+@@ -51,6 +61,11 @@ long ext2_ioctl(struct file *filp, unsig
flags = ext2_mask_flags(inode->i_mode, flags);
mutex_lock(&inode->i_mutex);
/* Is it quota file? Do not allow user to mess with it */
if (IS_NOQUOTA(inode)) {
-@@ -67,7 +73,9 @@ long ext2_ioctl(struct file *filp, unsig
+@@ -66,7 +81,9 @@ long ext2_ioctl(struct file *filp, unsig
*
* This test looks nicer. Thanks to Pauline Middelink
*/
if (!capable(CAP_LINUX_IMMUTABLE)) {
mutex_unlock(&inode->i_mutex);
ret = -EPERM;
-diff -NurpP --minimal linux-2.6.29.1/fs/ext2/namei.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/namei.c
---- linux-2.6.29.1/fs/ext2/namei.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/namei.c 2009-03-24 14:48:35.000000000 +0100
+@@ -74,7 +91,7 @@ long ext2_ioctl(struct file *filp, unsig
+ }
+ }
+
+- flags = flags & EXT2_FL_USER_MODIFIABLE;
++ flags &= EXT2_FL_USER_MODIFIABLE;
+ flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
+ ei->i_flags = flags;
+ mutex_unlock(&inode->i_mutex);
+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 @@
*/
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
-@@ -68,6 +69,7 @@ static struct dentry *ext2_lookup(struct
- inode = ext2_iget(dir->i_sb, ino);
- if (IS_ERR(inode))
- return ERR_CAST(inode);
+@@ -74,6 +75,7 @@ static struct dentry *ext2_lookup(struct
+ return ERR_PTR(-EIO);
+ } else {
+ return ERR_CAST(inode);
+ dx_propagate_tag(nd, inode);
+ }
+ }
}
- return d_splice_alias(inode, dentry);
- }
-@@ -388,6 +390,7 @@ const struct inode_operations ext2_dir_i
+@@ -396,6 +398,7 @@ const struct inode_operations ext2_dir_i
#endif
.setattr = ext2_setattr,
- .permission = ext2_permission,
+ .check_acl = ext2_check_acl,
+ .sync_flags = ext2_sync_flags,
};
const struct inode_operations ext2_special_inode_operations = {
-@@ -399,4 +402,5 @@ const struct inode_operations ext2_speci
- #endif
- .setattr = ext2_setattr,
- .permission = ext2_permission,
-+ .sync_flags = ext2_sync_flags,
- };
-diff -NurpP --minimal linux-2.6.29.1/fs/ext2/super.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/super.c
---- linux-2.6.29.1/fs/ext2/super.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/super.c 2009-03-24 14:48:35.000000000 +0100
-@@ -391,7 +391,8 @@ enum {
+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,
Opt_acl, Opt_noacl, Opt_xip, Opt_ignore, Opt_err, Opt_quota,
};
static const match_table_t tokens = {
-@@ -419,6 +420,9 @@ static const match_table_t tokens = {
+@@ -410,6 +411,9 @@ static const match_table_t tokens = {
{Opt_acl, "acl"},
{Opt_noacl, "noacl"},
{Opt_xip, "xip"},
{Opt_grpquota, "grpquota"},
{Opt_ignore, "noquota"},
{Opt_quota, "quota"},
-@@ -489,6 +493,20 @@ static int parse_options (char * options
+@@ -480,6 +484,20 @@ static int parse_options (char * options
case Opt_nouid32:
set_opt (sbi->s_mount_opt, NO_UID32);
break;
case Opt_nocheck:
clear_opt (sbi->s_mount_opt, CHECK);
break;
-@@ -838,6 +856,8 @@ static int ext2_fill_super(struct super_
+@@ -829,6 +847,8 @@ static int ext2_fill_super(struct super_
if (!parse_options ((char *) data, sbi))
goto failed_mount;
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
MS_POSIXACL : 0);
-@@ -1170,6 +1190,13 @@ static int ext2_remount (struct super_bl
+@@ -1175,6 +1195,14 @@ static int ext2_remount (struct super_bl
goto restore_opts;
}
+ !(sb->s_flags & MS_TAGGED)) {
+ printk("EXT2-fs: %s: tagging not permitted on remount.\n",
+ sb->s_id);
-+ return -EINVAL;
++ err = -EINVAL;
++ goto restore_opts;
+ }
+
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-2.6.29.1/fs/ext2/symlink.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/symlink.c
---- linux-2.6.29.1/fs/ext2/symlink.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/symlink.c 2009-02-22 22:54:25.000000000 +0100
-@@ -38,6 +38,7 @@ const struct inode_operations ext2_symli
- .listxattr = ext2_listxattr,
- .removexattr = generic_removexattr,
- #endif
-+ .sync_flags = ext2_sync_flags,
- };
-
- const struct inode_operations ext2_fast_symlink_inode_operations = {
-@@ -49,4 +50,5 @@ const struct inode_operations ext2_fast_
- .listxattr = ext2_listxattr,
- .removexattr = generic_removexattr,
+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
-+ .sync_flags = ext2_sync_flags,
+ .check_acl = ext3_check_acl,
+ .fiemap = ext3_fiemap,
++ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.29.1/fs/ext2/xattr.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/xattr.c
---- linux-2.6.29.1/fs/ext2/xattr.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext2/xattr.c 2009-02-22 22:54:25.000000000 +0100
-@@ -60,6 +60,7 @@
- #include <linux/mbcache.h>
- #include <linux/quotaops.h>
- #include <linux/rwsem.h>
-+#include <linux/vs_dlimit.h>
- #include "ext2.h"
- #include "xattr.h"
- #include "acl.h"
-@@ -641,8 +642,12 @@ ext2_xattr_set2(struct inode *inode, str
- the inode. */
- ea_bdebug(new_bh, "reusing block");
-
-+ error = -ENOSPC;
-+ if (DLIMIT_ALLOC_BLOCK(inode, 1))
-+ goto cleanup;
- error = -EDQUOT;
- if (DQUOT_ALLOC_BLOCK(inode, 1)) {
-+ DLIMIT_FREE_BLOCK(inode, 1);
- unlock_buffer(new_bh);
- goto cleanup;
- }
-@@ -731,6 +736,7 @@ ext2_xattr_set2(struct inode *inode, str
- le32_add_cpu(&HDR(old_bh)->h_refcount, -1);
- if (ce)
- mb_cache_entry_release(ce);
-+ DLIMIT_FREE_BLOCK(inode, 1);
- DQUOT_FREE_BLOCK(inode, 1);
- mark_buffer_dirty(old_bh);
- ea_bdebug(old_bh, "refcount now=%d",
-@@ -794,6 +800,7 @@ ext2_xattr_delete_inode(struct inode *in
- mark_buffer_dirty(bh);
- if (IS_SYNC(inode))
- sync_dirty_buffer(bh);
-+ DLIMIT_FREE_BLOCK(inode, 1);
- DQUOT_FREE_BLOCK(inode, 1);
- }
- EXT2_I(inode)->i_file_acl = 0;
-diff -NurpP --minimal linux-2.6.29.1/fs/ext3/balloc.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/balloc.c
---- linux-2.6.29.1/fs/ext3/balloc.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/balloc.c 2009-03-25 00:53:20.000000000 +0100
-@@ -19,6 +19,8 @@
- #include <linux/ext3_jbd.h>
- #include <linux/quotaops.h>
+
+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/vs_dlimit.h>
+ #include <linux/random.h>
+ #include <linux/bitops.h>
+#include <linux/vs_tag.h>
- /*
- * balloc.c contains the blocks allocation and deallocation routines
-@@ -675,8 +677,10 @@ void ext3_free_blocks(handle_t *handle,
- return;
- }
- ext3_free_blocks_sb(handle, sb, block, count, &dquot_freed_blocks);
-- if (dquot_freed_blocks)
-+ if (dquot_freed_blocks) {
-+ DLIMIT_FREE_BLOCK(inode, dquot_freed_blocks);
- DQUOT_FREE_BLOCK(inode, dquot_freed_blocks);
-+ }
- return;
- }
+ #include <asm/byteorder.h>
-@@ -1415,18 +1419,33 @@ out:
- *
- * Check if filesystem has at least 1 free block available for allocation.
- */
--static int ext3_has_free_blocks(struct ext3_sb_info *sbi)
-+static int ext3_has_free_blocks(struct super_block *sb)
- {
-- ext3_fsblk_t free_blocks, root_blocks;
-+ struct ext3_sb_info *sbi = EXT3_SB(sb);
-+ unsigned long long free_blocks, root_blocks;
-+ int cond;
-
- free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
- root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
-- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
-+
-+ vxdprintk(VXD_CBIT(dlim, 3),
-+ "ext3_has_free_blocks(%p): free=%llu, root=%llu",
-+ sb, free_blocks, root_blocks);
-+
-+ DLIMIT_ADJUST_BLOCK(sb, dx_current_tag(), &free_blocks, &root_blocks);
-+
-+ cond = (free_blocks < root_blocks + 1 &&
-+ !capable(CAP_SYS_RESOURCE) &&
- sbi->s_resuid != current_fsuid() &&
-- (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
-- return 0;
-- }
-- return 1;
-+ (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid)));
-+
-+ vxdprintk(VXD_CBIT(dlim, 3),
-+ "ext3_has_free_blocks(%p): %llu<%llu+1, %c, %u!=%u r=%d",
-+ sb, free_blocks, root_blocks,
-+ !capable(CAP_SYS_RESOURCE)?'1':'0',
-+ sbi->s_resuid, current_fsuid(), cond?0:1);
-+
-+ return (cond ? 0 : 1);
- }
-
- /**
-@@ -1443,7 +1462,7 @@ static int ext3_has_free_blocks(struct e
- */
- int ext3_should_retry_alloc(struct super_block *sb, int *retries)
- {
-- if (!ext3_has_free_blocks(EXT3_SB(sb)) || (*retries)++ > 3)
-+ if (!ext3_has_free_blocks(sb) || (*retries)++ > 3)
- return 0;
-
- jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);
-@@ -1506,6 +1525,8 @@ ext3_fsblk_t ext3_new_blocks(handle_t *h
- *errp = -EDQUOT;
- return 0;
- }
-+ if (DLIMIT_ALLOC_BLOCK(inode, num))
-+ goto out_dlimit;
-
- sbi = EXT3_SB(sb);
- es = EXT3_SB(sb)->s_es;
-@@ -1522,7 +1543,7 @@ ext3_fsblk_t ext3_new_blocks(handle_t *h
- if (block_i && ((windowsz = block_i->rsv_window_node.rsv_goal_size) > 0))
- my_rsv = &block_i->rsv_window_node;
-
-- if (!ext3_has_free_blocks(sbi)) {
-+ if (!ext3_has_free_blocks(sb)) {
- *errp = -ENOSPC;
- goto out;
- }
-@@ -1715,12 +1736,16 @@ allocated:
- *errp = 0;
- brelse(bitmap_bh);
- DQUOT_FREE_BLOCK(inode, *count-num);
-+ DLIMIT_FREE_BLOCK(inode, *count-num);
- *count = num;
- return ret_block;
-
- io_error:
- *errp = -EIO;
- out:
-+ if (!performed_allocation)
-+ DLIMIT_FREE_BLOCK(inode, *count);
-+out_dlimit:
- if (fatal) {
- *errp = fatal;
- ext3_std_error(sb, fatal);
-diff -NurpP --minimal linux-2.6.29.1/fs/ext3/file.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/file.c
---- linux-2.6.29.1/fs/ext3/file.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/file.c 2009-02-22 22:54:25.000000000 +0100
-@@ -135,5 +135,6 @@ const struct inode_operations ext3_file_
- #endif
- .permission = ext3_permission,
- .fiemap = ext3_fiemap,
-+ .sync_flags = ext3_sync_flags,
- };
-
-diff -NurpP --minimal linux-2.6.29.1/fs/ext3/ialloc.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/ialloc.c
---- linux-2.6.29.1/fs/ext3/ialloc.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/ialloc.c 2009-03-24 15:44:06.000000000 +0100
-@@ -23,6 +23,8 @@
- #include <linux/buffer_head.h>
- #include <linux/random.h>
- #include <linux/bitops.h>
-+#include <linux/vs_dlimit.h>
-+#include <linux/vs_tag.h>
-
- #include <asm/byteorder.h>
-
-@@ -127,6 +129,7 @@ void ext3_free_inode (handle_t *handle,
- ext3_xattr_delete_inode(handle, inode);
- DQUOT_FREE_INODE(inode);
- DQUOT_DROP(inode);
-+ DLIMIT_FREE_INODE(inode);
-
- is_directory = S_ISDIR(inode->i_mode);
-
-@@ -440,6 +443,12 @@ struct inode *ext3_new_inode(handle_t *h
- inode = new_inode(sb);
- if (!inode)
- return ERR_PTR(-ENOMEM);
-+
+@@ -548,6 +549,7 @@ got:
+ } else
+ inode->i_gid = current_fsgid();
+ inode->i_mode = mode;
+ inode->i_tag = dx_current_fstag(sb);
-+ if (DLIMIT_ALLOC_INODE(inode)) {
-+ err = -ENOSPC;
-+ goto out_dlimit;
-+ }
- ei = EXT3_I(inode);
- sbi = EXT3_SB(sb);
-@@ -613,6 +622,8 @@ got:
- fail:
- ext3_std_error(sb, err);
- out:
-+ DLIMIT_FREE_INODE(inode);
-+out_dlimit:
- iput(inode);
- ret = ERR_PTR(err);
- really_out:
-@@ -624,6 +635,7 @@ fail_free_drop:
-
- fail_drop:
- DQUOT_DROP(inode);
-+ DLIMIT_FREE_INODE(inode);
- inode->i_flags |= S_NOQUOTA;
- inode->i_nlink = 0;
- unlock_new_inode(inode);
-diff -NurpP --minimal linux-2.6.29.1/fs/ext3/inode.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/inode.c
---- linux-2.6.29.1/fs/ext3/inode.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/inode.c 2009-03-24 15:44:29.000000000 +0100
+ inode->i_ino = ino;
+ /* This is the optimal IO size (for stat), not the fs block size */
+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>
#include "xattr.h"
#include "acl.h"
-@@ -2288,7 +2289,7 @@ static void ext3_free_branches(handle_t
+@@ -2343,7 +2344,7 @@ static void ext3_free_branches(handle_t
int ext3_can_truncate(struct inode *inode)
{
return 0;
if (S_ISREG(inode->i_mode))
return 1;
-@@ -2662,36 +2663,84 @@ void ext3_set_inode_flags(struct inode *
+@@ -2728,36 +2729,60 @@ void ext3_set_inode_flags(struct inode *
{
unsigned int flags = EXT3_I(inode)->i_flags;
+ ei->i_flags |= EXT3_BARRIER_FL;
+ if (vflags & V_COW)
+ ei->i_flags |= EXT3_COW_FL;
-+}
-+
-+int ext3_sync_flags(struct inode *inode)
-+{
-+ struct ext3_iloc iloc;
-+ handle_t *handle;
-+ int err;
-+
-+ handle = ext3_journal_start(inode, 1);
-+ if (IS_ERR(handle))
-+ return PTR_ERR(handle);
-+ if (IS_SYNC(inode))
-+ handle->h_sync = 1;
-+ err = ext3_reserve_inode_write(handle, inode, &iloc);
-+ if (err)
-+ goto flags_err;
-+
-+ ext3_get_inode_flags(EXT3_I(inode));
-+ inode->i_ctime = CURRENT_TIME;
-+
-+ err = ext3_mark_iloc_dirty(handle, inode, &iloc);
-+flags_err:
-+ ext3_journal_stop(handle);
-+ return err;
}
struct inode *ext3_iget(struct super_block *sb, unsigned long ino)
-@@ -2703,6 +2752,8 @@ struct inode *ext3_iget(struct super_blo
- struct inode *inode;
+@@ -2771,6 +2796,8 @@ struct inode *ext3_iget(struct super_blo
+ transaction_t *transaction;
long ret;
int block;
+ uid_t uid;
inode = iget_locked(sb, ino);
if (!inode)
-@@ -2723,12 +2774,17 @@ struct inode *ext3_iget(struct super_blo
+@@ -2787,12 +2814,17 @@ struct inode *ext3_iget(struct super_blo
bh = iloc.bh;
raw_inode = ext3_raw_inode(&iloc);
inode->i_mode = le16_to_cpu(raw_inode->i_mode);
inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
inode->i_size = le32_to_cpu(raw_inode->i_size);
inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
-@@ -2859,6 +2915,8 @@ static int ext3_do_update_inode(handle_t
+@@ -2947,6 +2979,8 @@ static int ext3_do_update_inode(handle_t
struct ext3_inode *raw_inode = ext3_raw_inode(iloc);
struct ext3_inode_info *ei = EXT3_I(inode);
struct buffer_head *bh = iloc->bh;
+ gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
int err = 0, rc, block;
- /* For fields not not tracking in the in-memory inode,
-@@ -2869,29 +2927,32 @@ static int ext3_do_update_inode(handle_t
+ again:
+@@ -2961,29 +2995,32 @@ again:
ext3_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);
raw_inode->i_size = cpu_to_le32(ei->i_disksize);
raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
-@@ -3044,7 +3105,8 @@ int ext3_setattr(struct dentry *dentry,
+@@ -3141,7 +3178,8 @@ int ext3_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,
-@@ -3066,6 +3128,8 @@ int ext3_setattr(struct dentry *dentry,
+@@ -3163,6 +3201,8 @@ int ext3_setattr(struct dentry *dentry,
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-2.6.29.1/fs/ext3/ioctl.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/ioctl.c
---- linux-2.6.29.1/fs/ext3/ioctl.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/ioctl.c 2009-03-24 14:48:35.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 @@
*/
#include <linux/jbd.h>
#include <linux/capability.h>
#include <linux/ext3_fs.h>
-@@ -16,6 +17,7 @@
- #include <linux/time.h>
+@@ -17,6 +18,34 @@
#include <linux/compat.h>
- #include <linux/smp_lock.h>
-+#include <linux/vs_tag.h>
#include <asm/uaccess.h>
- int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
-@@ -55,6 +57,11 @@ int ext3_ioctl (struct inode * inode, st
++
++int ext3_sync_flags(struct inode *inode, int flags, int vflags)
++{
++ handle_t *handle = NULL;
++ struct ext3_iloc iloc;
++ int err;
++
++ handle = ext3_journal_start(inode, 1);
++ if (IS_ERR(handle))
++ return PTR_ERR(handle);
++
++ if (IS_SYNC(inode))
++ handle->h_sync = 1;
++ err = ext3_reserve_inode_write(handle, inode, &iloc);
++ if (err)
++ goto flags_err;
++
++ inode->i_flags = flags;
++ inode->i_vflags = vflags;
++ ext3_get_inode_flags(EXT3_I(inode));
++ inode->i_ctime = CURRENT_TIME_SEC;
++
++ err = ext3_mark_iloc_dirty(handle, inode, &iloc);
++flags_err:
++ ext3_journal_stop(handle);
++ return err;
++}
++
+ long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ struct inode *inode = filp->f_dentry->d_inode;
+@@ -50,6 +79,11 @@ long ext3_ioctl(struct file *filp, unsig
flags = ext3_mask_flags(inode->i_mode, flags);
+ }
+
mutex_lock(&inode->i_mutex);
+
/* Is it quota file? Do not allow user to mess with it */
- if (IS_NOQUOTA(inode)) {
-@@ -73,7 +80,9 @@ int ext3_ioctl (struct inode * inode, st
+@@ -68,7 +102,9 @@ long ext3_ioctl(struct file *filp, unsig
*
* This test looks nicer. Thanks to Pauline Middelink
*/
+ if ((oldflags & EXT3_IMMUTABLE_FL) ||
+ ((flags ^ oldflags) & (EXT3_APPEND_FL |
+ EXT3_IMMUTABLE_FL | EXT3_IXUNLINK_FL))) {
- if (!capable(CAP_LINUX_IMMUTABLE)) {
- mutex_unlock(&inode->i_mutex);
- err = -EPERM;
-diff -NurpP --minimal linux-2.6.29.1/fs/ext3/namei.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/namei.c
---- linux-2.6.29.1/fs/ext3/namei.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/namei.c 2009-03-24 14:48:35.000000000 +0100
+ if (!capable(CAP_LINUX_IMMUTABLE))
+ goto flags_out;
+ }
+@@ -93,7 +129,7 @@ long ext3_ioctl(struct file *filp, unsig
+ if (err)
+ goto flags_err;
+
+- flags = flags & EXT3_FL_USER_MODIFIABLE;
++ flags &= EXT3_FL_USER_MODIFIABLE;
+ flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
+ ei->i_flags = flags;
+
+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;
-@@ -2433,6 +2435,7 @@ const struct inode_operations ext3_dir_i
+@@ -2455,6 +2457,7 @@ const struct inode_operations ext3_dir_i
.removexattr = generic_removexattr,
#endif
- .permission = ext3_permission,
+ .check_acl = ext3_check_acl,
+ .sync_flags = ext3_sync_flags,
};
const struct inode_operations ext3_special_inode_operations = {
-@@ -2444,4 +2447,5 @@ const struct inode_operations ext3_speci
- .removexattr = generic_removexattr,
- #endif
- .permission = ext3_permission,
-+ .sync_flags = ext3_sync_flags,
- };
-diff -NurpP --minimal linux-2.6.29.1/fs/ext3/super.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/super.c
---- linux-2.6.29.1/fs/ext3/super.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/super.c 2009-03-24 14:48:35.000000000 +0100
-@@ -790,7 +790,7 @@ enum {
+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,
Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
};
static const match_table_t tokens = {
-@@ -843,6 +843,9 @@ static const match_table_t tokens = {
+@@ -842,6 +842,9 @@ static const match_table_t tokens = {
{Opt_usrquota, "usrquota"},
{Opt_barrier, "barrier=%u"},
{Opt_resize, "resize"},
{Opt_err, NULL},
};
-@@ -935,6 +938,20 @@ static int parse_options (char *options,
+@@ -934,6 +937,20 @@ static int parse_options (char *options,
case Opt_nouid32:
set_opt (sbi->s_mount_opt, NO_UID32);
break;
case Opt_nocheck:
clear_opt (sbi->s_mount_opt, CHECK);
break;
-@@ -1653,6 +1670,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,13 @@ 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 & MS_TAGGED)) {
+ printk("EXT3-fs: %s: tagging not permitted on remount.\n",
+ sb->s_id);
-+ return -EINVAL;
++ err = -EINVAL;
++ goto restore_opts;
+ }
+
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.29.1/fs/ext3/symlink.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/symlink.c
---- linux-2.6.29.1/fs/ext3/symlink.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/symlink.c 2009-02-22 22:54:25.000000000 +0100
-@@ -40,6 +40,7 @@ const struct inode_operations ext3_symli
- .listxattr = ext3_listxattr,
- .removexattr = generic_removexattr,
- #endif
-+ .sync_flags = ext3_sync_flags,
- };
-
- const struct inode_operations ext3_fast_symlink_inode_operations = {
-@@ -51,4 +52,5 @@ const struct inode_operations ext3_fast_
- .listxattr = ext3_listxattr,
- .removexattr = generic_removexattr,
- #endif
-+ .sync_flags = ext3_sync_flags,
- };
-diff -NurpP --minimal linux-2.6.29.1/fs/ext3/xattr.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/xattr.c
---- linux-2.6.29.1/fs/ext3/xattr.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext3/xattr.c 2009-02-22 22:54:25.000000000 +0100
-@@ -58,6 +58,7 @@
- #include <linux/mbcache.h>
- #include <linux/quotaops.h>
- #include <linux/rwsem.h>
-+#include <linux/vs_dlimit.h>
- #include "xattr.h"
- #include "acl.h"
-
-@@ -498,6 +499,7 @@ ext3_xattr_release_block(handle_t *handl
- error = ext3_journal_dirty_metadata(handle, bh);
- if (IS_SYNC(inode))
- handle->h_sync = 1;
-+ DLIMIT_FREE_BLOCK(inode, 1);
- DQUOT_FREE_BLOCK(inode, 1);
- ea_bdebug(bh, "refcount now=%d; releasing",
- le32_to_cpu(BHDR(bh)->h_refcount));
-@@ -771,11 +773,14 @@ inserted:
- if (new_bh == bs->bh)
- ea_bdebug(new_bh, "keeping");
- else {
-+ error = -ENOSPC;
-+ if (DLIMIT_ALLOC_BLOCK(inode, 1))
-+ goto cleanup;
- /* The old block is released after updating
- the inode. */
- error = -EDQUOT;
- if (DQUOT_ALLOC_BLOCK(inode, 1))
-- goto cleanup;
-+ goto cleanup_dlimit;
- error = ext3_journal_get_write_access(handle,
- new_bh);
- if (error)
-@@ -849,6 +854,8 @@ cleanup:
-
- cleanup_dquot:
- DQUOT_FREE_BLOCK(inode, 1);
-+cleanup_dlimit:
-+ DLIMIT_FREE_BLOCK(inode, 1);
- goto cleanup;
-
- bad_block:
-diff -NurpP --minimal linux-2.6.29.1/fs/ext4/balloc.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/balloc.c
---- linux-2.6.29.1/fs/ext4/balloc.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/balloc.c 2009-03-24 14:48:35.000000000 +0100
-@@ -17,6 +17,8 @@
- #include <linux/jbd2.h>
- #include <linux/quotaops.h>
- #include <linux/buffer_head.h>
-+#include <linux/vs_dlimit.h>
-+#include <linux/vs_tag.h>
- #include "ext4.h"
- #include "ext4_jbd2.h"
- #include "group.h"
-@@ -535,8 +537,10 @@ void ext4_free_blocks(handle_t *handle,
-
- ext4_mb_free_blocks(handle, inode, block, count,
- metadata, &dquot_freed_blocks);
-- if (dquot_freed_blocks)
-+ if (dquot_freed_blocks) {
-+ DLIMIT_FREE_BLOCK(inode, dquot_freed_blocks);
- DQUOT_FREE_BLOCK(inode, dquot_freed_blocks);
-+ }
- return;
- }
-
-diff -NurpP --minimal linux-2.6.29.1/fs/ext4/ext4.h linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/ext4.h
---- linux-2.6.29.1/fs/ext4/ext4.h 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/ext4.h 2009-03-24 15:44:56.000000000 +0100
-@@ -243,8 +243,12 @@ struct flex_groups {
- #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_EXT_MIGRATE 0x00100000 /* Inode is migrating */
+ #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 */
-@@ -541,6 +545,7 @@ do { \
- #define EXT4_MOUNT_I_VERSION 0x2000000 /* i_version support */
- #define EXT4_MOUNT_DELALLOC 0x8000000 /* Delalloc support */
- #define EXT4_MOUNT_DATA_ERR_ABORT 0x10000000 /* Abort on file data write */
-+#define EXT4_MOUNT_TAGGED (1<<24) /* Enable Context Tags */
+@@ -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] */
+- __u32 l_i_reserved2;
++ __le16 l_i_tag; /* Context Tag */
++ __u16 l_i_reserved2;
+ } linux2;
+ struct {
+ __le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */
+@@ -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_raw_tag osd2.linux2.l_i_tag
+ #define i_reserved2 osd2.linux2.l_i_reserved2
- /* Compatibility, for having both ext2_fs.h and ext4_fs.h included at once */
- #ifndef _LINUX_EXT2_FS_H
-@@ -1076,6 +1081,7 @@ struct buffer_head *ext4_bread(handle_t
- ext4_lblk_t, int, int *);
- int ext4_get_block(struct inode *inode, sector_t iblock,
- struct buffer_head *bh_result, int create);
-+extern int ext4_sync_flags(struct inode *inode);
-
- extern struct inode *ext4_iget(struct super_block *, unsigned long);
- extern int ext4_write_inode(struct inode *, int);
-diff -NurpP --minimal linux-2.6.29.1/fs/ext4/file.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/file.c
---- linux-2.6.29.1/fs/ext4/file.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/file.c 2009-03-24 14:48:35.000000000 +0100
-@@ -171,5 +171,6 @@ const struct inode_operations ext4_file_
- .permission = ext4_permission,
+ #elif defined(__GNU__)
+@@ -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_TAGGED 0x400000 /* Enable Context Tags */
+ #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 */
+@@ -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);
++extern int ext4_sync_flags(struct inode *, int, int);
+ /* 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.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,
.fiemap = ext4_fiemap,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-2.6.29.1/fs/ext4/ialloc.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/ialloc.c
---- linux-2.6.29.1/fs/ext4/ialloc.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/ialloc.c 2009-03-24 14:48:35.000000000 +0100
-@@ -22,6 +22,8 @@
+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 <linux/blkdev.h>
-+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
#include <asm/byteorder.h>
- #include "ext4.h"
- #include "ext4_jbd2.h"
-@@ -224,6 +226,7 @@ void ext4_free_inode(handle_t *handle, s
- ext4_xattr_delete_inode(handle, inode);
- DQUOT_FREE_INODE(inode);
- DQUOT_DROP(inode);
-+ DLIMIT_FREE_INODE(inode);
-
- is_directory = S_ISDIR(inode->i_mode);
-@@ -711,6 +714,12 @@ struct inode *ext4_new_inode(handle_t *h
- inode = new_inode(sb);
- if (!inode)
- return ERR_PTR(-ENOMEM);
-+
+ #include "ext4.h"
+@@ -988,6 +989,7 @@ got:
+ } else
+ inode->i_gid = current_fsgid();
+ inode->i_mode = mode;
+ inode->i_tag = dx_current_fstag(sb);
-+ if (DLIMIT_ALLOC_INODE(inode)) {
-+ err = -ENOSPC;
-+ goto out_dlimit;
-+ }
- ei = EXT4_I(inode);
- sbi = EXT4_SB(sb);
-@@ -889,7 +898,8 @@ got:
- * newly created directory and file only if -o extent mount option is
- * specified
- */
-- ei->i_flags = EXT4_I(dir)->i_flags & ~(EXT4_INDEX_FL|EXT4_EXTENTS_FL);
-+ ei->i_flags = EXT4_I(dir)->i_flags &
-+ ~(EXT4_INDEX_FL|EXT4_EXTENTS_FL|EXT4_IXUNLINK_FL|EXT4_BARRIER_FL);
- if (S_ISLNK(mode))
- ei->i_flags &= ~(EXT4_IMMUTABLE_FL|EXT4_APPEND_FL);
- /* dirsync only applies to directories */
-@@ -949,6 +959,8 @@ got:
- fail:
- ext4_std_error(sb, err);
- out:
-+ DLIMIT_FREE_INODE(inode);
-+out_dlimit:
- iput(inode);
- ret = ERR_PTR(err);
- really_out:
-@@ -960,6 +972,7 @@ fail_free_drop:
-
- fail_drop:
- DQUOT_DROP(inode);
-+ DLIMIT_FREE_INODE(inode);
- inode->i_flags |= S_NOQUOTA;
- inode->i_nlink = 0;
- unlock_new_inode(inode);
-diff -NurpP --minimal linux-2.6.29.1/fs/ext4/inode.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/inode.c
---- linux-2.6.29.1/fs/ext4/inode.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/inode.c 2009-03-24 14:48:35.000000000 +0100
-@@ -37,6 +37,7 @@
- #include <linux/namei.h>
+ 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.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 <linux/workqueue.h>
+#include <linux/vs_tag.h>
+
#include "ext4_jbd2.h"
#include "xattr.h"
- #include "acl.h"
-@@ -3781,7 +3782,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;
-@@ -4134,37 +4135,86 @@ 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;
-+}
-+
-+int ext4_sync_flags(struct inode *inode)
-+{
-+ struct ext4_iloc iloc;
-+ handle_t *handle;
-+ int err;
-+
-+ handle = ext4_journal_start(inode, 1);
-+ if (IS_ERR(handle))
-+ return PTR_ERR(handle);
-+ if (IS_SYNC(inode))
-+ handle->h_sync = 1;
-+ err = ext4_reserve_inode_write(handle, inode, &iloc);
-+ if (err)
-+ goto flags_err;
-+
-+ ext4_get_inode_flags(EXT4_I(inode));
-+ inode->i_ctime = CURRENT_TIME;
-+
-+ err = ext4_mark_iloc_dirty(handle, inode, &iloc);
-+flags_err:
-+ ext4_journal_stop(handle);
-+ return err;
+ 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,
- struct ext4_inode_info *ei)
- {
-@@ -4197,6 +4247,8 @@ struct inode *ext4_iget(struct super_blo
- struct inode *inode;
+
+@@ -4869,6 +4893,8 @@ struct inode *ext4_iget(struct super_blo
+ journal_t *journal = EXT4_SB(sb)->s_journal;
long ret;
int block;
+ uid_t uid;
inode = iget_locked(sb, ino);
if (!inode)
-@@ -4216,12 +4268,16 @@ struct inode *ext4_iget(struct super_blo
- bh = iloc.bh;
+@@ -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);
- inode->i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
+ le16_to_cpu(raw_inode->i_raw_tag));
inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
- ei->i_state = 0;
-@@ -4387,6 +4443,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,
-@@ -4397,29 +4455,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);
-@@ -4601,7 +4662,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,
-@@ -4623,6 +4685,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.29.1/fs/ext4/ioctl.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/ioctl.c
---- linux-2.6.29.1/fs/ext4/ioctl.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/ioctl.c 2009-03-24 14:48:35.000000000 +0100
-@@ -8,12 +8,14 @@
- */
-
- #include <linux/fs.h>
-+#include <linux/mount.h>
- #include <linux/jbd2.h>
- #include <linux/capability.h>
- #include <linux/time.h>
+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/smp_lock.h>
#include <linux/mount.h>
+ #include <linux/file.h>
+#include <linux/vs_tag.h>
#include <asm/uaccess.h>
#include "ext4_jbd2.h"
#include "ext4.h"
-@@ -51,6 +53,11 @@ long ext4_ioctl(struct file *filp, unsig
- if (!S_ISDIR(inode->i_mode))
- flags &= ~EXT4_DIRSYNC_FL;
+
++
++int ext4_sync_flags(struct inode *inode, int flags, int vflags)
++{
++ handle_t *handle = NULL;
++ struct ext4_iloc iloc;
++ int err;
++
++ handle = ext4_journal_start(inode, 1);
++ if (IS_ERR(handle))
++ return PTR_ERR(handle);
++
++ if (IS_SYNC(inode))
++ ext4_handle_sync(handle);
++ err = ext4_reserve_inode_write(handle, inode, &iloc);
++ if (err)
++ goto flags_err;
++
++ inode->i_flags = flags;
++ inode->i_vflags = vflags;
++ ext4_get_inode_flags(EXT4_I(inode));
++ inode->i_ctime = ext4_current_time(inode);
++
++ err = ext4_mark_iloc_dirty(handle, inode, &iloc);
++flags_err:
++ ext4_journal_stop(handle);
++ return err;
++}
++
+ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ struct inode *inode = filp->f_dentry->d_inode;
+@@ -50,6 +79,11 @@ long ext4_ioctl(struct file *filp, unsig
+
+ flags = ext4_mask_flags(inode->i_mode, flags);
+ if (IS_BARRIER(inode)) {
+ vxwprintk_task(1, "messing with the barrier.");
err = -EPERM;
mutex_lock(&inode->i_mutex);
/* Is it quota file? Do not allow user to mess with it */
-@@ -68,7 +75,9 @@ long ext4_ioctl(struct file *filp, unsig
+@@ -67,7 +101,9 @@ long ext4_ioctl(struct file *filp, unsig
*
* This test looks nicer. Thanks to Pauline Middelink
*/
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-2.6.29.1/fs/ext4/namei.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/namei.c
---- linux-2.6.29.1/fs/ext4/namei.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/namei.c 2009-03-24 14:48:35.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>
#include "ext4.h"
#include "ext4_jbd2.h"
-@@ -917,6 +918,7 @@ restart:
+@@ -941,6 +942,7 @@ restart:
if (bh)
ll_rw_block(READ_META, 1, &bh);
}
}
if ((bh = bh_use[ra_ptr++]) == NULL)
goto next;
-@@ -2481,6 +2483,7 @@ const struct inode_operations ext4_dir_i
- .removexattr = generic_removexattr,
+@@ -2543,6 +2545,7 @@ const struct inode_operations ext4_dir_i
#endif
- .permission = ext4_permission,
+ .check_acl = ext4_check_acl,
+ .fiemap = ext4_fiemap,
+ .sync_flags = ext4_sync_flags,
};
const struct inode_operations ext4_special_inode_operations = {
-@@ -2492,4 +2495,5 @@ const struct inode_operations ext4_speci
- .removexattr = generic_removexattr,
- #endif
- .permission = ext4_permission,
-+ .sync_flags = ext4_sync_flags,
- };
-diff -NurpP --minimal linux-2.6.29.1/fs/ext4/super.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/super.c
---- linux-2.6.29.1/fs/ext4/super.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/super.c 2009-03-24 15:46:48.000000000 +0100
-@@ -1013,7 +1013,8 @@ enum {
- Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
- Opt_grpquota, Opt_i_version,
- Opt_stripe, Opt_delalloc, Opt_nodelalloc,
-- Opt_inode_readahead_blks, Opt_journal_ioprio
-+ Opt_inode_readahead_blks, Opt_journal_ioprio,
-+ Opt_tag, Opt_notag, Opt_tagid
+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,
++ Opt_tag, Opt_notag, Opt_tagid
};
static const match_table_t tokens = {
-@@ -1073,6 +1074,9 @@ static const match_table_t tokens = {
- {Opt_nodelalloc, "nodelalloc"},
- {Opt_inode_readahead_blks, "inode_readahead_blks=%u"},
- {Opt_journal_ioprio, "journal_ioprio=%u"},
+@@ -1167,6 +1168,9 @@ static const match_table_t tokens = {
+ {Opt_noauto_da_alloc, "noauto_da_alloc"},
+ {Opt_discard, "discard"},
+ {Opt_nodiscard, "nodiscard"},
+ {Opt_tag, "tag"},
+ {Opt_notag, "notag"},
+ {Opt_tagid, "tagid=%u"},
{Opt_err, NULL},
};
-@@ -1168,6 +1172,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;
-@@ -2113,6 +2131,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);
-@@ -3160,6 +3181,13 @@ static int ext4_remount(struct super_blo
- if (sbi->s_mount_opt & EXT4_MOUNT_ABORT)
+@@ -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");
+ if ((sbi->s_mount_opt & EXT4_MOUNT_TAGGED) &&
+ !(sb->s_flags & MS_TAGGED)) {
+ printk("EXT4-fs: %s: tagging not permitted on remount.\n",
+ sb->s_id);
-+ return -EINVAL;
++ err = -EINVAL;
++ goto restore_opts;
+ }
+
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.29.1/fs/ext4/symlink.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/symlink.c
---- linux-2.6.29.1/fs/ext4/symlink.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/symlink.c 2009-02-22 22:54:25.000000000 +0100
-@@ -40,6 +40,7 @@ const struct inode_operations ext4_symli
- .listxattr = ext4_listxattr,
- .removexattr = generic_removexattr,
- #endif
-+ .sync_flags = ext4_sync_flags,
- };
-
- const struct inode_operations ext4_fast_symlink_inode_operations = {
-@@ -51,4 +52,5 @@ const struct inode_operations ext4_fast_
- .listxattr = ext4_listxattr,
- .removexattr = generic_removexattr,
- #endif
-+ .sync_flags = ext4_sync_flags,
- };
-diff -NurpP --minimal linux-2.6.29.1/fs/ext4/xattr.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/xattr.c
---- linux-2.6.29.1/fs/ext4/xattr.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ext4/xattr.c 2009-03-24 15:47:44.000000000 +0100
-@@ -56,6 +56,7 @@
- #include <linux/mbcache.h>
- #include <linux/quotaops.h>
- #include <linux/rwsem.h>
-+#include <linux/vs_dlimit.h>
- #include "ext4_jbd2.h"
- #include "ext4.h"
- #include "xattr.h"
-@@ -490,6 +491,7 @@ ext4_xattr_release_block(handle_t *handl
- error = ext4_handle_dirty_metadata(handle, inode, bh);
- if (IS_SYNC(inode))
- ext4_handle_sync(handle);
-+ DLIMIT_FREE_BLOCK(inode, 1);
- DQUOT_FREE_BLOCK(inode, 1);
- ea_bdebug(bh, "refcount now=%d; releasing",
- le32_to_cpu(BHDR(bh)->h_refcount));
-@@ -781,11 +783,14 @@ inserted:
- if (new_bh == bs->bh)
- ea_bdebug(new_bh, "keeping");
- else {
-+ error = -ENOSPC;
-+ if (DLIMIT_ALLOC_BLOCK(inode, 1))
-+ goto cleanup;
- /* The old block is released after updating
- the inode. */
- error = -EDQUOT;
- if (DQUOT_ALLOC_BLOCK(inode, 1))
-- goto cleanup;
-+ goto cleanup_dlimit;
- error = ext4_journal_get_write_access(handle,
- new_bh);
- if (error)
-@@ -861,6 +866,8 @@ cleanup:
-
- cleanup_dquot:
- DQUOT_FREE_BLOCK(inode, 1);
-+cleanup_dlimit:
-+ DLIMIT_FREE_BLOCK(inode, 1);
- goto cleanup;
-
- bad_block:
-diff -NurpP --minimal linux-2.6.29.1/fs/fcntl.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/fcntl.c
---- linux-2.6.29.1/fs/fcntl.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/fcntl.c 2009-03-24 14:48:35.000000000 +0100
-@@ -20,6 +20,7 @@
+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>
#include <linux/pid_namespace.h>
- #include <linux/smp_lock.h>
+#include <linux/vs_limit.h>
#include <asm/poll.h>
#include <asm/siginfo.h>
-@@ -103,6 +104,8 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldf
+@@ -102,6 +103,8 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldf
if (tofree)
filp_close(tofree, files);
return newfd;
-@@ -343,6 +346,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
+@@ -426,6 +429,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
filp = fget(fd);
if (!filp)
goto out;
err = security_file_fcntl(filp, cmd, arg);
if (err) {
-diff -NurpP --minimal linux-2.6.29.1/fs/file.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/file.c
---- linux-2.6.29.1/fs/file.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/file.c 2009-02-22 22:54:25.000000000 +0100
-@@ -19,6 +19,7 @@
+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>
#include <linux/workqueue.h>
struct fdtable_defer {
spinlock_t lock;
-@@ -367,6 +368,8 @@ struct files_struct *dup_fd(struct files
+@@ -368,6 +369,8 @@ struct files_struct *dup_fd(struct files
struct file *f = *old_fds++;
if (f) {
get_file(f);
} else {
/*
* The fd may be claimed in the fd bitmap but not yet
-@@ -475,6 +478,7 @@ repeat:
+@@ -476,6 +479,7 @@ repeat:
else
FD_CLR(fd, fdt->close_on_exec);
error = fd;
#if 1
/* Sanity check */
if (rcu_dereference(fdt->fd[fd]) != NULL) {
-diff -NurpP --minimal linux-2.6.29.1/fs/file_table.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/file_table.c
---- linux-2.6.29.1/fs/file_table.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/file_table.c 2009-03-24 14:48:35.000000000 +0100
-@@ -21,6 +21,8 @@
+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>
#include <linux/percpu_counter.h>
#include <asm/atomic.h>
-@@ -129,6 +131,8 @@ struct file *get_empty_filp(void)
- f->f_cred = get_cred(cred);
+@@ -131,6 +133,8 @@ struct file *get_empty_filp(void)
+ spin_lock_init(&f->f_lock);
eventpoll_init_file(f);
/* f->f_version: 0 */
+ f->f_xid = vx_current_xid();
return f;
over:
-@@ -283,6 +287,8 @@ void __fput(struct file *file)
+@@ -285,6 +289,8 @@ void __fput(struct file *file)
cdev_put(inode->i_cdev);
fops_put(file->f_op);
put_pid(file->f_owner.pid);
file_kill(file);
if (file->f_mode & FMODE_WRITE)
drop_file_write_access(file);
-@@ -350,6 +356,8 @@ void put_filp(struct file *file)
+@@ -352,6 +358,8 @@ void put_filp(struct file *file)
{
if (atomic_long_dec_and_test(&file->f_count)) {
security_file_free(file);
file_kill(file);
file_free(file);
}
-diff -NurpP --minimal linux-2.6.29.1/fs/hfsplus/ioctl.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/hfsplus/ioctl.c
---- linux-2.6.29.1/fs/hfsplus/ioctl.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/hfsplus/ioctl.c 2009-02-22 22:54:25.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>
+ #include <linux/fs_struct.h>
++#include <linux/vserver/global.h>
+
+ /*
+ * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values.
+@@ -77,6 +78,7 @@ void free_fs_struct(struct fs_struct *fs
+ {
+ path_put(&fs->root);
+ path_put(&fs->pwd);
++ atomic_dec(&vs_global_fs);
+ kmem_cache_free(fs_cachep, fs);
+ }
+
+@@ -112,6 +114,7 @@ struct fs_struct *copy_fs_struct(struct
+ fs->pwd = old->pwd;
+ path_get(&old->pwd);
+ read_unlock(&old->lock);
++ atomic_inc(&vs_global_fs);
+ }
+ return fs;
+ }
+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,
+ [14] = GFS2_DIF_INHERIT_JDATA,
++ [27] = GFS2_DIF_IXUNLINK,
++ [26] = GFS2_DIF_BARRIER,
++ [29] = GFS2_DIF_COW,
+ };
+
+ static const u32 gfs2_to_fsflags[32] = {
+@@ -141,6 +144,9 @@ static const u32 gfs2_to_fsflags[32] = {
+ [gfs2fl_NoAtime] = FS_NOATIME_FL,
+ [gfs2fl_ExHash] = FS_INDEX_FL,
+ [gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL,
++ [gfs2fl_IXUnlink] = FS_IXUNLINK_FL,
++ [gfs2fl_Barrier] = FS_BARRIER_FL,
++ [gfs2fl_Cow] = FS_COW_FL,
+ };
+
+ static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
+@@ -171,10 +177,16 @@ void gfs2_set_inode_flags(struct inode *
+ {
+ struct gfs2_inode *ip = GFS2_I(inode);
+ unsigned int flags = inode->i_flags;
++ unsigned int vflags = inode->i_vflags;
++
++ flags &= ~(S_IMMUTABLE | S_IXUNLINK |
++ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
+
+- flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
+ if (ip->i_diskflags & GFS2_DIF_IMMUTABLE)
+ flags |= S_IMMUTABLE;
++ if (ip->i_diskflags & GFS2_DIF_IXUNLINK)
++ flags |= S_IXUNLINK;
++
+ if (ip->i_diskflags & GFS2_DIF_APPENDONLY)
+ flags |= S_APPEND;
+ if (ip->i_diskflags & GFS2_DIF_NOATIME)
+@@ -182,6 +194,43 @@ void gfs2_set_inode_flags(struct inode *
+ if (ip->i_diskflags & GFS2_DIF_SYNC)
+ flags |= S_SYNC;
+ inode->i_flags = flags;
++
++ vflags &= ~(V_BARRIER | V_COW);
++
++ if (ip->i_diskflags & GFS2_DIF_BARRIER)
++ vflags |= V_BARRIER;
++ if (ip->i_diskflags & GFS2_DIF_COW)
++ vflags |= V_COW;
++ inode->i_vflags = vflags;
++}
++
++void gfs2_get_inode_flags(struct inode *inode)
++{
++ struct gfs2_inode *ip = GFS2_I(inode);
++ unsigned int flags = inode->i_flags;
++ unsigned int vflags = inode->i_vflags;
++
++ ip->i_diskflags &= ~(GFS2_DIF_APPENDONLY |
++ GFS2_DIF_NOATIME | GFS2_DIF_SYNC |
++ GFS2_DIF_IMMUTABLE | GFS2_DIF_IXUNLINK |
++ GFS2_DIF_BARRIER | GFS2_DIF_COW);
++
++ if (flags & S_IMMUTABLE)
++ ip->i_diskflags |= GFS2_DIF_IMMUTABLE;
++ if (flags & S_IXUNLINK)
++ ip->i_diskflags |= GFS2_DIF_IXUNLINK;
++
++ if (flags & S_APPEND)
++ ip->i_diskflags |= GFS2_DIF_APPENDONLY;
++ if (flags & S_NOATIME)
++ ip->i_diskflags |= GFS2_DIF_NOATIME;
++ if (flags & S_SYNC)
++ ip->i_diskflags |= GFS2_DIF_SYNC;
++
++ if (vflags & V_BARRIER)
++ ip->i_diskflags |= GFS2_DIF_BARRIER;
++ if (vflags & V_COW)
++ ip->i_diskflags |= GFS2_DIF_COW;
+ }
+
+ /* Flags that can be set by user space */
+@@ -293,6 +342,37 @@ static int gfs2_set_flags(struct file *f
+ return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA);
+ }
+
++int gfs2_sync_flags(struct inode *inode, int flags, int vflags)
++{
++ struct gfs2_inode *ip = GFS2_I(inode);
++ struct gfs2_sbd *sdp = GFS2_SB(inode);
++ struct buffer_head *bh;
++ struct gfs2_holder gh;
++ int error;
++
++ error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
++ if (error)
++ return error;
++ error = gfs2_trans_begin(sdp, RES_DINODE, 0);
++ if (error)
++ goto out;
++ error = gfs2_meta_inode_buffer(ip, &bh);
++ if (error)
++ goto out_trans_end;
++ gfs2_trans_add_bh(ip->i_gl, bh, 1);
++ inode->i_flags = flags;
++ inode->i_vflags = vflags;
++ gfs2_get_inode_flags(inode);
++ gfs2_dinode_out(ip, bh->b_data);
++ brelse(bh);
++ gfs2_set_aops(inode);
++out_trans_end:
++ gfs2_trans_end(sdp);
++out:
++ gfs2_glock_dq_uninit(&gh);
++ return error;
++}
++
+ static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ switch(cmd) {
+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;
+
+ extern void gfs2_set_inode_flags(struct inode *inode);
++extern int gfs2_sync_flags(struct inode *inode, int flags, int vflags);
+
+ #ifdef CONFIG_GFS2_FS_LOCKING_DLM
+ extern const struct file_operations gfs2_file_fops;
+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,
+ .fiemap = gfs2_fiemap,
++ .sync_flags = gfs2_sync_flags,
+ };
+
+ const struct inode_operations gfs2_dir_iops = {
+@@ -1420,6 +1421,7 @@ const struct inode_operations gfs2_dir_i
+ .listxattr = gfs2_listxattr,
+ .removexattr = gfs2_removexattr,
+ .fiemap = gfs2_fiemap,
++ .sync_flags = gfs2_sync_flags,
+ };
+
+ const struct inode_operations gfs2_symlink_iops = {
+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.29.1/fs/inode.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/inode.c
---- linux-2.6.29.1/fs/inode.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/inode.c 2009-03-25 00:51:55.000000000 +0100
-@@ -126,6 +126,9 @@ struct inode *inode_init_always(struct s
- struct address_space * const mapping = &inode->i_data;
+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->i_sb = sb;
+
inode->i_blkbits = sb->s_blocksize_bits;
inode->i_flags = 0;
atomic_set(&inode->i_count, 1);
-@@ -146,6 +149,7 @@ struct inode *inode_init_always(struct s
+@@ -153,6 +156,7 @@ int inode_init_always(struct super_block
inode->i_bdev = NULL;
inode->i_cdev = NULL;
inode->i_rdev = 0;
+ inode->i_mdev = 0;
inode->dirtied_when = 0;
- if (security_inode_alloc(inode)) {
- if (inode->i_sb->s_op->destroy_inode)
-@@ -267,6 +271,8 @@ void __iget(struct inode * inode)
+
+ if (security_inode_alloc(inode))
+@@ -315,6 +319,8 @@ void __iget(struct inode *inode)
inodes_stat.nr_unused--;
}
/**
* clear_inode - clear an inode
* @inode: inode to clear
-@@ -1539,9 +1545,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.29.1/fs/ioctl.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ioctl.c
---- linux-2.6.29.1/fs/ioctl.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ioctl.c 2009-03-24 14:48:35.000000000 +0100
-@@ -15,6 +15,9 @@
- #include <linux/uaccess.h>
+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 <linux/falloc.h>
+#include <linux/proc_fs.h>
+#include <linux/vserver/inode.h>
+#include <linux/vs_tag.h>
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-2.6.29.1/fs/ioprio.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ioprio.c
---- linux-2.6.29.1/fs/ioprio.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ioprio.c 2009-03-24 14:48:35.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.29.1/fs/jfs/acl.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/acl.c
---- linux-2.6.29.1/fs/jfs/acl.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/acl.c 2009-02-22 22:54:25.000000000 +0100
-@@ -232,7 +232,8 @@ int jfs_setattr(struct dentry *dentry, s
+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 ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
- (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {
+ (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid) ||
+ (iattr->ia_valid & ATTR_TAG && iattr->ia_tag != inode->i_tag)) {
- if (DQUOT_TRANSFER(inode, iattr))
+ if (vfs_dq_transfer(inode, iattr))
return -EDQUOT;
}
-diff -NurpP --minimal linux-2.6.29.1/fs/jfs/file.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/file.c
---- linux-2.6.29.1/fs/jfs/file.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/file.c 2009-02-22 22:54:25.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,
- .permission = jfs_permission,
+ .check_acl = jfs_check_acl,
#endif
+ .sync_flags = jfs_sync_flags,
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-2.6.29.1/fs/jfs/inode.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/inode.c
---- linux-2.6.29.1/fs/jfs/inode.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/inode.c 2009-03-24 14:48:35.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <linux/buffer_head.h>
- #include <linux/pagemap.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
- #include "jfs_incore.h"
- #include "jfs_inode.h"
- #include "jfs_filsys.h"
-@@ -161,6 +162,7 @@ void jfs_delete_inode(struct inode *inod
- DQUOT_INIT(inode);
- DQUOT_FREE_INODE(inode);
- DQUOT_DROP(inode);
-+ DLIMIT_FREE_INODE(inode);
- }
-
- clear_inode(inode);
-diff -NurpP --minimal linux-2.6.29.1/fs/jfs/ioctl.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/ioctl.c
---- linux-2.6.29.1/fs/jfs/ioctl.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/ioctl.c 2009-02-22 22:54:25.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>
#include <asm/current.h>
#include <asm/uaccess.h>
-@@ -85,6 +86,11 @@ long jfs_ioctl(struct file *filp, unsign
+@@ -52,6 +53,16 @@ static long jfs_map_ext2(unsigned long f
+ }
+
+
++int jfs_sync_flags(struct inode *inode, int flags, int vflags)
++{
++ inode->i_flags = flags;
++ inode->i_vflags = vflags;
++ jfs_get_inode_flags(JFS_IP(inode));
++ inode->i_ctime = CURRENT_TIME_SEC;
++ mark_inode_dirty(inode);
++ return 0;
++}
++
+ long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ struct inode *inode = filp->f_dentry->d_inode;
+@@ -85,6 +96,11 @@ long jfs_ioctl(struct file *filp, unsign
if (!S_ISDIR(inode->i_mode))
flags &= ~JFS_DIRSYNC_FL;
/* Is it quota file? Do not allow user to mess with it */
if (IS_NOQUOTA(inode)) {
err = -EPERM;
-@@ -102,8 +108,8 @@ long jfs_ioctl(struct file *filp, unsign
+@@ -102,8 +118,8 @@ long jfs_ioctl(struct file *filp, unsign
* the relevant capability.
*/
if ((oldflags & JFS_IMMUTABLE_FL) ||
if (!capable(CAP_LINUX_IMMUTABLE)) {
mutex_unlock(&inode->i_mutex);
err = -EPERM;
-diff -NurpP --minimal linux-2.6.29.1/fs/jfs/jfs_dinode.h linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/jfs_dinode.h
---- linux-2.6.29.1/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/jfs_dinode.h 2009-02-22 22:54:25.000000000 +0100
+@@ -111,7 +127,7 @@ long jfs_ioctl(struct file *filp, unsign
+ }
+ }
+
+- flags = flags & JFS_FL_USER_MODIFIABLE;
++ flags &= JFS_FL_USER_MODIFIABLE;
+ flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
+ jfs_inode->mode2 = flags;
+
+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.29.1/fs/jfs/jfs_dtree.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/jfs_dtree.c
---- linux-2.6.29.1/fs/jfs/jfs_dtree.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/jfs_dtree.c 2009-02-22 22:54:25.000000000 +0100
-@@ -102,6 +102,7 @@
-
- #include <linux/fs.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
- #include "jfs_incore.h"
- #include "jfs_superblock.h"
- #include "jfs_filsys.h"
-@@ -383,10 +384,10 @@ static u32 add_index(tid_t tid, struct i
- */
- if (DQUOT_ALLOC_BLOCK(ip, sbi->nbperpage))
- goto clean_up;
-- if (dbAlloc(ip, 0, sbi->nbperpage, &xaddr)) {
-- DQUOT_FREE_BLOCK(ip, sbi->nbperpage);
-- goto clean_up;
-- }
-+ if (DLIMIT_ALLOC_BLOCK(ip, sbi->nbperpage))
-+ goto clean_up_dquot;
-+ if (dbAlloc(ip, 0, sbi->nbperpage, &xaddr))
-+ goto clean_up_dlimit;
-
- /*
- * Save the table, we're going to overwrite it with the
-@@ -480,6 +481,12 @@ static u32 add_index(tid_t tid, struct i
-
- return index;
-
-+ clean_up_dlimit:
-+ DLIMIT_FREE_BLOCK(ip, sbi->nbperpage);
-+
-+ clean_up_dquot:
-+ DQUOT_FREE_BLOCK(ip, sbi->nbperpage);
-+
- clean_up:
-
- jfs_ip->next_index--;
-@@ -951,6 +958,7 @@ static int dtSplitUp(tid_t tid,
- struct tlock *tlck;
- struct lv *lv;
- int quota_allocation = 0;
-+ int dlimit_allocation = 0;
-
- /* get split page */
- smp = split->mp;
-@@ -1033,6 +1041,12 @@ static int dtSplitUp(tid_t tid,
- }
- quota_allocation += n;
-
-+ if (DLIMIT_ALLOC_BLOCK(ip, n)) {
-+ rc = -ENOSPC;
-+ goto extendOut;
-+ }
-+ dlimit_allocation += n;
-+
- if ((rc = dbReAlloc(sbi->ipbmap, xaddr, (s64) xlen,
- (s64) n, &nxaddr)))
- goto extendOut;
-@@ -1306,6 +1320,9 @@ static int dtSplitUp(tid_t tid,
- freeKeyName:
- kfree(key.name);
-
-+ /* Rollback dlimit allocation */
-+ if (rc && dlimit_allocation)
-+ DLIMIT_FREE_BLOCK(ip, dlimit_allocation);
- /* Rollback quota allocation */
- if (rc && quota_allocation)
- DQUOT_FREE_BLOCK(ip, quota_allocation);
-@@ -1373,6 +1390,12 @@ static int dtSplitPage(tid_t tid, struct
- release_metapage(rmp);
- return -EDQUOT;
- }
-+ /* Allocate blocks to dlimit. */
-+ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) {
-+ DQUOT_FREE_BLOCK(ip, lengthPXD(pxd));
-+ release_metapage(rmp);
-+ return -ENOSPC;
-+ }
-
- jfs_info("dtSplitPage: ip:0x%p smp:0x%p rmp:0x%p", ip, smp, rmp);
-
-@@ -1920,6 +1943,12 @@ static int dtSplitRoot(tid_t tid,
- release_metapage(rmp);
- return -EDQUOT;
- }
-+ /* Allocate blocks to dlimit. */
-+ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) {
-+ DQUOT_FREE_BLOCK(ip, lengthPXD(pxd));
-+ release_metapage(rmp);
-+ return -ENOSPC;
-+ }
-
- BT_MARK_DIRTY(rmp, ip);
- /*
-@@ -2286,6 +2315,8 @@ static int dtDeleteUp(tid_t tid, struct
-
- xlen = lengthPXD(&fp->header.self);
-
-+ /* Free dlimit allocation. */
-+ DLIMIT_FREE_BLOCK(ip, xlen);
- /* Free quota allocation. */
- DQUOT_FREE_BLOCK(ip, xlen);
-
-@@ -2362,6 +2393,8 @@ static int dtDeleteUp(tid_t tid, struct
-
- xlen = lengthPXD(&p->header.self);
-
-+ /* Free dlimit allocation */
-+ DLIMIT_FREE_BLOCK(ip, xlen);
- /* Free quota allocation */
- DQUOT_FREE_BLOCK(ip, xlen);
-
-diff -NurpP --minimal linux-2.6.29.1/fs/jfs/jfs_extent.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/jfs_extent.c
---- linux-2.6.29.1/fs/jfs/jfs_extent.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/jfs_extent.c 2009-02-22 22:54:25.000000000 +0100
-@@ -18,6 +18,7 @@
-
- #include <linux/fs.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
- #include "jfs_incore.h"
- #include "jfs_inode.h"
- #include "jfs_superblock.h"
-@@ -147,6 +148,14 @@ extAlloc(struct inode *ip, s64 xlen, s64
- return -EDQUOT;
- }
-
-+ /* Allocate blocks to dlimit. */
-+ if (DLIMIT_ALLOC_BLOCK(ip, nxlen)) {
-+ DQUOT_FREE_BLOCK(ip, nxlen);
-+ dbFree(ip, nxaddr, (s64) nxlen);
-+ mutex_unlock(&JFS_IP(ip)->commit_mutex);
-+ return -ENOSPC;
-+ }
-+
- /* determine the value of the extent flag */
- xflag = abnr ? XAD_NOTRECORDED : 0;
-
-@@ -164,6 +173,7 @@ extAlloc(struct inode *ip, s64 xlen, s64
- */
- if (rc) {
- dbFree(ip, nxaddr, nxlen);
-+ DLIMIT_FREE_BLOCK(ip, nxlen);
- DQUOT_FREE_BLOCK(ip, nxlen);
- mutex_unlock(&JFS_IP(ip)->commit_mutex);
- return (rc);
-@@ -261,6 +271,13 @@ int extRealloc(struct inode *ip, s64 nxl
- mutex_unlock(&JFS_IP(ip)->commit_mutex);
- return -EDQUOT;
- }
-+ /* Allocate blocks to dlimit. */
-+ if (DLIMIT_ALLOC_BLOCK(ip, nxlen)) {
-+ DQUOT_FREE_BLOCK(ip, nxlen);
-+ dbFree(ip, nxaddr, (s64) nxlen);
-+ up(&JFS_IP(ip)->commit_sem);
-+ return -ENOSPC;
-+ }
-
- delta = nxlen - xlen;
-
-@@ -297,6 +314,7 @@ int extRealloc(struct inode *ip, s64 nxl
- /* extend the extent */
- if ((rc = xtExtend(0, ip, xoff + xlen, (int) nextend, 0))) {
- dbFree(ip, xaddr + xlen, delta);
-+ DLIMIT_FREE_BLOCK(ip, nxlen);
- DQUOT_FREE_BLOCK(ip, nxlen);
- goto exit;
- }
-@@ -308,6 +326,7 @@ int extRealloc(struct inode *ip, s64 nxl
- */
- if ((rc = xtTailgate(0, ip, xoff, (int) ntail, nxaddr, 0))) {
- dbFree(ip, nxaddr, nxlen);
-+ DLIMIT_FREE_BLOCK(ip, nxlen);
- DQUOT_FREE_BLOCK(ip, nxlen);
- goto exit;
- }
-diff -NurpP --minimal linux-2.6.29.1/fs/jfs/jfs_filsys.h linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/jfs_filsys.h
---- linux-2.6.29.1/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/jfs_filsys.h 2009-02-22 22:54:25.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.29.1/fs/jfs/jfs_imap.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/jfs_imap.c
---- linux-2.6.29.1/fs/jfs/jfs_imap.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/jfs_imap.c 2009-03-24 14:48:35.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>
#include "jfs_incore.h"
#include "jfs_inode.h"
-@@ -3062,6 +3063,8 @@ static int copy_from_dinode(struct dinod
+@@ -3059,6 +3060,8 @@ static int copy_from_dinode(struct dinod
{
struct jfs_inode_info *jfs_ip = JFS_IP(ip);
struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb);
jfs_ip->fileset = le32_to_cpu(dip->di_fileset);
jfs_ip->mode2 = le32_to_cpu(dip->di_mode);
-@@ -3082,14 +3085,18 @@ static int copy_from_dinode(struct dinod
+@@ -3079,14 +3082,18 @@ static int copy_from_dinode(struct dinod
}
ip->i_nlink = le32_to_cpu(dip->di_nlink);
if (sbi->gid == -1)
ip->i_gid = jfs_ip->saved_gid;
else {
-@@ -3154,14 +3161,12 @@ static void copy_to_dinode(struct dinode
+@@ -3151,14 +3158,12 @@ static void copy_to_dinode(struct dinode
dip->di_size = cpu_to_le64(ip->i_size);
dip->di_nblocks = cpu_to_le64(PBLK2LBLK(ip->i_sb, ip->i_blocks));
dip->di_nlink = cpu_to_le32(ip->i_nlink);
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-2.6.29.1/fs/jfs/jfs_inode.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/jfs_inode.c
---- linux-2.6.29.1/fs/jfs/jfs_inode.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/jfs_inode.c 2009-03-24 15:58:01.000000000 +0100
-@@ -18,6 +18,8 @@
+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>
#include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
#include "jfs_incore.h"
#include "jfs_inode.h"
#include "jfs_filsys.h"
-@@ -30,29 +32,46 @@ void jfs_set_inode_flags(struct inode *i
+@@ -30,29 +31,46 @@ void jfs_set_inode_flags(struct inode *i
{
unsigned int flags = JFS_IP(inode)->mode2;
if (flags & S_APPEND)
jfs_ip->mode2 |= JFS_APPEND_FL;
if (flags & S_NOATIME)
-@@ -61,6 +80,19 @@ void jfs_get_inode_flags(struct jfs_inod
+@@ -61,6 +79,11 @@ void jfs_get_inode_flags(struct jfs_inod
jfs_ip->mode2 |= JFS_DIRSYNC_FL;
if (flags & S_SYNC)
jfs_ip->mode2 |= JFS_SYNC_FL;
+ jfs_ip->mode2 |= JFS_BARRIER_FL;
+ if (vflags & V_COW)
+ jfs_ip->mode2 |= JFS_COW_FL;
-+}
-+
-+int jfs_sync_flags(struct inode *inode)
-+{
-+ jfs_get_inode_flags(JFS_IP(inode));
-+ inode->i_ctime = CURRENT_TIME;
-+ mark_inode_dirty(inode);
-+ return 0;
}
/*
-@@ -113,6 +145,12 @@ struct inode *ialloc(struct inode *paren
- jfs_inode->saved_uid = inode->i_uid;
- jfs_inode->saved_gid = inode->i_gid;
-
+@@ -105,6 +128,7 @@ struct inode *ialloc(struct inode *paren
+ mode |= S_ISGID;
+ } else
+ inode->i_gid = current_fsgid();
+ inode->i_tag = dx_current_fstag(sb);
-+ if (DLIMIT_ALLOC_INODE(inode)) {
-+ rc = -ENOSPC;
-+ goto fail_drop2;
-+ }
-+
- /*
- * Allocate inode to quota.
- */
-@@ -162,6 +200,8 @@ struct inode *ialloc(struct inode *paren
- return inode;
- fail_drop:
-+ DLIMIT_FREE_INODE(inode);
-+fail_drop2:
- DQUOT_DROP(inode);
- inode->i_flags |= S_NOQUOTA;
- fail_unlock:
-diff -NurpP --minimal linux-2.6.29.1/fs/jfs/jfs_inode.h linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/jfs_inode.h
---- linux-2.6.29.1/fs/jfs/jfs_inode.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/jfs_inode.h 2009-02-22 22:54:25.000000000 +0100
+ /*
+ * New inodes need to save sane values on disk when
+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 void jfs_set_inode_flags(struct inode *);
-+extern int jfs_sync_flags(struct inode *);
++extern int jfs_sync_flags(struct inode *, int, int);
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.29.1/fs/jfs/jfs_xtree.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/jfs_xtree.c
---- linux-2.6.29.1/fs/jfs/jfs_xtree.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/jfs_xtree.c 2009-02-22 22:54:25.000000000 +0100
-@@ -23,6 +23,7 @@
- #include <linux/module.h>
- #include <linux/quotaops.h>
- #include <linux/seq_file.h>
-+#include <linux/vs_dlimit.h>
- #include "jfs_incore.h"
- #include "jfs_filsys.h"
- #include "jfs_metapage.h"
-@@ -848,7 +849,12 @@ int xtInsert(tid_t tid, /* transaction
- hint = 0;
- if ((rc = DQUOT_ALLOC_BLOCK(ip, xlen)))
- goto out;
-+ if ((rc = DLIMIT_ALLOC_BLOCK(ip, xlen))) {
-+ DQUOT_FREE_BLOCK(ip, xlen);
-+ goto out;
-+ }
- if ((rc = dbAlloc(ip, hint, (s64) xlen, &xaddr))) {
-+ DLIMIT_FREE_BLOCK(ip, xlen);
- DQUOT_FREE_BLOCK(ip, xlen);
- goto out;
- }
-@@ -878,6 +884,7 @@ int xtInsert(tid_t tid, /* transaction
- /* undo data extent allocation */
- if (*xaddrp == 0) {
- dbFree(ip, xaddr, (s64) xlen);
-+ DLIMIT_FREE_BLOCK(ip, xlen);
- DQUOT_FREE_BLOCK(ip, xlen);
- }
- return rc;
-@@ -1234,6 +1241,7 @@ xtSplitPage(tid_t tid, struct inode *ip,
- struct tlock *tlck;
- struct xtlock *sxtlck = NULL, *rxtlck = NULL;
- int quota_allocation = 0;
-+ int dlimit_allocation = 0;
-
- smp = split->mp;
- sp = XT_PAGE(ip, smp);
-@@ -1253,6 +1261,13 @@ xtSplitPage(tid_t tid, struct inode *ip,
-
- quota_allocation += lengthPXD(pxd);
-
-+ /* Allocate blocks to dlimit. */
-+ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) {
-+ rc = -ENOSPC;
-+ goto clean_up;
-+ }
-+ dlimit_allocation += lengthPXD(pxd);
-+
- /*
- * allocate the new right page for the split
- */
-@@ -1454,6 +1469,9 @@ xtSplitPage(tid_t tid, struct inode *ip,
-
- clean_up:
-
-+ /* Rollback dlimit allocation. */
-+ if (dlimit_allocation)
-+ DLIMIT_FREE_BLOCK(ip, dlimit_allocation);
- /* Rollback quota allocation. */
- if (quota_allocation)
- DQUOT_FREE_BLOCK(ip, quota_allocation);
-@@ -1517,6 +1535,12 @@ xtSplitRoot(tid_t tid,
- release_metapage(rmp);
- return -EDQUOT;
- }
-+ /* Allocate blocks to dlimit. */
-+ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) {
-+ DQUOT_FREE_BLOCK(ip, lengthPXD(pxd));
-+ release_metapage(rmp);
-+ return -ENOSPC;
-+ }
-
- jfs_info("xtSplitRoot: ip:0x%p rmp:0x%p", ip, rmp);
-
-@@ -3940,6 +3964,8 @@ s64 xtTruncate(tid_t tid, struct inode *
- else
- ip->i_size = newsize;
-
-+ /* update dlimit allocation to reflect freed blocks */
-+ DLIMIT_FREE_BLOCK(ip, nfreed);
- /* update quota allocation to reflect freed blocks */
- DQUOT_FREE_BLOCK(ip, nfreed);
-
-diff -NurpP --minimal linux-2.6.29.1/fs/jfs/namei.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/namei.c
---- linux-2.6.29.1/fs/jfs/namei.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/namei.c 2009-03-24 14:48:35.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>
if (dentry && (JFS_SBI(dip->i_sb)->mntflag & JFS_OS2))
@@ -1545,6 +1547,7 @@ const struct inode_operations jfs_dir_in
.setattr = jfs_setattr,
- .permission = jfs_permission,
+ .check_acl = jfs_check_acl,
#endif
+ .sync_flags = jfs_sync_flags,
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-2.6.29.1/fs/jfs/super.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/super.c
---- linux-2.6.29.1/fs/jfs/super.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/super.c 2009-03-24 14:48:35.000000000 +0100
-@@ -196,7 +196,8 @@ static void jfs_put_super(struct super_b
+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,
Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota,
};
static const match_table_t tokens = {
-@@ -206,6 +207,10 @@ static const match_table_t tokens = {
+@@ -202,6 +203,10 @@ static const match_table_t tokens = {
{Opt_resize, "resize=%u"},
{Opt_resize_nosize, "resize"},
{Opt_errors, "errors=%s"},
{Opt_ignore, "noquota"},
{Opt_ignore, "quota"},
{Opt_usrquota, "usrquota"},
-@@ -340,6 +345,20 @@ static int parse_options(char *options,
+@@ -336,6 +341,20 @@ static int parse_options(char *options,
}
break;
}
default:
printk("jfs: Unrecognized mount option \"%s\" "
" or missing value\n", p);
-@@ -370,6 +389,13 @@ static int jfs_remount(struct super_bloc
+@@ -366,6 +385,12 @@ static int jfs_remount(struct super_bloc
if (!parse_options(data, sb, &newLVSize, &flag)) {
return -EINVAL;
}
-+
+ if ((flag & JFS_TAGGED) && !(sb->s_flags & MS_TAGGED)) {
+ printk(KERN_ERR "JFS: %s: tagging not permitted on remount.\n",
+ sb->s_id);
+ return -EINVAL;
+ }
+
+ lock_kernel();
if (newLVSize) {
if (sb->s_flags & MS_RDONLY) {
- printk(KERN_ERR
-@@ -441,6 +467,9 @@ static int jfs_fill_super(struct super_b
+@@ -449,6 +474,9 @@ static int jfs_fill_super(struct super_b
#ifdef CONFIG_JFS_POSIX_ACL
sb->s_flags |= MS_POSIXACL;
#endif
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-2.6.29.1/fs/jfs/xattr.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/xattr.c
---- linux-2.6.29.1/fs/jfs/xattr.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/jfs/xattr.c 2009-02-22 22:54:25.000000000 +0100
-@@ -23,6 +23,7 @@
- #include <linux/posix_acl_xattr.h>
- #include <linux/quotaops.h>
- #include <linux/security.h>
-+#include <linux/vs_dlimit.h>
- #include "jfs_incore.h"
- #include "jfs_superblock.h"
- #include "jfs_dmap.h"
-@@ -263,9 +264,16 @@ static int ea_write(struct inode *ip, st
- if (DQUOT_ALLOC_BLOCK(ip, nblocks)) {
- return -EDQUOT;
- }
-+ /* Allocate new blocks to dlimit. */
-+ if (DLIMIT_ALLOC_BLOCK(ip, nblocks)) {
-+ DQUOT_FREE_BLOCK(ip, nblocks);
-+ return -ENOSPC;
-+ }
-
- rc = dbAlloc(ip, INOHINT(ip), nblocks, &blkno);
- if (rc) {
-+ /*Rollback dlimit allocation. */
-+ DLIMIT_FREE_BLOCK(ip, nblocks);
- /*Rollback quota allocation. */
- DQUOT_FREE_BLOCK(ip, nblocks);
- return rc;
-@@ -332,6 +340,8 @@ static int ea_write(struct inode *ip, st
-
- failed:
- /* Rollback quota allocation. */
-+ DLIMIT_FREE_BLOCK(ip, nblocks);
-+ /* Rollback quota allocation. */
- DQUOT_FREE_BLOCK(ip, nblocks);
-
- dbFree(ip, blkno, nblocks);
-@@ -468,6 +478,7 @@ static int ea_get(struct inode *inode, s
- s64 blkno;
- int rc;
- int quota_allocation = 0;
-+ int dlimit_allocation = 0;
-
- /* When fsck.jfs clears a bad ea, it doesn't clear the size */
- if (ji->ea.flag == 0)
-@@ -543,6 +554,12 @@ static int ea_get(struct inode *inode, s
-
- quota_allocation = blocks_needed;
-
-+ /* Allocate new blocks to dlimit. */
-+ rc = -ENOSPC;
-+ if (DLIMIT_ALLOC_BLOCK(inode, blocks_needed))
-+ goto clean_up;
-+ dlimit_allocation = blocks_needed;
-+
- rc = dbAlloc(inode, INOHINT(inode), (s64) blocks_needed,
- &blkno);
- if (rc)
-@@ -600,6 +617,9 @@ static int ea_get(struct inode *inode, s
- return ea_size;
-
- clean_up:
-+ /* Rollback dlimit allocation */
-+ if (dlimit_allocation)
-+ DLIMIT_FREE_BLOCK(inode, dlimit_allocation);
- /* Rollback quota allocation */
- if (quota_allocation)
- DQUOT_FREE_BLOCK(inode, quota_allocation);
-@@ -676,8 +696,10 @@ static int ea_put(tid_t tid, struct inod
- }
-
- /* If old blocks exist, they must be removed from quota allocation. */
-- if (old_blocks)
-+ if (old_blocks) {
-+ DLIMIT_FREE_BLOCK(inode, old_blocks);
- DQUOT_FREE_BLOCK(inode, old_blocks);
-+ }
-
- inode->i_ctime = CURRENT_TIME;
-
-diff -NurpP --minimal linux-2.6.29.1/fs/libfs.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/libfs.c
---- linux-2.6.29.1/fs/libfs.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/libfs.c 2009-03-24 14:48:35.000000000 +0100
-@@ -125,7 +125,8 @@ static inline unsigned char dt_type(stru
+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.
*/
{
struct dentry *dentry = filp->f_path.dentry;
struct dentry *cursor = filp->private_data;
-@@ -158,6 +159,8 @@ int dcache_readdir(struct file * filp, v
+@@ -160,6 +161,8 @@ int dcache_readdir(struct file * filp, v
next = list_entry(p, struct dentry, d_u.d_child);
if (d_unhashed(next) || !next->d_inode)
continue;
spin_unlock(&dcache_lock);
if (filldir(dirent, next->d_name.name,
-@@ -176,6 +179,18 @@ int dcache_readdir(struct file * filp, v
+@@ -178,6 +181,18 @@ int dcache_readdir(struct file * filp, v
return 0;
}
ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
{
return -EISDIR;
-@@ -796,6 +811,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.29.1/fs/locks.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/locks.c
---- linux-2.6.29.1/fs/locks.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/locks.c 2009-03-24 14:48:35.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>
return kmem_cache_alloc(filelock_cache, GFP_KERNEL);
}
-@@ -173,6 +177,7 @@ static void locks_free_lock(struct file_
+@@ -174,6 +178,7 @@ static void locks_free_lock(struct file_
BUG_ON(!list_empty(&fl->fl_block));
BUG_ON(!list_empty(&fl->fl_link));
locks_release_private(fl);
kmem_cache_free(filelock_cache, fl);
}
-@@ -193,6 +198,7 @@ void locks_init_lock(struct file_lock *f
+@@ -194,6 +199,7 @@ void locks_init_lock(struct file_lock *f
fl->fl_start = fl->fl_end = 0;
fl->fl_ops = NULL;
fl->fl_lmops = NULL;
}
EXPORT_SYMBOL(locks_init_lock);
-@@ -247,6 +253,7 @@ void locks_copy_lock(struct file_lock *n
+@@ -248,6 +254,7 @@ void locks_copy_lock(struct file_lock *n
new->fl_file = fl->fl_file;
new->fl_ops = fl->fl_ops;
new->fl_lmops = fl->fl_lmops;
locks_copy_private(new, fl);
}
-@@ -285,6 +292,11 @@ static int flock_make_lock(struct file *
+@@ -286,6 +293,11 @@ static int flock_make_lock(struct file *
fl->fl_flags = FL_FLOCK;
fl->fl_type = type;
fl->fl_end = OFFSET_MAX;
*lock = fl;
return 0;
-@@ -450,6 +462,7 @@ static int lease_init(struct file *filp,
+@@ -451,6 +463,7 @@ static int lease_init(struct file *filp,
fl->fl_owner = current->files;
fl->fl_pid = current->tgid;
fl->fl_file = filp;
fl->fl_flags = FL_LEASE;
-@@ -469,6 +482,11 @@ static struct file_lock *lease_alloc(str
+@@ -470,6 +483,11 @@ static struct file_lock *lease_alloc(str
if (fl == NULL)
return ERR_PTR(error);
error = lease_init(filp, type, fl);
if (error) {
locks_free_lock(fl);
-@@ -769,6 +787,7 @@ static int flock_lock_file(struct file *
+@@ -770,6 +788,7 @@ static int flock_lock_file(struct file *
if (found)
- cond_resched_bkl();
+ cond_resched();
+ new_fl->fl_xid = -1;
find_conflict:
for_each_lock(inode, before) {
struct file_lock *fl = *before;
-@@ -789,6 +808,7 @@ find_conflict:
+@@ -790,6 +809,7 @@ find_conflict:
goto out;
locks_copy_lock(new_fl, request);
locks_insert_lock(before, new_fl);
new_fl = NULL;
error = 0;
-@@ -799,7 +819,8 @@ out:
+@@ -800,7 +820,8 @@ out:
return error;
}
{
struct file_lock *fl;
struct file_lock *new_fl = NULL;
-@@ -809,6 +830,8 @@ static int __posix_lock_file(struct inod
+@@ -810,6 +831,8 @@ static int __posix_lock_file(struct inod
struct file_lock **before;
int error, added = 0;
/*
* We may need two file_lock structures for this operation,
* so we get them in advance to avoid races.
-@@ -819,7 +842,11 @@ static int __posix_lock_file(struct inod
+@@ -820,7 +843,11 @@ static int __posix_lock_file(struct inod
(request->fl_type != F_UNLCK ||
request->fl_start != 0 || request->fl_end != OFFSET_MAX)) {
new_fl = locks_alloc_lock();
}
lock_kernel();
-@@ -1018,7 +1045,8 @@ static int __posix_lock_file(struct inod
+@@ -1019,7 +1046,8 @@ static int __posix_lock_file(struct inod
int posix_lock_file(struct file *filp, struct file_lock *fl,
struct file_lock *conflock)
{
}
EXPORT_SYMBOL(posix_lock_file);
-@@ -1108,7 +1136,7 @@ int locks_mandatory_area(int read_write,
+@@ -1109,7 +1137,7 @@ int locks_mandatory_area(int read_write,
fl.fl_end = offset + count - 1;
for (;;) {
if (error != FILE_LOCK_DEFERRED)
break;
error = wait_event_interruptible(fl.fl_wait, !fl.fl_next);
-@@ -1423,6 +1451,7 @@ int generic_setlease(struct file *filp,
+@@ -1424,6 +1452,7 @@ int generic_setlease(struct file *filp,
locks_copy_lock(new_fl, lease);
locks_insert_lock(before, new_fl);
*flp = new_fl;
return 0;
-@@ -1778,6 +1807,11 @@ int fcntl_setlk(unsigned int fd, struct
+@@ -1779,6 +1808,11 @@ int fcntl_setlk(unsigned int fd, struct
if (file_lock == NULL)
return -ENOLCK;
/*
* This might block, so we do it before checking the inode.
*/
-@@ -1896,6 +1930,11 @@ int fcntl_setlk64(unsigned int fd, struc
+@@ -1897,6 +1931,11 @@ int fcntl_setlk64(unsigned int fd, struc
if (file_lock == NULL)
return -ENOLCK;
/*
* This might block, so we do it before checking the inode.
*/
-@@ -2161,8 +2200,11 @@ static int locks_show(struct seq_file *f
+@@ -2162,8 +2201,11 @@ static int locks_show(struct seq_file *f
lock_get_status(f, fl, (long)f->private, "");
f->private++;
return 0;
-diff -NurpP --minimal linux-2.6.29.1/fs/namei.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/namei.c
---- linux-2.6.29.1/fs/namei.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/namei.c 2009-03-25 00:50:11.000000000 +0100
-@@ -31,6 +31,14 @@
- #include <linux/file.h>
+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>
+ #include <linux/fs_struct.h>
+#include <linux/proc_fs.h>
+#include <linux/vserver/inode.h>
+#include <linux/vs_base.h>
#include <asm/uaccess.h>
#define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
-@@ -167,6 +175,77 @@ void putname(const char *name)
+@@ -169,6 +177,77 @@ void putname(const char *name)
EXPORT_SYMBOL(putname);
#endif
-+static inline int dx_barrier(struct inode *inode)
++static inline int dx_barrier(const struct inode *inode)
+{
+ if (IS_BARRIER(inode) && !vx_check(0, VS_ADMIN | VS_WATCH)) {
+ vxwprintk_task(1, "did hit the barrier.");
+ return 0;
+}
+
-+static int __dx_permission(struct inode *inode, int mask)
++static int __dx_permission(const struct inode *inode, int mask)
+{
+ if (dx_barrier(inode))
+ return -EACCES;
+ return -EACCES;
+}
+
-+int dx_permission(struct inode *inode, int mask)
++int dx_permission(const struct inode *inode, int mask)
+{
+ int ret = __dx_permission(inode, mask);
+ if (unlikely(ret)) {
+ return ret;
+}
+
-
- /**
- * generic_permission - check for access rights on a Posix-like filesystem
-@@ -253,10 +332,14 @@ int inode_permission(struct inode *inode
+ /*
+ * This does basic POSIX ACL permission checking
+ */
+@@ -269,10 +348,14 @@ int inode_permission(struct inode *inode
/*
* Nobody gets write access to an immutable file.
*/
if (inode->i_op->permission)
retval = inode->i_op->permission(inode, mask);
else
-@@ -432,6 +515,8 @@ static int exec_permission_lite(struct i
+@@ -448,6 +531,9 @@ static int exec_permission_lite(struct i
{
- umode_t mode = inode->i_mode;
+ int ret;
+ if (dx_barrier(inode))
+ return -EACCES;
- if (inode->i_op->permission)
- return -EAGAIN;
++
+ if (inode->i_op->permission) {
+ ret = inode->i_op->permission(inode, MAY_EXEC);
+ if (!ret)
+@@ -763,7 +849,8 @@ static __always_inline void follow_dotdo
-@@ -749,7 +834,8 @@ static __always_inline void follow_dotdo
- if (nd->path.dentry == fs->root.dentry &&
- nd->path.mnt == fs->root.mnt) {
- read_unlock(&fs->lock);
+ if (nd->path.dentry == nd->root.dentry &&
+ nd->path.mnt == nd->root.mnt) {
- break;
+ /* for sane '/' avoid follow_mount() */
+ return;
}
- read_unlock(&fs->lock);
spin_lock(&dcache_lock);
-@@ -786,16 +872,30 @@ static int do_lookup(struct nameidata *n
+ if (nd->path.dentry != nd->path.mnt->mnt_root) {
+@@ -799,16 +886,30 @@ static int do_lookup(struct nameidata *n
{
struct vfsmount *mnt = nd->path.mnt;
struct dentry *dentry = __d_lookup(nd->path.dentry, name);
__follow_mount(path);
return 0;
+hidden:
-+ vxwprintk_task(1, "did lookup hidden %s:%p[#%d,%lu] »%s«.",
++ vxwprintk_task(1, "did lookup hidden %s:%p[#%d,%lu] »%s/%.*s«.",
+ inode->i_sb->s_id, inode, inode->i_tag, inode->i_ino,
-+ vxd_path(&nd->path));
++ vxd_path(&nd->path), name->len, name->name);
+ dput(dentry);
+ return -ENOENT;
need_lookup:
dentry = real_lookup(nd->path.dentry, name, nd);
-@@ -1364,7 +1464,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))
-@@ -1506,6 +1606,14 @@ int may_open(struct path *path, int acc_
- flag &= ~O_TRUNC;
+@@ -1540,6 +1641,14 @@ int may_open(struct path *path, int acc_
+ break;
}
+#ifdef CONFIG_VSERVER_COWBL
+ 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;
-@@ -1639,6 +1747,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);
-
+-
+#ifdef CONFIG_VSERVER_COWBL
+ int rflag = flag;
+ int rmode = mode;
+restart:
+#endif
- acc_mode = MAY_OPEN | ACC_MODE(flag);
+ if (!acc_mode)
+ acc_mode = MAY_OPEN | ACC_MODE(flag);
- /* O_TRUNC implies we need access checks for write permissions */
-@@ -1771,6 +1884,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);
-@@ -1924,9 +2056,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;
-@@ -2393,7 +2533,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;
-@@ -2766,6 +2906,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);
}
+out_fput_both:
+ vxdprintk(VXD_CBIT(misc, 3),
+ "fput(new_file=%p[#%ld])", new_file,
-+ atomic_read(&new_file->f_count));
++ atomic_long_read(&new_file->f_count));
+ fput(new_file);
+
+out_fput_old:
+ vxdprintk(VXD_CBIT(misc, 3),
+ "fput(old_file=%p[#%ld])", old_file,
-+ atomic_read(&old_file->f_count));
++ atomic_long_read(&old_file->f_count));
+ fput(old_file);
+
+out_unlock_new:
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-diff -NurpP --minimal linux-2.6.29.1/fs/namespace.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/namespace.c
---- linux-2.6.29.1/fs/namespace.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/namespace.c 2009-04-10 23:15:11.000000000 +0200
-@@ -27,6 +27,11 @@
- #include <linux/ramfs.h>
+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>
+ #include <linux/fs_struct.h>
+#include <linux/vs_base.h>
+#include <linux/vs_context.h>
+#include <linux/vs_tag.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
#include "pnode.h"
-@@ -573,6 +578,7 @@ static struct vfsmount *clone_mnt(struct
+@@ -567,6 +572,7 @@ static struct vfsmount *clone_mnt(struct
mnt->mnt_root = dget(root);
mnt->mnt_mountpoint = mnt->mnt_root;
mnt->mnt_parent = mnt;
if (flag & CL_SLAVE) {
list_add(&mnt->mnt_slave, &old->mnt_slave_list);
-@@ -687,6 +693,31 @@ static inline void mangle(struct seq_fil
+@@ -661,6 +667,31 @@ static inline void mangle(struct seq_fil
seq_escape(m, s, " \t\n\\");
}
/*
* Simple .show_options callback for filesystems which don't want to
* implement more complex mount option showing.
-@@ -759,6 +790,8 @@ static int show_sb_opts(struct seq_file
+@@ -748,6 +779,8 @@ static int show_sb_opts(struct seq_file
{ MS_SYNCHRONOUS, ",sync" },
{ MS_DIRSYNC, ",dirsync" },
{ MS_MANDLOCK, ",mand" },
{ 0, NULL }
};
const struct proc_fs_info *fs_infop;
-@@ -805,10 +838,20 @@ static int show_vfsmnt(struct seq_file *
+@@ -795,10 +828,20 @@ static int show_vfsmnt(struct seq_file *
int err = 0;
struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
show_type(m, mnt->mnt_sb);
seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw");
err = show_sb_opts(m, mnt->mnt_sb);
-@@ -838,6 +881,11 @@ static int show_mountinfo(struct seq_fil
+@@ -828,6 +871,11 @@ static int show_mountinfo(struct seq_fil
struct path root = p->root;
int err = 0;
seq_printf(m, "%i %i %u:%u ", mnt->mnt_id, mnt->mnt_parent->mnt_id,
MAJOR(sb->s_dev), MINOR(sb->s_dev));
seq_dentry(m, mnt->mnt_root, " \t\n\\");
-@@ -896,17 +944,27 @@ static int show_vfsstat(struct seq_file
+@@ -886,17 +934,27 @@ static int show_vfsstat(struct seq_file
struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
int err = 0;
/* file system type */
seq_puts(m, "with fstype ");
-@@ -1145,7 +1203,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);
-@@ -1171,7 +1229,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
-@@ -1462,11 +1520,13 @@ 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;
+
+- if (!capable(CAP_SYS_ADMIN))
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_NAMESPACE))
+ return -EPERM;
+
+ if (path->dentry != path->mnt->mnt_root)
+@@ -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)
-@@ -1500,6 +1560,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);
-@@ -1530,12 +1591,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))
-@@ -1577,7 +1638,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;
-@@ -1659,7 +1720,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... */
+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
return -EPERM;
- mnt = do_kern_mount(type, flags, name, data);
-@@ -1904,6 +1965,7 @@ long do_mount(char *dev_name, char *dir_
+ lock_kernel();
+@@ -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)
-@@ -1919,6 +1981,12 @@ long do_mount(char *dev_name, char *dir_
- if (data_page)
- ((char *)data_page)[PAGE_SIZE - 1] = 0;
+@@ -1932,6 +1994,12 @@ long do_mount(char *dev_name, char *dir_
+ if (!(flags & MS_NOATIME))
+ mnt_flags |= MNT_RELATIME;
+ if (dx_parse_tag(data_page, &tag, 1, &mnt_flags, &flags)) {
+ /* FIXME: bind and re-mounts get the tag flag? */
/* Separate the per-mountpoint flags */
if (flags & MS_NOSUID)
mnt_flags |= MNT_NOSUID;
-@@ -1935,6 +2003,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;
+ if (!capable(CAP_SYS_ADMIN))
+ mnt_flags |= MNT_NODEV;
flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE |
- MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT);
-
-@@ -1950,9 +2020,9 @@ long do_mount(char *dev_name, char *dir_
+ MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
+ MS_STRICTATIME);
+@@ -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)
-@@ -2021,6 +2091,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);
-@@ -2207,9 +2278,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;
-@@ -2348,5 +2420,6 @@ void __put_mnt_ns(struct mnt_namespace *
+@@ -2327,6 +2399,7 @@ void put_mnt_ns(struct mnt_namespace *ns
spin_unlock(&vfsmount_lock);
up_write(&namespace_sem);
release_mounts(&umount_list);
+ atomic_dec(&vs_global_mnt_ns);
kfree(ns);
}
-diff -NurpP --minimal linux-2.6.29.1/fs/nfs/client.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfs/client.c
---- linux-2.6.29.1/fs/nfs/client.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfs/client.c 2009-03-24 14:48:35.000000000 +0100
-@@ -696,6 +696,9 @@ static int nfs_init_server_rpcclient(str
+ EXPORT_SYMBOL(put_mnt_ns);
+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;
return 0;
}
-@@ -862,6 +865,10 @@ static void nfs_server_set_fsinfo(struct
+@@ -909,6 +912,10 @@ static void nfs_server_set_fsinfo(struct
server->acdirmin = server->acdirmax = 0;
}
server->maxfilesize = fsinfo->maxfilesize;
/* We're airborne Set socket buffersize */
-diff -NurpP --minimal linux-2.6.29.1/fs/nfs/dir.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfs/dir.c
---- linux-2.6.29.1/fs/nfs/dir.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfs/dir.c 2009-03-24 14:48:35.000000000 +0100
-@@ -34,6 +34,7 @@
+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 <linux/sched.h>
#include "nfs4_fs.h"
#include "delegation.h"
-@@ -950,6 +951,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.29.1/fs/nfs/inode.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfs/inode.c
---- linux-2.6.29.1/fs/nfs/inode.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfs/inode.c 2009-03-24 14:48:35.000000000 +0100
-@@ -37,6 +37,7 @@
+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>
#include <linux/nfs_xdr.h>
#include <asm/system.h>
#include <asm/uaccess.h>
-@@ -313,8 +314,10 @@ nfs_fhget(struct super_block *sb, struct
- nfsi->change_attr = fattr->change_attr;
- inode->i_size = nfs_size_to_loff_t(fattr->size);
- inode->i_nlink = fattr->nlink;
-- inode->i_uid = fattr->uid;
-- inode->i_gid = fattr->gid;
-+ inode->i_uid = INOTAG_UID(DX_TAG(inode), fattr->uid, fattr->gid);
-+ inode->i_gid = INOTAG_GID(DX_TAG(inode), fattr->uid, fattr->gid);
-+ inode->i_tag = INOTAG_TAG(DX_TAG(inode), fattr->uid, fattr->gid, 0);
-+ /* maybe fattr->xid someday */
- if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
- /*
- * report the blocks in 512byte units
-@@ -462,6 +465,8 @@ void nfs_setattr_update_inode(struct ino
+@@ -279,6 +280,8 @@ nfs_fhget(struct super_block *sb, struct
+ if (inode->i_state & I_NEW) {
+ struct nfs_inode *nfsi = NFS_I(inode);
+ unsigned long now = jiffies;
++ uid_t uid;
++ gid_t gid;
+
+ /* We set i_ino for the few things that still rely on it,
+ * such as stat(2) */
+@@ -327,8 +330,8 @@ nfs_fhget(struct super_block *sb, struct
+ nfsi->change_attr = 0;
+ inode->i_size = 0;
+ inode->i_nlink = 0;
+- inode->i_uid = -2;
+- inode->i_gid = -2;
++ uid = -2;
++ gid = -2;
+ inode->i_blocks = 0;
+ memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
+
+@@ -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 {
++ 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 {
++ 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);
+ }
++ 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, 0);
++ /* maybe fattr->xid someday */
++
+ nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
+ nfsi->attrtimeo_timestamp = now;
+ nfsi->access_cache = RB_ROOT;
+@@ -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);
}
-@@ -850,6 +855,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? */
-@@ -871,10 +879,15 @@ static int nfs_check_inode_attributes(st
- if (cur_size != new_isize && nfsi->npages == 0)
- invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
+@@ -937,13 +958,18 @@ static int nfs_check_inode_attributes(st
+ invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
+ }
+ 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);
+
/* Have any file permissions changed? */
- if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO)
-- || inode->i_uid != fattr->uid
-- || inode->i_gid != fattr->gid)
-+ || inode->i_uid != uid
-+ || inode->i_gid != gid
-+ || inode->i_tag != tag)
+ if ((fattr->valid & NFS_ATTR_FATTR_MODE) && (inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO))
+ invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
+- if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && inode->i_uid != fattr->uid)
++ if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && uid != fattr->uid)
+ invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
+- if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && inode->i_gid != fattr->gid)
++ if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && gid != fattr->gid)
invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
++ /* maybe check for tag too? */
/* Has the link count changed? */
-@@ -1073,6 +1086,9 @@ static int nfs_update_inode(struct inode
- loff_t cur_isize, new_isize;
+ if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
+@@ -1158,6 +1184,9 @@ static int nfs_update_inode(struct inode
unsigned long invalid = 0;
unsigned long now = jiffies;
+ unsigned long save_cache_validity;
+ uid_t uid;
+ gid_t gid;
+ tag_t tag;
dfprintk(VFS, "NFS: %s(%s/%ld ct=%d info=0x%x)\n",
__func__, inode->i_sb->s_id, inode->i_ino,
-@@ -1146,9 +1162,14 @@ static int nfs_update_inode(struct inode
- memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
- nfsi->change_attr = fattr->change_attr;
-
-+ 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);
-+
- if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO) ||
-- inode->i_uid != fattr->uid ||
-- inode->i_gid != fattr->gid)
-+ inode->i_uid != uid ||
-+ inode->i_gid != gid ||
-+ inode->i_tag != tag)
- invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
-
- if (inode->i_nlink != fattr->nlink)
-@@ -1156,8 +1177,9 @@ static int nfs_update_inode(struct inode
-
- inode->i_mode = fattr->mode;
- inode->i_nlink = fattr->nlink;
-- inode->i_uid = fattr->uid;
-- inode->i_gid = fattr->gid;
-+ inode->i_uid = uid;
-+ inode->i_gid = gid;
-+ inode->i_tag = tag;
+@@ -1260,6 +1289,9 @@ static int nfs_update_inode(struct inode
+ | NFS_INO_REVAL_PAGECACHE
+ | NFS_INO_REVAL_FORCED);
+
++ 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));
+@@ -1279,9 +1311,9 @@ static int nfs_update_inode(struct inode
+ | NFS_INO_REVAL_FORCED);
+
+ if (fattr->valid & NFS_ATTR_FATTR_OWNER) {
+- if (inode->i_uid != fattr->uid) {
++ if (uid != fattr->uid) {
+ invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
+- inode->i_uid = fattr->uid;
++ uid = fattr->uid;
+ }
+ } else if (server->caps & NFS_CAP_OWNER)
+ invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
+@@ -1290,9 +1322,9 @@ static int nfs_update_inode(struct inode
+ | NFS_INO_REVAL_FORCED);
+
+ if (fattr->valid & NFS_ATTR_FATTR_GROUP) {
+- if (inode->i_gid != fattr->gid) {
++ if (gid != fattr->gid) {
+ invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
+- inode->i_gid = fattr->gid;
++ gid = fattr->gid;
+ }
+ } else if (server->caps & NFS_CAP_OWNER_GROUP)
+ invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
+@@ -1300,6 +1332,10 @@ static int nfs_update_inode(struct inode
+ | NFS_INO_INVALID_ACL
+ | NFS_INO_REVAL_FORCED);
- if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
- /*
-diff -NurpP --minimal linux-2.6.29.1/fs/nfs/nfs3xdr.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfs/nfs3xdr.c
---- linux-2.6.29.1/fs/nfs/nfs3xdr.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfs/nfs3xdr.c 2009-03-24 14:48:35.000000000 +0100
-@@ -22,6 +22,7 @@
++ 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.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>
#include <linux/nfsacl.h>
#include "internal.h"
#define NFSDBG_FACILITY NFSDBG_XDR
-@@ -182,7 +183,7 @@ xdr_decode_fattr(__be32 *p, struct nfs_f
+@@ -176,7 +177,7 @@ xdr_decode_fattr(__be32 *p, struct nfs_f
}
static inline __be32 *
{
if (attr->ia_valid & ATTR_MODE) {
*p++ = xdr_one;
-@@ -190,15 +191,17 @@ xdr_encode_sattr(__be32 *p, struct iattr
+@@ -184,15 +185,17 @@ xdr_encode_sattr(__be32 *p, struct iattr
} else {
*p++ = xdr_zero;
}
} else {
*p++ = xdr_zero;
}
-@@ -283,7 +286,8 @@ static int
+@@ -279,7 +282,8 @@ static int
nfs3_xdr_sattrargs(struct rpc_rqst *req, __be32 *p, struct nfs3_sattrargs *args)
{
p = xdr_encode_fhandle(p, args->fh);
*p++ = htonl(args->guard);
if (args->guard)
p = xdr_encode_time3(p, &args->guardtime);
-@@ -388,7 +392,8 @@ nfs3_xdr_createargs(struct rpc_rqst *req
+@@ -384,7 +388,8 @@ nfs3_xdr_createargs(struct rpc_rqst *req
*p++ = args->verifier[0];
*p++ = args->verifier[1];
} else
req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
return 0;
-@@ -402,7 +407,8 @@ nfs3_xdr_mkdirargs(struct rpc_rqst *req,
+@@ -398,7 +403,8 @@ nfs3_xdr_mkdirargs(struct rpc_rqst *req,
{
p = xdr_encode_fhandle(p, args->fh);
p = xdr_encode_array(p, args->name, args->len);
req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
return 0;
}
-@@ -415,7 +421,8 @@ nfs3_xdr_symlinkargs(struct rpc_rqst *re
+@@ -411,7 +417,8 @@ nfs3_xdr_symlinkargs(struct rpc_rqst *re
{
p = xdr_encode_fhandle(p, args->fromfh);
p = xdr_encode_array(p, args->fromname, args->fromlen);
*p++ = htonl(args->pathlen);
req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
-@@ -433,7 +440,8 @@ nfs3_xdr_mknodargs(struct rpc_rqst *req,
+@@ -429,7 +436,8 @@ nfs3_xdr_mknodargs(struct rpc_rqst *req,
p = xdr_encode_fhandle(p, args->fh);
p = xdr_encode_array(p, args->name, args->len);
*p++ = htonl(args->type);
if (args->type == NF3CHR || args->type == NF3BLK) {
*p++ = htonl(MAJOR(args->rdev));
*p++ = htonl(MINOR(args->rdev));
-diff -NurpP --minimal linux-2.6.29.1/fs/nfs/nfsroot.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfs/nfsroot.c
---- linux-2.6.29.1/fs/nfs/nfsroot.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfs/nfsroot.c 2009-03-24 14:48:35.000000000 +0100
-@@ -119,12 +119,12 @@ static int mount_port __initdata = 0; /
+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 */
Opt_port, Opt_rsize, Opt_wsize, Opt_timeo, Opt_retrans, Opt_acregmin,
/* Error token */
Opt_err
};
-@@ -161,6 +161,9 @@ static match_table_t __initconst tokens
+@@ -164,6 +164,9 @@ static const match_table_t tokens __init
{Opt_tcp, "tcp"},
{Opt_acl, "acl"},
{Opt_noacl, "noacl"},
{Opt_err, NULL}
};
-@@ -272,6 +275,20 @@ static int __init root_nfs_parse(char *n
+@@ -275,6 +278,20 @@ static int __init root_nfs_parse(char *n
case Opt_noacl:
nfs_data.flags |= NFS_MOUNT_NOACL;
break;
default:
printk(KERN_WARNING "Root-NFS: unknown "
"option: %s\n", p);
-diff -NurpP --minimal linux-2.6.29.1/fs/nfs/super.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfs/super.c
---- linux-2.6.29.1/fs/nfs/super.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfs/super.c 2009-03-24 16:02:06.000000000 +0100
-@@ -51,6 +51,7 @@
+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 <linux/parser.h>
#include <asm/system.h>
#include <asm/uaccess.h>
-@@ -517,6 +518,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.29.1/fs/nfsd/auth.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfsd/auth.c
---- linux-2.6.29.1/fs/nfsd/auth.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfsd/auth.c 2009-03-24 16:09:39.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>
#include "auth.h"
int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp)
-@@ -42,6 +43,9 @@ int nfsd_setuser(struct svc_rqst *rqstp,
+@@ -44,6 +45,9 @@ int nfsd_setuser(struct svc_rqst *rqstp,
new->fsuid = rqstp->rq_cred.cr_uid;
new->fsgid = rqstp->rq_cred.cr_gid;
rqgi = rqstp->rq_cred.cr_group_info;
-@@ -69,7 +73,7 @@ int nfsd_setuser(struct svc_rqst *rqstp,
- }
- } else {
- gi = get_group_info(rqgi);
-- }
-+ }
-
- if (new->fsuid == (uid_t) -1)
- new->fsuid = exp->ex_anon_uid;
-@@ -94,6 +98,6 @@ oom:
- ret = -ENOMEM;
- error:
- abort_creds(new);
-- return ret;
-+ return ret;
- }
-
-diff -NurpP --minimal linux-2.6.29.1/fs/nfsd/nfs3xdr.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfsd/nfs3xdr.c
---- linux-2.6.29.1/fs/nfsd/nfs3xdr.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfsd/nfs3xdr.c 2009-02-22 22:54:25.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.29.1/fs/nfsd/nfs4xdr.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfsd/nfs4xdr.c
---- linux-2.6.29.1/fs/nfsd/nfs4xdr.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfsd/nfs4xdr.c 2009-03-24 14:48:35.000000000 +0100
-@@ -56,6 +56,7 @@
+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>
#include <linux/sunrpc/svcauth_gss.h>
#define NFSDDBG_FACILITY NFSDDBG_XDR
-@@ -1714,14 +1715,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.29.1/fs/nfsd/nfsxdr.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfsd/nfsxdr.c
---- linux-2.6.29.1/fs/nfsd/nfsxdr.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/nfsd/nfsxdr.c 2009-02-22 22:54:25.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.29.1/fs/ocfs2/dlm/dlmfs.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/dlm/dlmfs.c
---- linux-2.6.29.1/fs/ocfs2/dlm/dlmfs.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/dlm/dlmfs.c 2009-03-24 16:10:48.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>
#include <asm/uaccess.h>
-@@ -341,6 +342,7 @@ static struct inode *dlmfs_get_root_inod
+@@ -342,6 +343,7 @@ static struct inode *dlmfs_get_root_inod
inode->i_mode = mode;
inode->i_uid = current_fsuid();
inode->i_gid = current_fsgid();
inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
inc_nlink(inode);
-@@ -366,6 +368,7 @@ static struct inode *dlmfs_get_inode(str
+@@ -367,6 +369,7 @@ static struct inode *dlmfs_get_inode(str
inode->i_mode = mode;
inode->i_uid = current_fsuid();
inode->i_gid = current_fsgid();
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.29.1/fs/ocfs2/dlmglue.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/dlmglue.c
---- linux-2.6.29.1/fs/ocfs2/dlmglue.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/dlmglue.c 2009-03-24 14:48:35.000000000 +0100
-@@ -1885,6 +1885,7 @@ static void __ocfs2_stuff_meta_lvb(struc
+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);
lvb->lvb_igid = cpu_to_be32(inode->i_gid);
lvb->lvb_imode = cpu_to_be16(inode->i_mode);
lvb->lvb_inlink = cpu_to_be16(inode->i_nlink);
lvb->lvb_iatime_packed =
-@@ -1939,6 +1940,7 @@ static void ocfs2_refresh_inode_from_lvb
+@@ -2045,6 +2046,7 @@ static void ocfs2_refresh_inode_from_lvb
inode->i_uid = be32_to_cpu(lvb->lvb_iuid);
inode->i_gid = be32_to_cpu(lvb->lvb_igid);
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.29.1/fs/ocfs2/dlmglue.h linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/dlmglue.h
---- linux-2.6.29.1/fs/ocfs2/dlmglue.h 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/dlmglue.h 2009-03-24 14:48:35.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.29.1/fs/ocfs2/file.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/file.c
---- linux-2.6.29.1/fs/ocfs2/file.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/file.c 2009-03-24 14:48:35.000000000 +0100
-@@ -911,13 +911,15 @@ int ocfs2_setattr(struct dentry *dentry,
+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)
mlog(0, "gid change: %d\n", attr->ia_gid);
if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) {
mlog(0, "can't handle attrs: 0x%x\n", attr->ia_valid);
return 0;
-@@ -2070,6 +2072,7 @@ const struct inode_operations ocfs2_file
- .removexattr = generic_removexattr,
- .fallocate = ocfs2_fallocate,
- .fiemap = ocfs2_fiemap,
-+ .sync_flags = ocfs2_sync_flags,
- };
-
- const struct inode_operations ocfs2_special_file_iops = {
-diff -NurpP --minimal linux-2.6.29.1/fs/ocfs2/inode.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/inode.c
---- linux-2.6.29.1/fs/ocfs2/inode.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/inode.c 2009-03-24 16:11:11.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>
#include <asm/byteorder.h>
-@@ -44,6 +45,7 @@
- #include "file.h"
- #include "heartbeat.h"
- #include "inode.h"
-+#include "ioctl.h"
- #include "journal.h"
- #include "namei.h"
- #include "suballoc.h"
-@@ -77,11 +79,13 @@ void ocfs2_set_inode_flags(struct inode
+@@ -79,11 +80,13 @@ void ocfs2_set_inode_flags(struct inode
{
unsigned int flags = OCFS2_I(inode)->ip_attr;
if (flags & OCFS2_SYNC_FL)
inode->i_flags |= S_SYNC;
-@@ -91,25 +95,85 @@ void ocfs2_set_inode_flags(struct inode
+@@ -93,25 +96,44 @@ void ocfs2_set_inode_flags(struct inode
inode->i_flags |= S_NOATIME;
if (flags & OCFS2_DIRSYNC_FL)
inode->i_flags |= S_DIRSYNC;
+ oi->ip_attr |= OCFS2_BARRIER_FL;
+ if (vflags & V_COW)
+ oi->ip_attr |= OCFS2_COW_FL;
-+}
-+
-+int ocfs2_sync_flags(struct inode *inode)
-+{
-+ struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode);
-+ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
-+ handle_t *handle = NULL;
-+ struct buffer_head *bh = NULL;
-+ int status;
-+
-+ status = ocfs2_inode_lock(inode, &bh, 1);
-+ if (status < 0) {
-+ mlog_errno(status);
-+ goto bail;
-+ }
-+
-+ status = -EROFS;
-+ if (IS_RDONLY(inode))
-+ goto bail_unlock;
-+
-+ handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
-+ if (IS_ERR(handle)) {
-+ status = PTR_ERR(handle);
-+ mlog_errno(status);
-+ goto bail_unlock;
-+ }
-+
-+ ocfs2_get_inode_flags(ocfs2_inode);
-+ status = ocfs2_mark_inode_dirty(handle, inode, bh);
-+ if (status < 0)
-+ mlog_errno(status);
-+
-+ ocfs2_commit_trans(osb, handle);
-+bail_unlock:
-+ ocfs2_inode_unlock(inode, 1);
-+bail:
-+ if (bh)
-+ brelse(bh);
-+
-+ mlog_exit(status);
-+ return status;
}
- struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 blkno, unsigned flags,
-@@ -222,6 +286,8 @@ void ocfs2_populate_inode(struct inode *
+ struct inode *ocfs2_ilookup(struct super_block *sb, u64 blkno)
+@@ -246,6 +268,8 @@ void ocfs2_populate_inode(struct inode *
struct super_block *sb;
struct ocfs2_super *osb;
int use_plocks = 1;
mlog_entry("(0x%p, size:%llu)\n", inode,
(unsigned long long)le64_to_cpu(fe->i_size));
-@@ -253,8 +319,12 @@ void ocfs2_populate_inode(struct inode *
+@@ -277,8 +301,12 @@ void ocfs2_populate_inode(struct inode *
inode->i_generation = le32_to_cpu(fe->i_generation);
inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev));
inode->i_mode = le16_to_cpu(fe->i_mode);
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
-@@ -1206,8 +1276,11 @@ int ocfs2_mark_inode_dirty(handle_t *han
-
- fe->i_size = cpu_to_le64(i_size_read(inode));
- fe->i_links_count = cpu_to_le16(inode->i_nlink);
-- fe->i_uid = cpu_to_le32(inode->i_uid);
-- fe->i_gid = cpu_to_le32(inode->i_gid);
-+ fe->i_uid = cpu_to_le32(TAGINO_UID(DX_TAG(inode),
-+ inode->i_uid, inode->i_tag));
-+ fe->i_gid = cpu_to_le32(TAGINO_GID(DX_TAG(inode),
-+ inode->i_gid, inode->i_tag));
-+ /* i_tag = = cpu_to_le16(inode->i_tag); */
- fe->i_mode = cpu_to_le16(inode->i_mode);
- fe->i_atime = cpu_to_le64(inode->i_atime.tv_sec);
- fe->i_atime_nsec = cpu_to_le32(inode->i_atime.tv_nsec);
-@@ -1235,16 +1308,25 @@ leave:
- void ocfs2_refresh_inode(struct inode *inode,
- struct ocfs2_dinode *fe)
- {
-+ uid_t uid;
-+ gid_t gid;
-+
- spin_lock(&OCFS2_I(inode)->ip_lock);
-
- OCFS2_I(inode)->ip_clusters = le32_to_cpu(fe->i_clusters);
- OCFS2_I(inode)->ip_attr = le32_to_cpu(fe->i_attr);
-+ /* OCFS2_I(inode)->ip_flags &= ~OCFS2_FL_MASK;
-+ OCFS2_I(inode)->ip_flags |= le32_to_cpu(fe->i_flags) & OCFS2_FL_MASK; */
- OCFS2_I(inode)->ip_dyn_features = le16_to_cpu(fe->i_dyn_features);
- ocfs2_set_inode_flags(inode);
- i_size_write(inode, le64_to_cpu(fe->i_size));
- inode->i_nlink = le16_to_cpu(fe->i_links_count);
-- inode->i_uid = le32_to_cpu(fe->i_uid);
-- inode->i_gid = le32_to_cpu(fe->i_gid);
-+ uid = le32_to_cpu(fe->i_uid);
-+ gid = le32_to_cpu(fe->i_gid);
-+ 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,
-+ /* le16_to_cpu(raw_inode->i_raw_tag)i */ 0);
- inode->i_mode = le16_to_cpu(fe->i_mode);
- if (S_ISLNK(inode->i_mode) && le32_to_cpu(fe->i_clusters) == 0)
- inode->i_blocks = 0;
-diff -NurpP --minimal linux-2.6.29.1/fs/ocfs2/inode.h linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/inode.h
---- linux-2.6.29.1/fs/ocfs2/inode.h 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/inode.h 2009-03-24 14:48:35.000000000 +0100
-@@ -147,6 +147,7 @@ struct buffer_head *ocfs2_bread(struct i
+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);
void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi);
-+int ocfs2_sync_flags(struct inode *inode);
++int ocfs2_sync_flags(struct inode *inode, int, int);
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-2.6.29.1/fs/ocfs2/ioctl.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/ioctl.c
---- linux-2.6.29.1/fs/ocfs2/ioctl.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/ioctl.c 2009-02-22 22:54:25.000000000 +0100
-@@ -42,7 +42,7 @@ static int ocfs2_get_inode_attr(struct i
+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;
}
-static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
++int ocfs2_sync_flags(struct inode *inode, int flags, int vflags)
++{
++ struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
++ struct buffer_head *bh = NULL;
++ handle_t *handle = NULL;
++ int status;
++
++ status = ocfs2_inode_lock(inode, &bh, 1);
++ if (status < 0) {
++ mlog_errno(status);
++ return status;
++ }
++ handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
++ if (IS_ERR(handle)) {
++ status = PTR_ERR(handle);
++ mlog_errno(status);
++ goto bail_unlock;
++ }
++
++ inode->i_flags = flags;
++ inode->i_vflags = vflags;
++ ocfs2_get_inode_flags(OCFS2_I(inode));
++
++ status = ocfs2_mark_inode_dirty(handle, inode, bh);
++ if (status < 0)
++ mlog_errno(status);
++
++ ocfs2_commit_trans(osb, handle);
++bail_unlock:
++ ocfs2_inode_unlock(inode, 1);
++ brelse(bh);
++ return status;
++}
++
+int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
unsigned mask)
{
struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode);
-@@ -67,6 +67,11 @@ static int ocfs2_set_inode_attr(struct i
+@@ -67,6 +101,11 @@ static int ocfs2_set_inode_attr(struct i
if (!S_ISDIR(inode->i_mode))
flags &= ~OCFS2_DIRSYNC_FL;
handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
if (IS_ERR(handle)) {
status = PTR_ERR(handle);
-diff -NurpP --minimal linux-2.6.29.1/fs/ocfs2/ioctl.h linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/ioctl.h
---- linux-2.6.29.1/fs/ocfs2/ioctl.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/ioctl.h 2009-02-22 22:54:25.000000000 +0100
-@@ -10,6 +10,9 @@
- #ifndef OCFS2_IOCTL_H
- #define OCFS2_IOCTL_H
+@@ -108,6 +147,7 @@ bail:
+ return status;
+ }
-+int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
-+ unsigned mask);
+
- long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
- long ocfs2_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg);
-
-diff -NurpP --minimal linux-2.6.29.1/fs/ocfs2/namei.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/namei.c
---- linux-2.6.29.1/fs/ocfs2/namei.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/namei.c 2009-03-25 01:04:31.000000000 +0100
+ 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.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>
#define MLOG_MASK_PREFIX ML_NAMEI
#include <cluster/masklog.h>
-@@ -462,6 +463,7 @@ static int ocfs2_mknod_locked(struct ocf
- struct ocfs2_extent_list *fel;
+@@ -481,6 +482,7 @@ static int ocfs2_mknod_locked(struct ocf
u64 fe_blkno = 0;
u16 suballoc_bit;
+ u16 feat;
+ tag_t tag;
- mlog_entry("(0x%p, 0x%p, %d, %lu, '%.*s')\n", dir, dentry,
- inode->i_mode, (unsigned long)dev, dentry->d_name.len,
-@@ -508,8 +510,11 @@ static int ocfs2_mknod_locked(struct ocf
+ *new_fe_bh = NULL;
+
+@@ -524,8 +526,11 @@ static int ocfs2_mknod_locked(struct ocf
fe->i_blkno = cpu_to_le64(fe_blkno);
fe->i_suballoc_bit = cpu_to_le16(suballoc_bit);
fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot);
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));
-@@ -2025,6 +2030,7 @@ const struct inode_operations ocfs2_dir_
- .rename = ocfs2_rename,
- .setattr = ocfs2_setattr,
- .getattr = ocfs2_getattr,
-+ .sync_flags = ocfs2_sync_flags,
- .permission = ocfs2_permission,
- .setxattr = generic_setxattr,
- .getxattr = generic_getxattr,
-diff -NurpP --minimal linux-2.6.29.1/fs/ocfs2/ocfs2_fs.h linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/ocfs2_fs.h
---- linux-2.6.29.1/fs/ocfs2/ocfs2_fs.h 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/ocfs2_fs.h 2009-03-24 14:48:35.000000000 +0100
-@@ -219,18 +219,23 @@
- #define OCFS2_INDEXED_DIR_FL (0x0008)
+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)
/* Inode attributes, keep in sync with EXT2 */
-#define OCFS2_SECRM_FL (0x00000001) /* Secure deletion */
/*
* Extent record flags (e_node.leaf.flags)
-diff -NurpP --minimal linux-2.6.29.1/fs/ocfs2/ocfs2.h linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/ocfs2.h
---- linux-2.6.29.1/fs/ocfs2/ocfs2.h 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/ocfs2.h 2009-03-24 16:18:22.000000000 +0100
-@@ -199,6 +199,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.29.1/fs/ocfs2/super.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/super.c
---- linux-2.6.29.1/fs/ocfs2/super.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/ocfs2/super.c 2009-03-24 16:19:44.000000000 +0100
-@@ -172,6 +172,7 @@ enum {
+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,
Opt_grpquota,
Opt_err,
};
-@@ -198,6 +199,9 @@ static const match_table_t tokens = {
+@@ -199,6 +200,9 @@ static const match_table_t tokens = {
{Opt_noacl, "noacl"},
{Opt_usrquota, "usrquota"},
{Opt_grpquota, "grpquota"},
{Opt_err, NULL}
};
-@@ -436,6 +440,13 @@ static int ocfs2_remount(struct super_bl
+@@ -605,6 +609,13 @@ static int ocfs2_remount(struct super_bl
goto out;
}
-+ if ((parsed_options.mount_opt & OCFS2_MOUNT_TAGGED) &&
-+ !(sb->s_flags & MS_TAGGED)) {
++ if ((osb->s_mount_opt & OCFS2_MOUNT_TAGGED) !=
++ (parsed_options.mount_opt & OCFS2_MOUNT_TAGGED)) {
+ ret = -EINVAL;
+ mlog(ML_ERROR, "Cannot change tagging on remount\n");
+ goto out;
if ((osb->s_mount_opt & OCFS2_MOUNT_HB_LOCAL) !=
(parsed_options.mount_opt & OCFS2_MOUNT_HB_LOCAL)) {
ret = -EINVAL;
-@@ -950,6 +961,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
-@@ -1208,6 +1222,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.29.1/fs/open.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/open.c
---- linux-2.6.29.1/fs/open.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/open.c 2009-03-24 14:48:35.000000000 +0100
-@@ -29,22 +29,31 @@
- #include <linux/rcupdate.h>
+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>
+ #include <linux/fs_struct.h>
+#include <linux/vs_base.h>
+#include <linux/vs_limit.h>
-+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
+#include <linux/vs_cowbl.h>
}
return retval;
}
-@@ -638,6 +647,10 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
+@@ -640,6 +648,10 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path);
if (error)
goto out;
inode = path.dentry->d_inode;
error = mnt_want_write(path.mnt);
-@@ -671,11 +684,11 @@ static int chown_common(struct dentry *
+@@ -673,11 +685,11 @@ static int chown_common(struct dentry *
newattrs.ia_valid = ATTR_CTIME;
if (user != (uid_t) -1) {
newattrs.ia_valid |= ATTR_UID;
}
if (!S_ISDIR(inode->i_mode))
newattrs.ia_valid |=
-@@ -698,7 +711,11 @@ SYSCALL_DEFINE3(chown, const char __user
+@@ -700,7 +712,11 @@ SYSCALL_DEFINE3(chown, const char __user
error = mnt_want_write(path.mnt);
if (error)
goto out_release;
mnt_drop_write(path.mnt);
out_release:
path_put(&path);
-@@ -723,7 +740,11 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
+@@ -725,7 +741,11 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
error = mnt_want_write(path.mnt);
if (error)
goto out_release;
mnt_drop_write(path.mnt);
out_release:
path_put(&path);
-@@ -742,7 +763,11 @@ SYSCALL_DEFINE3(lchown, const char __use
+@@ -744,7 +764,11 @@ SYSCALL_DEFINE3(lchown, const char __use
error = mnt_want_write(path.mnt);
if (error)
goto out_release;
mnt_drop_write(path.mnt);
out_release:
path_put(&path);
-@@ -986,6 +1011,7 @@ static void __put_unused_fd(struct files
+@@ -990,6 +1014,7 @@ static void __put_unused_fd(struct files
__FD_CLR(fd, fdt->open_fds);
if (fd < files->next_fd)
files->next_fd = fd;
}
void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-2.6.29.1/fs/proc/array.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/proc/array.c
---- linux-2.6.29.1/fs/proc/array.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/proc/array.c 2009-03-25 01:07:51.000000000 +0100
-@@ -81,6 +81,8 @@
- #include <linux/seq_file.h>
+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/vs_context.h>
+#include <linux/vs_network.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-@@ -137,8 +139,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)
-@@ -165,6 +168,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);
-@@ -280,7 +286,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;
-@@ -305,10 +311,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,
-@@ -320,6 +327,42 @@ static inline void task_context_switch_c
+@@ -321,6 +327,43 @@ static inline void task_context_switch_c
p->nivcsw);
}
++
+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)
{
-@@ -335,6 +378,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
-@@ -447,6 +491,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.29.1/fs/proc/base.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/proc/base.c
---- linux-2.6.29.1/fs/proc/base.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/proc/base.c 2009-03-24 16:29:35.000000000 +0100
-@@ -80,6 +80,8 @@
- #include <linux/oom.h>
+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 <linux/fs_struct.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
#include "internal.h"
/* NOTE:
-@@ -1458,6 +1460,8 @@ static struct inode *proc_pid_make_inode
+@@ -1075,12 +1077,17 @@ static ssize_t oom_adjust_write(struct f
+ return -ESRCH;
+ }
+
+- if (oom_adjust < task->signal->oom_adj && !capable(CAP_SYS_RESOURCE)) {
++ if (oom_adjust < task->signal->oom_adj &&
++ !vx_capable(CAP_SYS_RESOURCE, VXC_OOM_ADJUST)) {
+ unlock_task_sighand(task, &flags);
+ put_task_struct(task);
+ return -EACCES;
+ }
+
++ /* prevent guest processes from circumventing the oom killer */
++ if (vx_current_xid() && (oom_adjust == OOM_DISABLE))
++ oom_adjust = OOM_ADJUST_MIN;
++
+ task->signal->oom_adj = oom_adjust;
+
+ unlock_task_sighand(task, &flags);
+@@ -1120,7 +1127,7 @@ static ssize_t proc_loginuid_write(struc
+ ssize_t length;
+ uid_t loginuid;
+
+- if (!capable(CAP_AUDIT_CONTROL))
++ if (!vx_capable(CAP_AUDIT_CONTROL, VXC_AUDIT_CONTROL))
+ return -EPERM;
+
+ if (current != pid_task(proc_pid(inode), PIDTYPE_PID))
+@@ -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 +2012,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.
-@@ -2393,7 +2404,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);
-@@ -2483,6 +2494,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),
-@@ -2541,6 +2555,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
-@@ -2556,6 +2572,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,
-@@ -2752,7 +2769,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
-@@ -2782,7 +2799,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);
}
-@@ -2791,7 +2808,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;
+
+- 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;
-@@ -2811,6 +2828,8 @@ int proc_pid_readdir(struct file * filp,
+@@ -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;
-@@ -2957,6 +2976,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.29.1/fs/proc/generic.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/proc/generic.c
---- linux-2.6.29.1/fs/proc/generic.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/proc/generic.c 2009-03-24 14:48:35.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>
#include <asm/uaccess.h>
#include "internal.h"
-@@ -382,6 +383,8 @@ struct dentry *proc_lookup_de(struct pro
+@@ -425,6 +426,8 @@ struct dentry *proc_lookup_de(struct pro
for (de = de->subdir; de ; de = de->next) {
if (de->namelen != dentry->d_name.len)
continue;
if (!memcmp(dentry->d_name.name, de->name, de->namelen)) {
unsigned int ino;
-@@ -390,6 +393,8 @@ struct dentry *proc_lookup_de(struct pro
+@@ -433,6 +436,8 @@ struct dentry *proc_lookup_de(struct pro
spin_unlock(&proc_subdir_lock);
error = -EINVAL;
inode = proc_get_inode(dir->i_sb, ino, de);
goto out_unlock;
}
}
-@@ -467,6 +472,8 @@ int proc_readdir_de(struct proc_dir_entr
+@@ -510,6 +515,8 @@ int proc_readdir_de(struct proc_dir_entr
/* filldir passes info to user space */
de_get(de);
spin_unlock(&proc_subdir_lock);
if (filldir(dirent, de->name, de->namelen, filp->f_pos,
de->low_ino, de->mode >> 12) < 0) {
-@@ -474,6 +481,7 @@ int proc_readdir_de(struct proc_dir_entr
+@@ -517,6 +524,7 @@ int proc_readdir_de(struct proc_dir_entr
goto out;
}
spin_lock(&proc_subdir_lock);
filp->f_pos++;
next = de->next;
de_put(de);
-@@ -588,6 +596,7 @@ static struct proc_dir_entry *__proc_cre
+@@ -631,6 +639,7 @@ static struct proc_dir_entry *__proc_cre
ent->nlink = nlink;
atomic_set(&ent->count, 1);
ent->pde_users = 0;
spin_lock_init(&ent->pde_unload_lock);
ent->pde_unload_completion = NULL;
INIT_LIST_HEAD(&ent->pde_openers);
-@@ -611,7 +620,8 @@ struct proc_dir_entry *proc_symlink(cons
+@@ -654,7 +663,8 @@ struct proc_dir_entry *proc_symlink(cons
kfree(ent->data);
kfree(ent);
ent = NULL;
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-2.6.29.1/fs/proc/inode.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/proc/inode.c
---- linux-2.6.29.1/fs/proc/inode.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/proc/inode.c 2009-03-24 14:48:35.000000000 +0100
-@@ -465,6 +465,8 @@ struct inode *proc_get_inode(struct supe
+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.29.1/fs/proc/internal.h linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/proc/internal.h
---- linux-2.6.29.1/fs/proc/internal.h 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/proc/internal.h 2009-03-24 14:48:35.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.29.1/fs/proc/meminfo.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/proc/meminfo.c
---- linux-2.6.29.1/fs/proc/meminfo.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/proc/meminfo.c 2009-03-24 14:48:35.000000000 +0100
-@@ -41,7 +41,7 @@ static int meminfo_proc_show(struct seq_
+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 @@
- cached = global_page_state(NR_FILE_PAGES) -
+ static int loadavg_proc_show(struct seq_file *m, void *v)
+ {
++ unsigned long running;
++ unsigned int threads;
+ unsigned long avnrun[3];
+
+ get_avenrun(avnrun, FIXED_1/200, 0);
+
++ if (vx_flags(VXF_VIRT_LOAD, 0)) {
++ struct vx_info *vxi = current_vx_info();
++
++ running = atomic_read(&vxi->cvirt.nr_running);
++ threads = atomic_read(&vxi->cvirt.nr_threads);
++ } else {
++ running = nr_running();
++ threads = nr_threads;
++ }
++
+ seq_printf(m, "%lu.%02lu %lu.%02lu %lu.%02lu %ld/%d %d\n",
+ LOAD_INT(avnrun[0]), LOAD_FRAC(avnrun[0]),
+ LOAD_INT(avnrun[1]), LOAD_FRAC(avnrun[1]),
+ LOAD_INT(avnrun[2]), LOAD_FRAC(avnrun[2]),
+- nr_running(), nr_threads,
++ running, threads,
+ task_active_pid_ns(current)->last_pid);
+ return 0;
+ }
+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.29.1/fs/proc/root.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/proc/root.c
---- linux-2.6.29.1/fs/proc/root.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/proc/root.c 2009-03-24 14:48:35.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.29.1/fs/proc/uptime.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/proc/uptime.c
---- linux-2.6.29.1/fs/proc/uptime.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/proc/uptime.c 2009-02-22 22:54:25.000000000 +0100
-@@ -2,6 +2,7 @@
- #include <linux/proc_fs.h>
- #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/vserver/cvirt.h>
#include <asm/cputime.h>
- static int proc_calc_metrics(char *page, char **start, off_t off,
-@@ -29,6 +30,10 @@ static int uptime_read_proc(char *page,
- do_posix_clock_monotonic_gettime(&uptime);
- monotonic_to_bootbased(&uptime);
- cputime_to_timespec(idletime, &idle);
+ static int uptime_proc_show(struct seq_file *m, void *v)
+@@ -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);
+
- len = sprintf(page, "%lu.%02lu %lu.%02lu\n",
+ 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.29.1/fs/quota.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/quota.c
---- linux-2.6.29.1/fs/quota.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/quota.c 2009-03-24 14:48:35.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>
+#include <linux/vs_context.h>
/* Check validity of generic quotactl commands */
- static int generic_quotactl_valid(struct super_block *sb, int type, int cmd, qid_t id)
-@@ -81,11 +82,11 @@ static int generic_quotactl_valid(struct
+ static int generic_quotactl_valid(struct super_block *sb, int type, int cmd,
+@@ -83,11 +84,11 @@ static int generic_quotactl_valid(struct
if (cmd == Q_GETQUOTA) {
if (((type == USRQUOTA && current_euid() != id) ||
(type == GRPQUOTA && !in_egroup_p(id))) &&
return -EPERM;
return 0;
-@@ -132,10 +133,10 @@ static int xqm_quotactl_valid(struct sup
+@@ -135,10 +136,10 @@ static int xqm_quotactl_valid(struct sup
if (cmd == Q_XGETQUOTA) {
if (((type == XQM_USRQUOTA && current_euid() != id) ||
(type == XQM_GRPQUOTA && !in_egroup_p(id))) &&
return -EPERM;
}
-@@ -337,6 +338,46 @@ static int do_quotactl(struct super_bloc
+@@ -351,6 +352,46 @@ static int do_quotactl(struct super_bloc
return 0;
}
/*
* look up a superblock on which quota ops will be performed
* - use the name of a block device to find the superblock thereon
-@@ -354,6 +395,22 @@ static inline struct super_block *quotac
+@@ -368,6 +409,22 @@ static struct super_block *quotactl_bloc
putname(tmp);
if (IS_ERR(bdev))
return ERR_CAST(bdev);
sb = get_super(bdev);
bdput(bdev);
if (!sb)
-diff -NurpP --minimal linux-2.6.29.1/fs/reiserfs/bitmap.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/reiserfs/bitmap.c
---- linux-2.6.29.1/fs/reiserfs/bitmap.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/reiserfs/bitmap.c 2009-02-22 22:54:25.000000000 +0100
-@@ -13,6 +13,7 @@
- #include <linux/reiserfs_fs_sb.h>
- #include <linux/reiserfs_fs_i.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
-
- #define PREALLOCATION_SIZE 9
-
-@@ -429,8 +430,10 @@ static void _reiserfs_free_block(struct
- set_sb_free_blocks(rs, sb_free_blocks(rs) + 1);
-
- journal_mark_dirty(th, s, sbh);
-- if (for_unformatted)
-+ if (for_unformatted) {
-+ DLIMIT_FREE_BLOCK(inode, 1);
- DQUOT_FREE_BLOCK_NODIRTY(inode, 1);
-+ }
- }
-
- void reiserfs_free_block(struct reiserfs_transaction_handle *th,
-@@ -1045,6 +1048,7 @@ static inline int blocknrs_and_prealloc_
- b_blocknr_t finish = SB_BLOCK_COUNT(s) - 1;
- int passno = 0;
- int nr_allocated = 0;
-+ int blocks;
-
- determine_prealloc_size(hint);
- if (!hint->formatted_node) {
-@@ -1054,19 +1058,30 @@ static inline int blocknrs_and_prealloc_
- "reiserquota: allocating %d blocks id=%u",
- amount_needed, hint->inode->i_uid);
- #endif
-- quota_ret =
-- DQUOT_ALLOC_BLOCK_NODIRTY(hint->inode, amount_needed);
-- if (quota_ret) /* Quota exceeded? */
-+ quota_ret = DQUOT_ALLOC_BLOCK_NODIRTY(hint->inode,
-+ amount_needed);
-+ if (quota_ret)
- return QUOTA_EXCEEDED;
-+ if (DLIMIT_ALLOC_BLOCK(hint->inode, amount_needed)) {
-+ DQUOT_FREE_BLOCK_NODIRTY(hint->inode,
-+ amount_needed);
-+ return NO_DISK_SPACE;
-+ }
-+
- if (hint->preallocate && hint->prealloc_size) {
- #ifdef REISERQUOTA_DEBUG
- reiserfs_debug(s, REISERFS_DEBUG_CODE,
- "reiserquota: allocating (prealloc) %d blocks id=%u",
- hint->prealloc_size, hint->inode->i_uid);
- #endif
-- quota_ret =
-- DQUOT_PREALLOC_BLOCK_NODIRTY(hint->inode,
-- hint->prealloc_size);
-+ quota_ret = DQUOT_PREALLOC_BLOCK_NODIRTY(hint->inode,
-+ hint->prealloc_size);
-+ if (!quota_ret &&
-+ DLIMIT_ALLOC_BLOCK(hint->inode, hint->prealloc_size)) {
-+ DQUOT_FREE_BLOCK_NODIRTY(hint->inode,
-+ hint->prealloc_size);
-+ quota_ret = 1;
-+ }
- if (quota_ret)
- hint->preallocate = hint->prealloc_size = 0;
- }
-@@ -1098,7 +1113,10 @@ static inline int blocknrs_and_prealloc_
- nr_allocated,
- hint->inode->i_uid);
- #endif
-- DQUOT_FREE_BLOCK_NODIRTY(hint->inode, amount_needed + hint->prealloc_size - nr_allocated); /* Free not allocated blocks */
-+ /* Free not allocated blocks */
-+ blocks = amount_needed + hint->prealloc_size - nr_allocated;
-+ DLIMIT_FREE_BLOCK(hint->inode, blocks);
-+ DQUOT_FREE_BLOCK_NODIRTY(hint->inode, blocks);
- }
- while (nr_allocated--)
- reiserfs_free_block(hint->th, hint->inode,
-@@ -1129,10 +1147,10 @@ static inline int blocknrs_and_prealloc_
- REISERFS_I(hint->inode)->i_prealloc_count,
- hint->inode->i_uid);
- #endif
-- DQUOT_FREE_BLOCK_NODIRTY(hint->inode, amount_needed +
-- hint->prealloc_size - nr_allocated -
-- REISERFS_I(hint->inode)->
-- i_prealloc_count);
-+ blocks = amount_needed + hint->prealloc_size - nr_allocated -
-+ REISERFS_I(hint->inode)->i_prealloc_count;
-+ DLIMIT_FREE_BLOCK(hint->inode, blocks);
-+ DQUOT_FREE_BLOCK_NODIRTY(hint->inode, blocks);
- }
-
- return CARRY_ON;
-diff -NurpP --minimal linux-2.6.29.1/fs/reiserfs/file.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/reiserfs/file.c
---- linux-2.6.29.1/fs/reiserfs/file.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/reiserfs/file.c 2009-02-22 22:54:25.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.29.1/fs/reiserfs/inode.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/reiserfs/inode.c
---- linux-2.6.29.1/fs/reiserfs/inode.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/reiserfs/inode.c 2009-03-24 14:48:35.000000000 +0100
-@@ -18,6 +18,8 @@
+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>
#include <linux/swap.h>
-+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
int reiserfs_commit_write(struct file *f, struct page *page,
unsigned from, unsigned to);
-@@ -54,6 +56,7 @@ void reiserfs_delete_inode(struct inode
- * stat data deletion */
- if (!err)
- DQUOT_FREE_INODE(inode);
-+ DLIMIT_FREE_INODE(inode);
-
- if (journal_end(&th, inode->i_sb, jbegin_count))
- goto out;
-@@ -1116,6 +1119,8 @@ static void init_inode(struct inode *ino
+@@ -1117,6 +1118,8 @@ static void init_inode(struct inode *ino
struct buffer_head *bh;
struct item_head *ih;
__u32 rdev;
//int version = ITEM_VERSION_1;
bh = PATH_PLAST_BUFFER(path);
-@@ -1139,12 +1144,13 @@ static void init_inode(struct inode *ino
+@@ -1138,12 +1141,13 @@ static void init_inode(struct inode *ino
(struct stat_data_v1 *)B_I_PITEM(bh, ih);
unsigned long blocks;
inode->i_size = sd_v1_size(sd);
inode->i_atime.tv_sec = sd_v1_atime(sd);
inode->i_mtime.tv_sec = sd_v1_mtime(sd);
-@@ -1186,11 +1192,12 @@ static void init_inode(struct inode *ino
+@@ -1185,11 +1189,12 @@ static void init_inode(struct inode *ino
// (directories and symlinks)
struct stat_data *sd = (struct stat_data *)B_I_PITEM(bh, ih);
inode->i_mtime.tv_sec = sd_v2_mtime(sd);
inode->i_atime.tv_sec = sd_v2_atime(sd);
inode->i_ctime.tv_sec = sd_v2_ctime(sd);
-@@ -1220,6 +1227,10 @@ static void init_inode(struct inode *ino
+@@ -1219,6 +1224,10 @@ static void init_inode(struct inode *ino
sd_attrs_to_i_attrs(sd_v2_attrs(sd), inode);
}
pathrelse(path);
if (S_ISREG(inode->i_mode)) {
inode->i_op = &reiserfs_file_inode_operations;
-@@ -1242,13 +1253,15 @@ static void init_inode(struct inode *ino
+@@ -1241,13 +1250,15 @@ static void init_inode(struct inode *ino
static void inode2sd(void *sd, struct inode *inode, loff_t size)
{
struct stat_data *sd_v2 = (struct stat_data *)sd;
set_sd_v2_mtime(sd_v2, inode->i_mtime.tv_sec);
set_sd_v2_atime(sd_v2, inode->i_atime.tv_sec);
set_sd_v2_ctime(sd_v2, inode->i_ctime.tv_sec);
-@@ -1763,6 +1776,10 @@ int reiserfs_new_inode(struct reiserfs_t
-
- BUG_ON(!th->t_trans_id);
-
-+ if (DLIMIT_ALLOC_INODE(inode)) {
-+ err = -ENOSPC;
-+ goto out_bad_dlimit;
-+ }
- if (DQUOT_ALLOC_INODE(inode)) {
- err = -EDQUOT;
- goto out_end_trans;
-@@ -1950,6 +1967,9 @@ int reiserfs_new_inode(struct reiserfs_t
- DQUOT_FREE_INODE(inode);
-
- out_end_trans:
-+ DLIMIT_FREE_INODE(inode);
-+
-+ out_bad_dlimit:
- journal_end(th, th->t_super, th->t_blocks_allocated);
- /* Drop can be outside and it needs more credits so it's better to have it outside */
- DQUOT_DROP(inode);
-@@ -2837,14 +2857,19 @@ int reiserfs_commit_write(struct file *f
+@@ -2839,14 +2850,19 @@ int reiserfs_commit_write(struct file *f
void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode)
{
if (reiserfs_attrs(inode->i_sb)) {
if (sd_attrs & REISERFS_APPEND_FL)
inode->i_flags |= S_APPEND;
else
-@@ -2857,6 +2882,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs,
+@@ -2859,6 +2875,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs,
REISERFS_I(inode)->i_flags |= i_nopack_mask;
else
REISERFS_I(inode)->i_flags &= ~i_nopack_mask;
}
}
-@@ -2867,6 +2901,11 @@ void i_attrs_to_sd_attrs(struct inode *i
+@@ -2869,6 +2894,11 @@ void i_attrs_to_sd_attrs(struct inode *i
*sd_attrs |= REISERFS_IMMUTABLE_FL;
else
*sd_attrs &= ~REISERFS_IMMUTABLE_FL;
if (inode->i_flags & S_SYNC)
*sd_attrs |= REISERFS_SYNC_FL;
else
-@@ -2879,6 +2918,15 @@ void i_attrs_to_sd_attrs(struct inode *i
+@@ -2881,6 +2911,15 @@ void i_attrs_to_sd_attrs(struct inode *i
*sd_attrs |= REISERFS_NOTAIL_FL;
else
*sd_attrs &= ~REISERFS_NOTAIL_FL;
}
}
-@@ -3046,6 +3094,22 @@ static ssize_t reiserfs_direct_IO(int rw
- reiserfs_get_blocks_direct_io, NULL);
- }
-
-+int reiserfs_sync_flags(struct inode *inode)
-+{
-+ u16 oldflags, newflags;
-+
-+ oldflags = REISERFS_I(inode)->i_attrs;
-+ newflags = oldflags;
-+ i_attrs_to_sd_attrs(inode, &newflags);
-+
-+ if (oldflags ^ newflags) {
-+ REISERFS_I(inode)->i_attrs = newflags;
-+ inode->i_ctime = CURRENT_TIME_SEC;
-+ mark_inode_dirty(inode);
-+ }
-+ return 0;
-+}
-+
- int reiserfs_setattr(struct dentry *dentry, struct iattr *attr)
- {
- struct inode *inode = dentry->d_inode;
-@@ -3099,9 +3163,11 @@ int reiserfs_setattr(struct dentry *dent
+@@ -3101,9 +3140,11 @@ int reiserfs_setattr(struct dentry *dent
}
error = inode_change_ok(inode, attr);
error = reiserfs_chown_xattrs(inode, attr);
if (!error) {
-@@ -3131,6 +3197,9 @@ int reiserfs_setattr(struct dentry *dent
+@@ -3133,6 +3174,9 @@ int reiserfs_setattr(struct dentry *dent
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
mark_inode_dirty(inode);
error =
journal_end(&th, inode->i_sb, jbegin_count);
-diff -NurpP --minimal linux-2.6.29.1/fs/reiserfs/ioctl.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/reiserfs/ioctl.c
---- linux-2.6.29.1/fs/reiserfs/ioctl.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/reiserfs/ioctl.c 2009-02-22 22:54:25.000000000 +0100
-@@ -7,6 +7,7 @@
+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>
#include <linux/time.h>
#include <asm/uaccess.h>
#include <linux/pagemap.h>
#include <linux/smp_lock.h>
-@@ -23,7 +24,7 @@
+ #include <linux/compat.h>
+
++
++int reiserfs_sync_flags(struct inode *inode, int flags, int vflags)
++{
++ __u16 sd_attrs = 0;
++
++ inode->i_flags = flags;
++ inode->i_vflags = vflags;
++
++ i_attrs_to_sd_attrs(inode, &sd_attrs);
++ REISERFS_I(inode)->i_attrs = sd_attrs;
++ inode->i_ctime = CURRENT_TIME_SEC;
++ mark_inode_dirty(inode);
++ return 0;
++}
++
+ /*
+ ** reiserfs_ioctl - handler for ioctl for inode
+ ** supported commands:
+@@ -23,7 +39,7 @@
int reiserfs_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
unsigned long arg)
{
int err = 0;
switch (cmd) {
-@@ -43,6 +44,7 @@ int reiserfs_ioctl(struct inode *inode,
+@@ -43,6 +59,7 @@ int reiserfs_ioctl(struct inode *inode,
flags = REISERFS_I(inode)->i_attrs;
i_attrs_to_sd_attrs(inode, (__u16 *) & flags);
return put_user(flags, (int __user *)arg);
case REISERFS_IOC_SETFLAGS:{
if (!reiserfs_attrs(inode->i_sb))
-@@ -60,6 +62,10 @@ int reiserfs_ioctl(struct inode *inode,
+@@ -60,6 +77,10 @@ int reiserfs_ioctl(struct inode *inode,
err = -EFAULT;
goto setflags_out;
}
/*
* Is it quota file? Do not allow user to mess with it
*/
-@@ -84,6 +90,10 @@ int reiserfs_ioctl(struct inode *inode,
+@@ -84,6 +105,10 @@ int reiserfs_ioctl(struct inode *inode,
goto setflags_out;
}
}
+
+ oldflags = REISERFS_I(inode)->i_attrs;
-+ flags = flags & REISERFS_FL_USER_MODIFIABLE;
++ flags &= REISERFS_FL_USER_MODIFIABLE;
+ flags |= oldflags & ~REISERFS_FL_USER_MODIFIABLE;
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.29.1/fs/reiserfs/namei.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/reiserfs/namei.c
---- linux-2.6.29.1/fs/reiserfs/namei.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/reiserfs/namei.c 2009-03-24 14:48:35.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>
#define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { inc_nlink(i); if (i->i_nlink >= REISERFS_LINK_MAX) i->i_nlink=1; }
#define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) drop_nlink(i);
-@@ -360,6 +361,7 @@ static struct dentry *reiserfs_lookup(st
- reiserfs_write_unlock(dir->i_sb);
- return ERR_PTR(-EACCES);
- }
+@@ -354,6 +355,7 @@ static struct dentry *reiserfs_lookup(st
+ if (retval == IO_ERROR) {
+ return ERR_PTR(-EIO);
+ }
+ dx_propagate_tag(nd, inode);
- /* Propogate the priv_object flag so we know we're in the priv tree */
- if (is_reiserfs_priv_object(dir))
-@@ -586,6 +588,7 @@ static int new_inode_init(struct inode *
+ return d_splice_alias(inode, dentry);
+ }
+@@ -570,6 +572,7 @@ static int new_inode_init(struct inode *
} else {
inode->i_gid = current_fsgid();
}
+ inode->i_tag = dx_current_fstag(inode->i_sb);
- DQUOT_INIT(inode);
+ vfs_dq_init(inode);
return 0;
}
-@@ -1540,6 +1543,7 @@ const struct inode_operations reiserfs_d
+@@ -1515,6 +1518,7 @@ const struct inode_operations reiserfs_d
.listxattr = reiserfs_listxattr,
.removexattr = reiserfs_removexattr,
.permission = reiserfs_permission,
};
/*
-@@ -1556,6 +1560,7 @@ const struct inode_operations reiserfs_s
- .listxattr = reiserfs_listxattr,
- .removexattr = reiserfs_removexattr,
- .permission = reiserfs_permission,
-+ .sync_flags = reiserfs_sync_flags,
-
- };
-
-@@ -1569,5 +1574,6 @@ const struct inode_operations reiserfs_s
- .listxattr = reiserfs_listxattr,
- .removexattr = reiserfs_removexattr,
- .permission = reiserfs_permission,
-+ .sync_flags = reiserfs_sync_flags,
-
- };
-diff -NurpP --minimal linux-2.6.29.1/fs/reiserfs/stree.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/reiserfs/stree.c
---- linux-2.6.29.1/fs/reiserfs/stree.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/reiserfs/stree.c 2009-02-22 22:54:25.000000000 +0100
-@@ -55,6 +55,7 @@
- #include <linux/reiserfs_fs.h>
- #include <linux/buffer_head.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
-
- /* Does the buffer contain a disk block which is in the tree. */
- inline int B_IS_IN_TREE(const struct buffer_head *p_s_bh)
-@@ -1297,6 +1298,7 @@ int reiserfs_delete_item(struct reiserfs
- "reiserquota delete_item(): freeing %u, id=%u type=%c",
- quota_cut_bytes, p_s_inode->i_uid, head2type(&s_ih));
- #endif
-+ DLIMIT_FREE_SPACE(p_s_inode, quota_cut_bytes);
- DQUOT_FREE_SPACE_NODIRTY(p_s_inode, quota_cut_bytes);
-
- /* Return deleted body length */
-@@ -1385,6 +1387,7 @@ void reiserfs_delete_solid_item(struct r
- #endif
- DQUOT_FREE_SPACE_NODIRTY(inode,
- quota_cut_bytes);
-+ DLIMIT_FREE_SPACE(inode, quota_cut_bytes);
- }
- break;
- }
-@@ -1734,6 +1737,7 @@ int reiserfs_cut_from_item(struct reiser
- "reiserquota cut_from_item(): freeing %u id=%u type=%c",
- quota_cut_bytes, p_s_inode->i_uid, '?');
- #endif
-+ DLIMIT_FREE_SPACE(p_s_inode, quota_cut_bytes);
- DQUOT_FREE_SPACE_NODIRTY(p_s_inode, quota_cut_bytes);
- return n_ret_value;
- }
-@@ -1975,6 +1979,11 @@ int reiserfs_paste_into_item(struct reis
- pathrelse(p_s_search_path);
- return -EDQUOT;
- }
-+ if (DLIMIT_ALLOC_SPACE(inode, n_pasted_size)) {
-+ DQUOT_FREE_SPACE_NODIRTY(inode, n_pasted_size);
-+ pathrelse(p_s_search_path);
-+ return -ENOSPC;
-+ }
- init_tb_struct(th, &s_paste_balance, th->t_super, p_s_search_path,
- n_pasted_size);
- #ifdef DISPLACE_NEW_PACKING_LOCALITIES
-@@ -2027,6 +2036,7 @@ int reiserfs_paste_into_item(struct reis
- n_pasted_size, inode->i_uid,
- key2type(&(p_s_key->on_disk_key)));
- #endif
-+ DLIMIT_FREE_SPACE(inode, n_pasted_size);
- DQUOT_FREE_SPACE_NODIRTY(inode, n_pasted_size);
- return retval;
- }
-@@ -2064,6 +2074,11 @@ int reiserfs_insert_item(struct reiserfs
- pathrelse(p_s_path);
- return -EDQUOT;
- }
-+ if (DLIMIT_ALLOC_SPACE(inode, quota_bytes)) {
-+ DQUOT_FREE_SPACE_NODIRTY(inode, quota_bytes);
-+ pathrelse(p_s_path);
-+ return -ENOSPC;
-+ }
- }
- init_tb_struct(th, &s_ins_balance, th->t_super, p_s_path,
- IH_SIZE + ih_item_len(p_s_ih));
-@@ -2111,7 +2126,9 @@ int reiserfs_insert_item(struct reiserfs
- "reiserquota insert_item(): freeing %u id=%u type=%c",
- quota_bytes, inode->i_uid, head2type(p_s_ih));
- #endif
-- if (inode)
-+ if (inode) {
-+ DLIMIT_FREE_SPACE(inode, quota_bytes);
- DQUOT_FREE_SPACE_NODIRTY(inode, quota_bytes);
-+ }
- return retval;
- }
-diff -NurpP --minimal linux-2.6.29.1/fs/reiserfs/super.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/reiserfs/super.c
---- linux-2.6.29.1/fs/reiserfs/super.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/reiserfs/super.c 2009-03-24 14:48:35.000000000 +0100
-@@ -902,6 +902,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},
-@@ -1195,6 +1203,12 @@ static int reiserfs_remount(struct super
+@@ -1195,6 +1203,14 @@ static int reiserfs_remount(struct super
handle_quota_files(s, qf_names, &qfmt);
#endif
+ if ((mount_options & (1 << REISERFS_TAGGED)) &&
+ !(s->s_flags & MS_TAGGED)) {
-+ reiserfs_warning(s, "reiserfs: tagging not permitted on remount.");
-+ return -EINVAL;
++ reiserfs_warning(s, "super-vs01",
++ "reiserfs: tagging not permitted on remount.");
++ err = -EINVAL;
++ goto out_err;
+ }
+
handle_attrs(s);
/* Add options that are safe here */
-@@ -1659,6 +1673,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.29.1/fs/reiserfs/xattr.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/reiserfs/xattr.c
---- linux-2.6.29.1/fs/reiserfs/xattr.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/reiserfs/xattr.c 2009-02-22 22:54:25.000000000 +0100
-@@ -35,6 +35,7 @@
+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/fs.h>
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/xattr.h>
-diff -NurpP --minimal linux-2.6.29.1/fs/stat.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/stat.c
---- linux-2.6.29.1/fs/stat.c 2009-03-24 14:22:36.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/stat.c 2009-03-24 14:48:35.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.29.1/fs/super.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/super.c
---- linux-2.6.29.1/fs/super.c 2009-03-24 14:22:36.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/super.c 2009-03-24 16:32:06.000000000 +0100
-@@ -39,6 +39,9 @@
+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 <linux/file.h>
- #include <linux/async.h>
+#include <linux/devpts_fs.h>
+#include <linux/proc_fs.h>
+#include <linux/vs_context.h>
#include <asm/uaccess.h>
#include "internal.h"
-@@ -918,12 +921,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)
-@@ -942,9 +951,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.29.1/fs/sysfs/mount.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/sysfs/mount.c
---- linux-2.6.29.1/fs/sysfs/mount.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/sysfs/mount.c 2009-02-22 22:54:25.000000000 +0100
-@@ -20,8 +20,6 @@
-
- #include "sysfs.h"
-
--/* Random magic number */
--#define SYSFS_MAGIC 0x62656572
-
- static struct vfsmount *sysfs_mount;
- struct super_block * sysfs_sb = NULL;
-@@ -47,7 +45,7 @@ static int sysfs_fill_super(struct super
+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_blocksize_bits = PAGE_CACHE_SHIFT;
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
sysfs_sb = sb;
-diff -NurpP --minimal linux-2.6.29.1/fs/utimes.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/utimes.c
---- linux-2.6.29.1/fs/utimes.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/utimes.c 2009-02-22 22:54:25.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.29.1/fs/xattr.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xattr.c
---- linux-2.6.29.1/fs/xattr.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xattr.c 2009-03-24 14:48:35.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.29.1/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.29.1/fs/xfs/linux-2.6/xfs_ioctl.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/linux-2.6/xfs_ioctl.c 2009-03-24 14:48:35.000000000 +0100
-@@ -769,6 +769,10 @@ xfs_merge_ioc_xflags(
+@@ -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_inode.h"
+-#include "xfs_ioctl.h"
+ #include "xfs_btree.h"
+ #include "xfs_ialloc.h"
+ #include "xfs_rtalloc.h"
+@@ -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
-@@ -797,6 +801,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)
-@@ -855,6 +861,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)
-@@ -897,6 +905,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
-@@ -1371,10 +1383,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.29.1/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.29.1/fs/xfs/linux-2.6/xfs_iops.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/linux-2.6/xfs_iops.c 2009-03-24 16:33:10.000000000 +0100
-@@ -54,6 +54,7 @@
+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 int
++xfs_sync_flags(
++ struct inode *inode,
++ int flags,
++ int vflags);
++
+ extern long
+ xfs_file_ioctl(
+ struct file *filp,
+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"
+ #include "xfs_inode.h"
++#include "xfs_ioctl.h"
+ #include "xfs_bmap.h"
+ #include "xfs_btree.h"
+ #include "xfs_ialloc.h"
+@@ -55,6 +56,7 @@
#include <linux/security.h>
#include <linux/falloc.h>
#include <linux/fiemap.h>
+#include <linux/vs_tag.h>
/*
- * Bring the atime in the XFS inode uptodate.
-@@ -552,6 +553,7 @@ xfs_vn_getattr(
+ * Bring the timestamps in the XFS inode uptodate.
+@@ -495,6 +497,7 @@ xfs_vn_getattr(
stat->nlink = ip->i_d.di_nlink;
stat->uid = ip->i_d.di_uid;
stat->gid = ip->i_d.di_gid;
+ stat->tag = ip->i_d.di_tag;
stat->ino = ip->i_ino;
- #if XFS_BIG_INUMS
- stat->ino += mp->m_inoadd;
-@@ -591,6 +593,12 @@ xfs_vn_getattr(
- }
-
- STATIC int
-+xfs_vn_sync_xflags(struct inode *inode)
-+{
-+ return -xfs_sync_xflags(XFS_I(inode));
-+}
-+
-+STATIC int
- xfs_vn_setattr(
- struct dentry *dentry,
- struct iattr *iattr)
-@@ -748,6 +756,7 @@ static const struct inode_operations xfs
+ stat->atime = inode->i_atime;
+ stat->mtime = inode->i_mtime;
+@@ -686,6 +689,7 @@ static const struct inode_operations xfs
.listxattr = xfs_vn_listxattr,
.fallocate = xfs_vn_fallocate,
.fiemap = xfs_vn_fiemap,
-+ .sync_flags = xfs_vn_sync_xflags,
++ .sync_flags = xfs_sync_flags,
};
static const struct inode_operations xfs_dir_inode_operations = {
-@@ -773,6 +782,7 @@ static const struct inode_operations xfs
+@@ -711,6 +715,7 @@ static const struct inode_operations xfs
.getxattr = generic_getxattr,
.removexattr = generic_removexattr,
.listxattr = xfs_vn_listxattr,
-+ .sync_flags = xfs_vn_sync_xflags,
++ .sync_flags = xfs_sync_flags,
};
static const struct inode_operations xfs_dir_ci_inode_operations = {
-@@ -822,6 +832,10 @@ xfs_diflags_to_iflags(
+@@ -760,6 +765,10 @@ xfs_diflags_to_iflags(
inode->i_flags |= S_IMMUTABLE;
else
inode->i_flags &= ~S_IMMUTABLE;
if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
inode->i_flags |= S_APPEND;
else
-@@ -834,6 +848,15 @@ xfs_diflags_to_iflags(
+@@ -772,6 +781,15 @@ xfs_diflags_to_iflags(
inode->i_flags |= S_NOATIME;
else
inode->i_flags &= ~S_NOATIME;
}
/*
-@@ -862,6 +885,7 @@ xfs_setup_inode(
+@@ -800,6 +818,7 @@ xfs_setup_inode(
inode->i_nlink = ip->i_d.di_nlink;
inode->i_uid = ip->i_d.di_uid;
inode->i_gid = ip->i_d.di_gid;
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-2.6.29.1/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/linux-2.6/xfs_linux.h
---- linux-2.6.29.1/fs/xfs/linux-2.6/xfs_linux.h 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/linux-2.6/xfs_linux.h 2009-03-25 01:26:04.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.29.1/fs/xfs/linux-2.6/xfs_super.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/linux-2.6/xfs_super.c
---- linux-2.6.29.1/fs/xfs/linux-2.6/xfs_super.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/linux-2.6/xfs_super.c 2009-03-25 01:48:51.000000000 +0100
-@@ -120,6 +120,9 @@ mempool_t *xfs_ioend_pool;
+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) */
#define MNTOPT_DMI "dmi" /* DMI enabled (DMAPI / XDSM) */
/*
* Table driven mount option parser.
-@@ -128,10 +131,14 @@ mempool_t *xfs_ioend_pool;
+@@ -125,10 +128,14 @@ mempool_t *xfs_ioend_pool;
* in the future, too.
*/
enum {
{Opt_barrier, "barrier"},
{Opt_nobarrier, "nobarrier"},
{Opt_err, NULL}
-@@ -395,6 +402,19 @@ xfs_parseargs(
+@@ -382,6 +389,19 @@ xfs_parseargs(
} else if (!strcmp(this_char, "irixsgid")) {
cmn_err(CE_WARN,
"XFS: irixsgid is now a sysctl(2) variable, option is deprecated.");
} else {
cmn_err(CE_WARN,
"XFS: unknown mount option [%s].", this_char);
-@@ -1221,6 +1241,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
-@@ -1480,6 +1510,9 @@ xfs_fs_fill_super(
+@@ -1530,6 +1560,9 @@ xfs_fs_fill_super(
XFS_SEND_MOUNT(mp, DM_RIGHT_NULL, mtpt, mp->m_fsname);
+ if (mp->m_flags & XFS_MOUNT_TAGGED)
+ sb->s_flags |= MS_TAGGED;
+
- sb->s_dirt = 1;
sb->s_magic = XFS_SB_MAGIC;
sb->s_blocksize = mp->m_sb.sb_blocksize;
-diff -NurpP --minimal linux-2.6.29.1/fs/xfs/quota/xfs_qm_syscalls.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/quota/xfs_qm_syscalls.c
---- linux-2.6.29.1/fs/xfs/quota/xfs_qm_syscalls.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/quota/xfs_qm_syscalls.c 2009-03-24 14:48:35.000000000 +0100
-@@ -426,7 +426,7 @@ xfs_qm_scall_quotaon(
- uint accflags;
- __int64_t sbflags;
-
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
- return XFS_ERROR(EPERM);
-
- flags &= (XFS_ALL_QUOTA_ACCT | XFS_ALL_QUOTA_ENFD);
-diff -NurpP --minimal linux-2.6.29.1/fs/xfs/xfs_dinode.h linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_dinode.h
---- linux-2.6.29.1/fs/xfs/xfs_dinode.h 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_dinode.h 2009-03-24 16:38:27.000000000 +0100
+ sb->s_blocksize_bits = ffs(sb->s_blocksize) - 1;
+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 */
__be16 di_flushiter; /* incremented on flush */
xfs_timestamp_t di_atime; /* time last accessed */
xfs_timestamp_t di_mtime; /* time last modified */
-@@ -181,6 +183,8 @@ static inline void xfs_dinode_put_rdev(s
+@@ -183,6 +185,8 @@ static inline void xfs_dinode_put_rdev(s
#define XFS_DIFLAG_EXTSZINHERIT_BIT 12 /* inherit inode extent size */
#define XFS_DIFLAG_NODEFRAG_BIT 13 /* do not reorganize/defragment */
#define XFS_DIFLAG_FILESTREAM_BIT 14 /* use filestream allocator */
#define XFS_DIFLAG_REALTIME (1 << XFS_DIFLAG_REALTIME_BIT)
#define XFS_DIFLAG_PREALLOC (1 << XFS_DIFLAG_PREALLOC_BIT)
#define XFS_DIFLAG_NEWRTBM (1 << XFS_DIFLAG_NEWRTBM_BIT)
-@@ -196,6 +200,7 @@ static inline void xfs_dinode_put_rdev(s
+@@ -198,6 +202,7 @@ static inline void xfs_dinode_put_rdev(s
#define XFS_DIFLAG_EXTSZINHERIT (1 << XFS_DIFLAG_EXTSZINHERIT_BIT)
#define XFS_DIFLAG_NODEFRAG (1 << XFS_DIFLAG_NODEFRAG_BIT)
#define XFS_DIFLAG_FILESTREAM (1 << XFS_DIFLAG_FILESTREAM_BIT)
#ifdef CONFIG_XFS_RT
#define XFS_IS_REALTIME_INODE(ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME)
-@@ -208,6 +213,10 @@ static inline void xfs_dinode_put_rdev(s
+@@ -210,6 +215,10 @@ static inline void xfs_dinode_put_rdev(s
XFS_DIFLAG_IMMUTABLE | XFS_DIFLAG_APPEND | XFS_DIFLAG_SYNC | \
XFS_DIFLAG_NOATIME | XFS_DIFLAG_NODUMP | XFS_DIFLAG_RTINHERIT | \
XFS_DIFLAG_PROJINHERIT | XFS_DIFLAG_NOSYMLINKS | XFS_DIFLAG_EXTSIZE | \
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-2.6.29.1/fs/xfs/xfs_fs.h linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_fs.h
---- linux-2.6.29.1/fs/xfs/xfs_fs.h 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_fs.h 2009-03-24 14:48:35.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 */
#define XFS_XFLAG_HASATTR 0x80000000 /* no DIFLAG for this */
/*
-@@ -289,7 +292,8 @@ typedef struct xfs_bstat {
+@@ -292,7 +295,8 @@ typedef struct xfs_bstat {
__s32 bs_extents; /* number of extents */
__u32 bs_gen; /* generation count */
__u16 bs_projid; /* project id */
__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.29.1/fs/xfs/xfs_ialloc.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_ialloc.c
---- linux-2.6.29.1/fs/xfs/xfs_ialloc.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_ialloc.c 2009-03-24 17:03:17.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.29.1/fs/xfs/xfs_inode.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_inode.c
---- linux-2.6.29.1/fs/xfs/xfs_inode.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_inode.c 2009-03-25 01:42:50.000000000 +0100
-@@ -250,6 +250,7 @@ xfs_inotobp(
+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;
}
/*
* This routine is called to map an inode to the buffer containing
-@@ -645,15 +646,25 @@ xfs_iformat_btree(
- void
+@@ -654,15 +655,25 @@ xfs_iformat_btree(
+ STATIC void
xfs_dinode_from_disk(
xfs_icdinode_t *to,
- xfs_dinode_t *from)
to->di_nlink = be32_to_cpu(from->di_nlink);
to->di_projid = be16_to_cpu(from->di_projid);
memcpy(to->di_pad, from->di_pad, sizeof(to->di_pad));
-@@ -674,21 +685,26 @@ xfs_dinode_from_disk(
+@@ -683,21 +694,26 @@ xfs_dinode_from_disk(
to->di_dmevmask = be32_to_cpu(from->di_dmevmask);
to->di_dmstate = be16_to_cpu(from->di_dmstate);
to->di_flags = be16_to_cpu(from->di_flags);
to->di_nlink = cpu_to_be32(from->di_nlink);
to->di_projid = cpu_to_be16(from->di_projid);
memcpy(to->di_pad, from->di_pad, sizeof(to->di_pad));
-@@ -709,12 +725,14 @@ xfs_dinode_to_disk(
+@@ -718,12 +734,14 @@ xfs_dinode_to_disk(
to->di_dmevmask = cpu_to_be32(from->di_dmevmask);
to->di_dmstate = cpu_to_be16(from->di_dmstate);
to->di_flags = cpu_to_be16(from->di_flags);
{
uint flags = 0;
-@@ -725,6 +743,8 @@ _xfs_dic2xflags(
+@@ -734,6 +752,8 @@ _xfs_dic2xflags(
flags |= XFS_XFLAG_PREALLOC;
if (di_flags & XFS_DIFLAG_IMMUTABLE)
flags |= XFS_XFLAG_IMMUTABLE;
if (di_flags & XFS_DIFLAG_APPEND)
flags |= XFS_XFLAG_APPEND;
if (di_flags & XFS_DIFLAG_SYNC)
-@@ -749,6 +769,10 @@ _xfs_dic2xflags(
+@@ -758,6 +778,10 @@ _xfs_dic2xflags(
flags |= XFS_XFLAG_FILESTREAM;
}
return flags;
}
-@@ -758,7 +782,7 @@ xfs_ip2xflags(
+@@ -767,7 +791,7 @@ xfs_ip2xflags(
{
xfs_icdinode_t *dic = &ip->i_d;
(XFS_IFORK_Q(ip) ? XFS_XFLAG_HASATTR : 0);
}
-@@ -766,7 +790,8 @@ uint
+@@ -775,7 +799,8 @@ uint
xfs_dic2xflags(
xfs_dinode_t *dip)
{
(XFS_DFORK_Q(dip) ? XFS_XFLAG_HASATTR : 0);
}
-@@ -802,7 +827,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.
-@@ -827,7 +851,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
-@@ -1027,6 +1052,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));
-@@ -1087,6 +1113,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:
-@@ -2161,6 +2188,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 =
-@@ -3128,7 +3156,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.29.1/fs/xfs/xfs_inode.h linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_inode.h
---- linux-2.6.29.1/fs/xfs/xfs_inode.h 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_inode.h 2009-03-25 01:10:35.000000000 +0100
-@@ -134,7 +134,9 @@ typedef struct xfs_icdinode {
+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 */
__uint16_t di_projid; /* owner's project id */
__uint16_t di_flushiter; /* incremented on flush */
xfs_ictimestamp_t di_atime; /* time last accessed */
xfs_ictimestamp_t di_mtime; /* time last modified */
-@@ -589,9 +591,9 @@ int xfs_itobp(struct xfs_mount *, struc
+@@ -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);
- void xfs_dinode_from_disk(struct xfs_icdinode *,
-- struct xfs_dinode *);
-+ struct xfs_dinode *, int);
+ 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.29.1/fs/xfs/xfs_itable.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_itable.c
---- linux-2.6.29.1/fs/xfs/xfs_itable.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_itable.c 2009-03-24 14:48:35.000000000 +0100
-@@ -82,6 +82,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_tag = dic->di_tag;
buf->bs_size = dic->di_size;
- vn_atime_to_bstime(VFS_I(ip), &buf->bs_atime);
- buf->bs_mtime.tv_sec = dic->di_mtime.t_sec;
-diff -NurpP --minimal linux-2.6.29.1/fs/xfs/xfs_log_recover.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_log_recover.c
---- linux-2.6.29.1/fs/xfs/xfs_log_recover.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_log_recover.c 2009-03-24 17:17:15.000000000 +0100
-@@ -2421,7 +2421,8 @@ xlog_recover_do_inode_trans(
+
+ /*
+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 core is in in-core format */
/* the rest is in on-disk format */
if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
-diff -NurpP --minimal linux-2.6.29.1/fs/xfs/xfs_mount.h linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_mount.h
---- linux-2.6.29.1/fs/xfs/xfs_mount.h 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_mount.h 2009-03-24 14:48:35.000000000 +0100
-@@ -371,6 +371,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.29.1/fs/xfs/xfs_vnodeops.c linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_vnodeops.c
---- linux-2.6.29.1/fs/xfs/xfs_vnodeops.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_vnodeops.c 2009-03-24 17:18:40.000000000 +0100
-@@ -53,6 +53,90 @@
+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"
+}
+
+int
-+xfs_sync_xflags(
-+ xfs_inode_t *ip)
++xfs_sync_flags(
++ struct inode *inode,
++ int flags,
++ int vflags)
+{
++ struct xfs_inode *ip = XFS_I(inode);
+ struct xfs_mount *mp = ip->i_mount;
-+ struct xfs_trans *tp;
++ struct xfs_trans *tp;
+ unsigned int lock_flags = 0;
+ int code;
+
-+ xfs_itrace_entry(ip);
-+
-+ if (mp->m_flags & XFS_MOUNT_RDONLY)
-+ return XFS_ERROR(EROFS);
-+
-+ /*
-+ * we acquire the inode lock and do an error checking pass.
-+ */
+ tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_NOT_SIZE);
+ code = xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0);
+ if (code)
-+ goto error_return;
++ goto error_out;
+
+ lock_flags = XFS_ILOCK_EXCL;
+ xfs_ilock(ip, lock_flags);
+ xfs_trans_ijoin(tp, ip, lock_flags);
+ xfs_trans_ihold(tp, ip);
+
++ inode->i_flags = flags;
++ inode->i_vflags = vflags;
+ xfs_get_inode_flags(ip);
-+ // xfs_diflags_to_linux(ip);
+
+ xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
+ xfs_ichgtime(ip, XFS_ICHGTIME_CHG);
+
+ XFS_STATS_INC(xs_ig_attrchg);
+
-+ /*
-+ * If this is a synchronous mount, make sure that the
-+ * transaction goes to disk before returning to the user.
-+ */
+ if (mp->m_flags & XFS_MOUNT_WSYNC)
+ xfs_trans_set_sync(tp);
+ code = xfs_trans_commit(tp, 0);
+ xfs_iunlock(ip, lock_flags);
++ return code;
+
-+ if (code)
-+ return code;
-+ return 0;
-+
-+ error_return:
++error_out:
+ xfs_trans_cancel(tp, 0);
+ if (lock_flags)
+ xfs_iunlock(ip, lock_flags);
+ return code;
+}
++
+
int
xfs_setattr(
struct xfs_inode *ip,
-@@ -68,6 +152,7 @@ xfs_setattr(
+@@ -69,6 +143,7 @@ xfs_setattr(
uint commit_flags=0;
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;
-@@ -164,7 +249,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
-@@ -173,15 +258,19 @@ 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
- * going to change.
+@@ -179,7 +256,8 @@ xfs_setattr(
*/
- if ((XFS_IS_UQUOTA_ON(mp) && iuid != uid) ||
-- (XFS_IS_GQUOTA_ON(mp) && igid != gid)) {
-+ (XFS_IS_GQUOTA_ON(mp) && igid != gid) ||
-+ (XFS_IS_GQUOTA_ON(mp) && itag != tag)) {
-+ /* TODO: handle tagging? */
+ if (XFS_IS_QUOTA_RUNNING(mp) &&
+ ((XFS_IS_UQUOTA_ON(mp) && iuid != uid) ||
+- (XFS_IS_GQUOTA_ON(mp) && igid != gid))) {
++ (XFS_IS_GQUOTA_ON(mp) && igid != gid) ||
++ (XFS_IS_GQUOTA_ON(mp) && itag != tag))) {
ASSERT(tp);
- code = XFS_QM_DQVOPCHOWNRESV(mp, tp, ip, udqp, gdqp,
+ code = xfs_qm_vop_chown_reserve(tp, ip, udqp, gdqp,
capable(CAP_FOWNER) ?
-@@ -334,7 +423,7 @@ xfs_setattr(
+@@ -340,7 +418,7 @@ xfs_setattr(
/*
* Change file ownership. Must be the owner or privileged.
*/
/*
* CAP_FSETID overrides the following restrictions:
*
-@@ -350,6 +439,10 @@ xfs_setattr(
+@@ -356,6 +434,10 @@ xfs_setattr(
* Change the ownerships and register quota modifications
* in the transaction.
*/
+ inode->i_tag = tag;
+ }
if (iuid != uid) {
- if (XFS_IS_UQUOTA_ON(mp)) {
+ if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_UQUOTA_ON(mp)) {
ASSERT(mask & ATTR_UID);
-diff -NurpP --minimal linux-2.6.29.1/fs/xfs/xfs_vnodeops.h linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_vnodeops.h
---- linux-2.6.29.1/fs/xfs/xfs_vnodeops.h 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/fs/xfs/xfs_vnodeops.h 2009-03-24 17:19:30.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.29.1/include/asm-generic/tlb.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/asm-generic/tlb.h
---- linux-2.6.29.1/include/asm-generic/tlb.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/asm-generic/tlb.h 2009-04-08 15:50:06.000000000 +0200
+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.29.1/include/linux/capability.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/capability.h
---- linux-2.6.29.1/include/linux/capability.h 2009-03-24 14:22:41.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/capability.h 2009-03-24 14:48:35.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.29.1/include/linux/devpts_fs.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/devpts_fs.h
---- linux-2.6.29.1/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/devpts_fs.h 2009-02-22 22:54:26.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.29.1/include/linux/ext2_fs.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/ext2_fs.h
---- linux-2.6.29.1/include/linux/ext2_fs.h 2009-03-24 14:22:41.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/ext2_fs.h 2009-03-24 15:39:54.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 EXT2_FL_USER_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
#define EXT2_FL_USER_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
-@@ -271,7 +275,7 @@ struct ext2_inode {
- struct {
- __u8 l_i_frag; /* Fragment number */
- __u8 l_i_fsize; /* Fragment size */
-- __u16 i_pad1;
-+ __u16 l_i_tag; /* Context Tag */
+@@ -274,7 +278,8 @@ struct ext2_inode {
+ __u16 i_pad1;
__le16 l_i_uid_high; /* these 2 fields */
__le16 l_i_gid_high; /* were reserved2[0] */
- __u32 l_i_reserved2;
-@@ -303,6 +307,7 @@ struct ext2_inode {
+- __u32 l_i_reserved2;
++ __le16 l_i_tag; /* Context Tag */
++ __u16 l_i_reserved2;
+ } linux2;
+ struct {
+ __u8 h_i_frag; /* Fragment number */
+@@ -303,6 +308,7 @@ struct ext2_inode {
#define i_gid_low i_gid
#define i_uid_high osd2.linux2.l_i_uid_high
#define i_gid_high osd2.linux2.l_i_gid_high
#define i_reserved2 osd2.linux2.l_i_reserved2
#endif
-@@ -347,6 +352,7 @@ struct ext2_inode {
+@@ -347,6 +353,7 @@ struct ext2_inode {
#define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */
#define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */
#define EXT2_MOUNT_RESERVATION 0x080000 /* Preallocation */
#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-2.6.29.1/include/linux/ext3_fs.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/ext3_fs.h
---- linux-2.6.29.1/include/linux/ext3_fs.h 2009-03-24 14:22:41.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/ext3_fs.h 2009-03-24 14:48:36.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) */
/* Flags that should be inherited by new inodes from their parent. */
#define EXT3_FL_INHERITED (EXT3_SECRM_FL | EXT3_UNRM_FL | EXT3_COMPR_FL |\
-@@ -316,7 +320,7 @@ struct ext3_inode {
- struct {
- __u8 l_i_frag; /* Fragment number */
- __u8 l_i_fsize; /* Fragment size */
-- __u16 i_pad1;
-+ __u16 l_i_tag; /* Context Tag */
+@@ -320,7 +324,8 @@ struct ext3_inode {
+ __u16 i_pad1;
__le16 l_i_uid_high; /* these 2 fields */
__le16 l_i_gid_high; /* were reserved2[0] */
- __u32 l_i_reserved2;
-@@ -350,6 +354,7 @@ struct ext3_inode {
+- __u32 l_i_reserved2;
++ __le16 l_i_tag; /* Context Tag */
++ __u16 l_i_reserved2;
+ } linux2;
+ struct {
+ __u8 h_i_frag; /* Fragment number */
+@@ -351,6 +356,7 @@ struct ext3_inode {
#define i_gid_low i_gid
#define i_uid_high osd2.linux2.l_i_uid_high
#define i_gid_high osd2.linux2.l_i_gid_high
#define i_reserved2 osd2.linux2.l_i_reserved2
#elif defined(__GNU__)
-@@ -413,6 +418,7 @@ struct ext3_inode {
+@@ -414,6 +420,7 @@ struct ext3_inode {
#define EXT3_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
#define EXT3_MOUNT_DATA_ERR_ABORT 0x400000 /* Abort on file data write
* error in ordered mode */
/* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
#ifndef _LINUX_EXT2_FS_H
-@@ -874,6 +880,7 @@ struct buffer_head * ext3_bread (handle_
- int ext3_get_blocks_handle(handle_t *handle, struct inode *inode,
- sector_t iblock, unsigned long maxblocks, struct buffer_head *bh_result,
- int create, int extend_disksize);
-+extern int ext3_sync_flags(struct inode *inode);
-
- extern struct inode *ext3_iget(struct super_block *, unsigned long);
- extern int ext3_write_inode (struct inode *, int);
-diff -NurpP --minimal linux-2.6.29.1/include/linux/fs.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/fs.h
---- linux-2.6.29.1/include/linux/fs.h 2009-03-24 14:22:41.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/fs.h 2009-03-24 17:21:20.000000000 +0100
-@@ -141,6 +141,9 @@ struct inodes_stat_t {
- #define MS_RELATIME (1<<21) /* Update atime relative to mtime/ctime. */
+@@ -892,6 +899,7 @@ extern void ext3_get_inode_flags(struct
+ extern void ext3_set_aops(struct inode *inode);
+ extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+ u64 start, u64 len);
++extern int ext3_sync_flags(struct inode *, int, int);
+
+ /* ioctl.c */
+ extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
+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_TAGGED (1<<24) /* use generic inode tagging */
-+#define MS_TAGID (1<<25) /* use specific tag for this mount */
-+#define MS_NOTAGCHECK (1<<26) /* don't check tags */
+ #define MS_STRICTATIME (1<<24) /* Always perform atime updates */
++#define MS_TAGGED (1<<25) /* use generic inode tagging */
++#define MS_TAGID (1<<26) /* use specific tag for this mount */
++#define MS_NOTAGCHECK (1<<27) /* don't check tags */
#define MS_ACTIVE (1<<30)
#define MS_NOUSER (1<<31)
-@@ -167,6 +170,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 */
- #define S_ATOMIC_COPY 1024 /* Pages mapped with this inode need to be
- atomically copied (gem) */
-+#define S_IXUNLINK 2048 /* Immutable Invert on unlink */
++#define S_IXUNLINK 1024 /* Immutable Invert on unlink */
+
+/* Linux-VServer related Inode flags */
+
/*
* Note that nosuid etc flags are inode-specific: setting some file-system
-@@ -189,12 +200,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)
-@@ -202,6 +216,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. */
-@@ -279,11 +303,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
-@@ -365,6 +392,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
-@@ -380,6 +408,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;
-@@ -393,6 +422,9 @@ struct iattr {
+@@ -464,6 +493,9 @@ struct iattr {
struct file *ia_file;
};
/*
* Includes for diskquotas.
*/
-@@ -656,7 +688,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
-@@ -704,7 +738,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
-@@ -791,12 +826,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);
-@@ -854,6 +889,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;
-@@ -996,6 +1032,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 */
-@@ -1363,6 +1400,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 *);
++ int (*sync_flags) (struct inode *, int, int);
+ void (*truncate_range)(struct inode *, loff_t, loff_t);
+ long (*fallocate)(struct inode *inode, int mode, loff_t offset,
loff_t len);
- int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
- u64 len);
-+ int (*sync_flags) (struct inode *);
- };
-
- struct seq_file;
-@@ -1378,6 +1416,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);
-@@ -2096,6 +2135,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.29.1/include/linux/if_tun.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/if_tun.h
---- linux-2.6.29.1/include/linux/if_tun.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/if_tun.h 2009-02-22 22:54:26.000000000 +0100
-@@ -46,6 +46,7 @@
- #define TUNSETOFFLOAD _IOW('T', 208, unsigned int)
- #define TUNSETTXFILTER _IOW('T', 209, unsigned int)
+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,
+ gfs2fl_System = 9,
++ gfs2fl_IXUnlink = 16,
++ gfs2fl_Barrier = 17,
++ gfs2fl_Cow = 18,
+ gfs2fl_TruncInProg = 29,
+ gfs2fl_InheritDirectio = 30,
+ gfs2fl_InheritJdata = 31,
+@@ -251,6 +254,9 @@ enum {
+ #define GFS2_DIF_NOATIME 0x00000080
+ #define GFS2_DIF_SYNC 0x00000100
+ #define GFS2_DIF_SYSTEM 0x00000200 /* New in gfs2 */
++#define GFS2_DIF_IXUNLINK 0x00010000
++#define GFS2_DIF_BARRIER 0x00020000
++#define GFS2_DIF_COW 0x00040000
+ #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.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)
+ #define TUNSETSNDBUF _IOW('T', 212, int)
+#define TUNSETNID _IOW('T', 215, int)
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-2.6.29.1/include/linux/init_task.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/init_task.h
---- linux-2.6.29.1/include/linux/init_task.h 2009-03-24 14:22:41.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/init_task.h 2009-03-24 14:48:36.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_IDS \
- INIT_TRACE_IRQFLAGS \
- INIT_LOCKDEP \
+ INIT_FTRACE_GRAPH \
+ INIT_TRACE_RECURSION \
+ INIT_TASK_RCU_PREEMPT(tsk) \
+ .xid = 0, \
+ .vx_info = NULL, \
+ .nid = 0, \
}
-diff -NurpP --minimal linux-2.6.29.1/include/linux/interrupt.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/interrupt.h
---- linux-2.6.29.1/include/linux/interrupt.h 2009-03-24 14:22:41.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/interrupt.h 2009-03-24 14:48:36.000000000 +0100
-@@ -9,8 +9,8 @@
- #include <linux/cpumask.h>
- #include <linux/irqreturn.h>
- #include <linux/irqnr.h>
--#include <linux/hardirq.h>
- #include <linux/sched.h>
-+#include <linux/hardirq.h>
- #include <linux/irqflags.h>
- #include <linux/smp.h>
- #include <linux/percpu.h>
-diff -NurpP --minimal linux-2.6.29.1/include/linux/ipc.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/ipc.h
---- linux-2.6.29.1/include/linux/ipc.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/ipc.h 2009-02-22 22:54:26.000000000 +0100
-@@ -93,6 +93,7 @@ struct kern_ipc_perm
+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;
gid_t gid;
uid_t cuid;
gid_t cgid;
mode_t mode;
-diff -NurpP --minimal linux-2.6.29.1/include/linux/Kbuild linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/Kbuild
---- linux-2.6.29.1/include/linux/Kbuild 2009-03-24 14:22:40.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/Kbuild 2009-03-24 17:22:07.000000000 +0100
-@@ -373,5 +373,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.29.1/include/linux/loop.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/loop.h
---- linux-2.6.29.1/include/linux/loop.h 2009-03-24 14:22:42.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/loop.h 2009-03-24 14:48:36.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.29.1/include/linux/magic.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/magic.h
---- linux-2.6.29.1/include/linux/magic.h 2009-03-24 14:22:42.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/magic.h 2009-03-24 14:48:36.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 AFS_SUPER_MAGIC 0x5346414F
#define AUTOFS_SUPER_MAGIC 0x0187
#define CODA_SUPER_MAGIC 0x73757245
- #define DEBUGFS_MAGIC 0x64626720
-@@ -33,6 +33,7 @@
+ #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
+@@ -38,6 +38,7 @@
#define NFS_SUPER_MAGIC 0x6969
#define OPENPROM_SUPER_MAGIC 0x9fa1
#define PROC_SUPER_MAGIC 0x9fa0
#define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */
#define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/major.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/major.h
---- linux-2.6.29.1/include/linux/major.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/major.h 2009-02-22 22:54:26.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.29.1/include/linux/mm_types.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/mm_types.h
---- linux-2.6.29.1/include/linux/mm_types.h 2009-03-24 14:22:42.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/mm_types.h 2009-03-24 14:48:36.000000000 +0100
-@@ -232,6 +232,7 @@ struct mm_struct {
+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 */
mm_context_t context;
/* Swap token stuff */
/*
-diff -NurpP --minimal linux-2.6.29.1/include/linux/mount.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/mount.h
---- linux-2.6.29.1/include/linux/mount.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/mount.h 2009-02-22 22:54:26.000000000 +0100
-@@ -35,6 +35,9 @@ struct mnt_namespace;
+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 */
struct vfsmount {
struct list_head mnt_hash;
struct vfsmount *mnt_parent; /* fs we are mounted on */
-@@ -69,6 +72,7 @@ struct vfsmount {
- * are held, and all mnt_writer[]s on this mount have 0 as their ->count
- */
- atomic_t __mnt_writers;
+@@ -70,6 +73,7 @@ struct vfsmount {
+ #else
+ int mnt_writers;
+ #endif
+ tag_t mnt_tag; /* tagging used for vfsmount */
};
- static inline struct vfsmount *mntget(struct vfsmount *mnt)
-diff -NurpP --minimal linux-2.6.29.1/include/linux/net.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/net.h
---- linux-2.6.29.1/include/linux/net.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/net.h 2009-02-22 22:54:26.000000000 +0100
-@@ -68,6 +68,7 @@ struct net;
+ static inline int *get_mnt_writers_ptr(struct vfsmount *mnt)
+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
#define SOCK_PASSSEC 4
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-2.6.29.1/include/linux/nfs_mount.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/nfs_mount.h
---- linux-2.6.29.1/include/linux/nfs_mount.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/nfs_mount.h 2009-03-24 14:48:36.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.29.1/include/linux/nsproxy.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/nsproxy.h
---- linux-2.6.29.1/include/linux/nsproxy.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/nsproxy.h 2009-03-24 14:48:36.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>
struct mnt_namespace;
struct uts_namespace;
-@@ -62,22 +63,33 @@ static inline struct nsproxy *task_nspro
+@@ -63,22 +64,33 @@ static inline struct nsproxy *task_nspro
}
int copy_namespaces(unsigned long flags, struct task_struct *tsk);
}
#ifdef CONFIG_CGROUP_NS
-diff -NurpP --minimal linux-2.6.29.1/include/linux/pid.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/pid.h
---- linux-2.6.29.1/include/linux/pid.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/pid.h 2009-03-24 14:48:36.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.29.1/include/linux/proc_fs.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/proc_fs.h
---- linux-2.6.29.1/include/linux/proc_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/proc_fs.h 2009-02-22 22:54:26.000000000 +0100
-@@ -59,6 +59,7 @@ struct proc_dir_entry {
+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;
gid_t gid;
loff_t size;
const struct inode_operations *proc_iops;
/*
-@@ -268,12 +269,18 @@ static inline void kclist_add(struct kco
- extern void kclist_add(struct kcore_list *, void *, size_t);
+@@ -250,12 +251,18 @@ kclist_add(struct kcore_list *new, void
+ extern void kclist_add(struct kcore_list *, void *, size_t, int type);
#endif
+struct vx_info;
};
struct ctl_table_header;
-@@ -281,6 +288,7 @@ struct ctl_table;
+@@ -263,6 +270,7 @@ struct ctl_table;
struct proc_inode {
struct pid *pid;
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-2.6.29.1/include/linux/reiserfs_fs.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/reiserfs_fs.h
---- linux-2.6.29.1/include/linux/reiserfs_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/reiserfs_fs.h 2009-02-22 22:54:26.000000000 +0100
-@@ -837,6 +837,11 @@ struct stat_data_v1 {
+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_
+
+ #include <linux/fs.h>
++#include <linux/vs_dlimit.h>
+
+ static inline struct quota_info *sb_dqopt(struct super_block *sb)
+ {
+@@ -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)
+ {
++ if (dl_alloc_space(inode, nr))
++ return 1;
+ if (sb_any_quota_active(inode->i_sb)) {
+ /* Used space is updated in alloc_space() */
+- if (inode->i_sb->dq_op->alloc_space(inode, nr, 1) == NO_QUOTA)
++ if (inode->i_sb->dq_op->alloc_space(inode, nr, 1) == NO_QUOTA) {
++ dl_free_space(inode, nr);
+ return 1;
++ }
+ }
+ else
+ inode_add_bytes(inode, nr);
+@@ -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)
+ {
++ if (dl_alloc_space(inode, nr))
++ return 1;
+ if (sb_any_quota_active(inode->i_sb)) {
+ /* Used space is updated in alloc_space() */
+- if (inode->i_sb->dq_op->alloc_space(inode, nr, 0) == NO_QUOTA)
++ if (inode->i_sb->dq_op->alloc_space(inode, nr, 0) == NO_QUOTA) {
++ dl_free_space(inode, nr);
+ return 1;
++ }
+ }
+ else
+ inode_add_bytes(inode, nr);
+@@ -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)
+ {
++ if (dl_reserve_space(inode, nr))
++ return 1;
+ if (sb_any_quota_active(inode->i_sb)) {
+ /* Used space is updated in alloc_space() */
+- if (inode->i_sb->dq_op->reserve_space(inode, nr, 0) == NO_QUOTA)
++ if (inode->i_sb->dq_op->reserve_space(inode, nr, 0) == NO_QUOTA) {
++ dl_release_space(inode, nr);
+ return 1;
++ }
+ }
+ 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)
+ {
++ if (dl_alloc_inode(inode))
++ return 1;
+ if (sb_any_quota_active(inode->i_sb)) {
+ vfs_dq_init(inode);
+- if (inode->i_sb->dq_op->alloc_inode(inode, 1) == NO_QUOTA)
++ if (inode->i_sb->dq_op->alloc_inode(inode, 1) == NO_QUOTA) {
++ dl_free_inode(inode);
+ return 1;
++ }
+ }
+ return 0;
+ }
+@@ -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)
+ {
++ if (dl_claim_space(inode, nr))
++ return 1;
+ if (sb_any_quota_active(inode->i_sb)) {
+- if (inode->i_sb->dq_op->claim_space(inode, nr) == NO_QUOTA)
++ if (inode->i_sb->dq_op->claim_space(inode, nr) == NO_QUOTA) {
++ dl_release_space(inode, nr);
+ return 1;
++ }
+ } else
+ inode_claim_rsv_space(inode, nr);
+
+@@ -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)
+@@ -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);
++ dl_free_space(inode, nr);
+ }
+
+ static inline void vfs_dq_free_space(struct inode *inode, qsize_t nr)
+@@ -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);
++ dl_free_inode(inode);
+ }
+
+ /* Cannot be called inside a transaction */
+@@ -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)
+ {
++ if (dl_alloc_space(inode, nr))
++ return 1;
+ inode_add_bytes(inode, nr);
+ return 0;
+ }
+@@ -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)
+ {
++ if (dl_alloc_space(inode, nr))
++ return 1;
+ inode_add_bytes(inode, nr);
+ return 0;
+ }
+@@ -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)
+ {
++ if (dl_reserve_space(inode, nr))
++ return 1;
+ return 0;
+ }
+
+ static inline int vfs_dq_claim_space(struct inode *inode, qsize_t nr)
+ {
++ if (dl_claim_space(inode, nr))
++ return 1;
+ return vfs_dq_alloc_space(inode, nr);
+ }
+
+ static inline
+ int vfs_dq_release_reservation_space(struct inode *inode, qsize_t nr)
+ {
++ dl_release_space(inode, nr);
+ return 0;
+ }
+
+ static inline void vfs_dq_free_space_nodirty(struct inode *inode, qsize_t nr)
+ {
++ dl_free_space(inode, nr);
+ inode_sub_bytes(inode, nr);
+ }
+
+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
+ #define LINUX_REBOOT_CMD_KEXEC 0x45584543
++#define LINUX_REBOOT_CMD_OOM 0xDEADBEEF
+
+
+ #ifdef __KERNEL__
+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
/* persistent flags that file inherits from the parent directory */
#define REISERFS_INHERIT_MASK ( REISERFS_IMMUTABLE_FL | \
REISERFS_SYNC_FL | \
-@@ -846,6 +851,9 @@ struct stat_data_v1 {
+@@ -908,6 +913,9 @@ struct stat_data_v1 {
REISERFS_COMPR_FL | \
REISERFS_NOTAIL_FL )
/* Stat Data on disk (reiserfs version of UFS disk inode minus the
address blocks) */
struct stat_data {
-@@ -1911,6 +1919,7 @@ static inline void reiserfs_update_sd(st
+@@ -1989,6 +1997,7 @@ static inline void reiserfs_update_sd(st
void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode);
void i_attrs_to_sd_attrs(struct inode *inode, __u16 * sd_attrs);
int reiserfs_setattr(struct dentry *dentry, struct iattr *attr);
-+int reiserfs_sync_flags(struct inode *inode);
++int reiserfs_sync_flags(struct inode *inode, int, int);
/* namei.c */
void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
-diff -NurpP --minimal linux-2.6.29.1/include/linux/reiserfs_fs_sb.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/reiserfs_fs_sb.h
---- linux-2.6.29.1/include/linux/reiserfs_fs_sb.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/reiserfs_fs_sb.h 2009-02-22 22:54:26.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_POSIXACL,
+ REISERFS_EXPOSE_PRIVROOT,
REISERFS_BARRIER_NONE,
REISERFS_BARRIER_FLUSH,
+ REISERFS_TAGGED,
/* Actions on error */
REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-2.6.29.1/include/linux/sched.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/sched.h
---- linux-2.6.29.1/include/linux/sched.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/sched.h 2009-04-08 15:47:01.000000000 +0200
-@@ -71,7 +71,6 @@ struct sched_param {
- #include <linux/fs_struct.h>
- #include <linux/compiler.h>
- #include <linux/completion.h>
--#include <linux/pid.h>
- #include <linux/percpu.h>
- #include <linux/topology.h>
- #include <linux/proportions.h>
-@@ -88,6 +87,7 @@ struct sched_param {
- #include <linux/kobject.h>
- #include <linux/latencytop.h>
- #include <linux/cred.h>
-+#include <linux/pid.h>
-
- #include <asm/processor.h>
-
-@@ -176,12 +176,13 @@ extern unsigned long long time_sync_thre
- #define TASK_UNINTERRUPTIBLE 2
- #define __TASK_STOPPED 4
- #define __TASK_TRACED 8
-+#define TASK_ONHOLD 16
- /* in tsk->exit_state */
--#define EXIT_ZOMBIE 16
--#define EXIT_DEAD 32
-+#define EXIT_ZOMBIE 32
-+#define EXIT_DEAD 64
- /* in tsk->state again */
--#define TASK_DEAD 64
--#define TASK_WAKEKILL 128
-+#define TASK_DEAD 128
-+#define TASK_WAKEKILL 256
-
- /* Convenience macros for the sake of set_task_state */
- #define TASK_KILLABLE (TASK_WAKEKILL | TASK_UNINTERRUPTIBLE)
-@@ -358,25 +359,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 { \
-@@ -1131,7 +1135,9 @@ struct task_struct {
- const struct sched_class *sched_class;
- struct sched_entity se;
- struct sched_rt_entity rt;
--
-+#ifdef CONFIG_VSERVER_HARDCPU
-+ struct list_head hq;
+@@ -1185,6 +1188,12 @@ struct sched_entity {
+ u64 nr_wakeups_affine_attempts;
+ u64 nr_wakeups_passive;
+ u64 nr_wakeups_idle;
++#ifdef CONFIG_CFS_HARD_LIMITS
++ u64 throttle_start;
++ u64 throttle_max;
++ u64 throttle_count;
++ u64 throttle_sum;
+#endif
- #ifdef CONFIG_PREEMPT_NOTIFIERS
- /* list of struct preempt_notifier: */
- struct hlist_head preempt_notifiers;
-@@ -1287,6 +1293,14 @@ struct task_struct {
+ #endif
+
+ #ifdef CONFIG_FAIR_GROUP_SCHED
+@@ -1395,6 +1404,14 @@ struct task_struct {
#endif
seccomp_t seccomp;
/* Thread group tracking */
u32 parent_exec_id;
u32 self_exec_id;
-@@ -1499,6 +1513,11 @@ struct pid_namespace;
- * see also pid_nr() etc in include/linux/pid.h
- */
+@@ -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);
+#include <linux/vserver/base.h>
+#include <linux/vserver/context.h>
static inline pid_t task_pid_nr(struct task_struct *tsk)
{
return tsk->pid;
-@@ -1508,7 +1527,7 @@ pid_t task_pid_nr_ns(struct task_struct
+@@ -1632,7 +1654,8 @@ static inline pid_t task_pid_nr_ns(struc
static inline pid_t task_pid_vnr(struct task_struct *tsk)
{
-- return pid_vnr(task_pid(tsk));
-+ return vx_map_pid(pid_vnr(task_pid(tsk)));
+- return __task_pid_nr_ns(tsk, PIDTYPE_PID, NULL);
++ // return __task_pid_nr_ns(tsk, PIDTYPE_PID, NULL);
++ return vx_map_pid(__task_pid_nr_ns(tsk, PIDTYPE_PID, NULL));
}
-@@ -1521,7 +1540,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.29.1/include/linux/shmem_fs.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/shmem_fs.h
---- linux-2.6.29.1/include/linux/shmem_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/shmem_fs.h 2009-02-22 22:54:26.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.29.1/include/linux/stat.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/stat.h
---- linux-2.6.29.1/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/stat.h 2009-02-22 22:54:26.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.29.1/include/linux/sunrpc/auth.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/sunrpc/auth.h
---- linux-2.6.29.1/include/linux/sunrpc/auth.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/sunrpc/auth.h 2009-02-22 22:54:26.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.29.1/include/linux/sunrpc/clnt.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/sunrpc/clnt.h
---- linux-2.6.29.1/include/linux/sunrpc/clnt.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/sunrpc/clnt.h 2009-03-24 14:48:36.000000000 +0100
-@@ -43,7 +43,8 @@ struct rpc_clnt {
+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 */
cl_autobind : 1,/* use getport() */
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/syscalls.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/syscalls.h
---- linux-2.6.29.1/include/linux/syscalls.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/syscalls.h 2009-03-24 14:48:36.000000000 +0100
-@@ -369,6 +369,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.29.1/include/linux/sysctl.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/sysctl.h
---- linux-2.6.29.1/include/linux/sysctl.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/sysctl.h 2009-02-22 22:54:26.000000000 +0100
-@@ -70,6 +70,7 @@ enum
+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) */
CTL_ARLAN=254, /* arlan wireless driver */
CTL_S390DBF=5677, /* s390 debug */
CTL_SUNRPC=7249, /* sunrpc debug */
CTL_PM=9899, /* frv power management */
-@@ -104,6 +105,7 @@ enum
+@@ -103,6 +104,7 @@ enum
KERN_PANIC=15, /* int: panic timeout */
KERN_REALROOTDEV=16, /* real root device to mount after initrd */
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/sysfs.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/sysfs.h
---- linux-2.6.29.1/include/linux/sysfs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/sysfs.h 2009-02-22 22:54:26.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.29.1/include/linux/time.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/time.h
---- linux-2.6.29.1/include/linux/time.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/time.h 2009-02-22 22:54:26.000000000 +0100
-@@ -190,6 +190,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.29.1/include/linux/types.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/types.h
---- linux-2.6.29.1/include/linux/types.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/types.h 2009-03-24 14:48:36.000000000 +0100
-@@ -36,6 +36,9 @@ typedef __kernel_uid32_t uid_t;
+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 __kernel_gid16_t gid16_t;
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vroot.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vroot.h
---- linux-2.6.29.1/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vroot.h 2009-02-22 22:54:26.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.29.1/include/linux/vs_base.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_base.h
---- linux-2.6.29.1/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_base.h 2009-02-22 22:54:26.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.29.1/include/linux/vs_context.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_context.h
---- linux-2.6.29.1/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_context.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,227 @@
+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
+
+ (void)xchg(¤t->vx_info, vxis->vxi);
+}
+
++#define task_is_init(p) \
++ __task_is_init(p, __FILE__, __LINE__, __HERE__)
++
++static inline int __task_is_init(struct task_struct *p,
++ const char *_file, int _line, void *_here)
++{
++ int is_init = is_global_init(p);
++
++ task_lock(p);
++ if (p->vx_info)
++ is_init = p->vx_info->vx_initpid == p->pid;
++ task_unlock(p);
++ return is_init;
++}
++
+extern void exit_vx_info(struct task_struct *, int);
+extern void exit_vx_info_early(struct task_struct *, int);
+
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vs_cowbl.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_cowbl.h
---- linux-2.6.29.1/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_cowbl.h 2009-02-22 22:54:26.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.29.1/include/linux/vs_cvirt.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_cvirt.h
---- linux-2.6.29.1/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_cvirt.h 2009-02-22 22:54:26.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.29.1/include/linux/vs_device.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_device.h
---- linux-2.6.29.1/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_device.h 2009-02-22 22:54:26.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.29.1/include/linux/vs_dlimit.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_dlimit.h
---- linux-2.6.29.1/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_dlimit.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,211 @@
+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:
+ put_dl_info(dli);
+}
+
-+#define DLIMIT_ALLOC_SPACE(in, bytes) \
++#define dl_prealloc_space(in, bytes) \
+ __dl_alloc_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
+ __FILE__, __LINE__ )
+
-+#define DLIMIT_FREE_SPACE(in, bytes) \
-+ __dl_free_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
++#define dl_alloc_space(in, bytes) \
++ __dl_alloc_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
+ __FILE__, __LINE__ )
+
-+#define DLIMIT_ALLOC_BLOCK(in, nr) \
-+ __dl_alloc_space((in)->i_sb, (in)->i_tag, \
-+ ((dlsize_t)(nr)) << (in)->i_sb->s_blocksize_bits, \
++#define dl_reserve_space(in, bytes) \
++ __dl_alloc_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
++ __FILE__, __LINE__ )
++
++#define dl_claim_space(in, bytes) (0)
++
++#define dl_release_space(in, bytes) \
++ __dl_free_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
+ __FILE__, __LINE__ )
+
-+#define DLIMIT_FREE_BLOCK(in, nr) \
-+ __dl_free_space((in)->i_sb, (in)->i_tag, \
-+ ((dlsize_t)(nr)) << (in)->i_sb->s_blocksize_bits, \
++#define dl_free_space(in, bytes) \
++ __dl_free_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
+ __FILE__, __LINE__ )
+
+
-+#define DLIMIT_ALLOC_INODE(in) \
++
++#define dl_alloc_inode(in) \
+ __dl_alloc_inode((in)->i_sb, (in)->i_tag, __FILE__, __LINE__ )
+
-+#define DLIMIT_FREE_INODE(in) \
++#define dl_free_inode(in) \
+ __dl_free_inode((in)->i_sb, (in)->i_tag, __FILE__, __LINE__ )
+
+
-+#define DLIMIT_ADJUST_BLOCK(sb, tag, fb, rb) \
++#define dl_adjust_block(sb, tag, fb, rb) \
+ __dl_adjust_block(sb, tag, fb, rb, __FILE__, __LINE__ )
+
+
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/base.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/base.h
---- linux-2.6.29.1/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/base.h 2009-03-25 00:36:15.000000000 +0100
-@@ -0,0 +1,157 @@
-+#ifndef _VX_BASE_H
-+#define _VX_BASE_H
-+
-+
-+/* context state changes */
-+
-+enum {
-+ VSC_STARTUP = 1,
-+ VSC_SHUTDOWN,
-+
-+ VSC_NETUP,
-+ VSC_NETDOWN,
-+};
-+
-+
-+
-+#define vx_task_xid(t) ((t)->xid)
-+
-+#define vx_current_xid() vx_task_xid(current)
-+
-+#define current_vx_info() (current->vx_info)
-+
-+
-+#define nx_task_nid(t) ((t)->nid)
+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
+
-+#define nx_current_nid() nx_task_nid(current)
++#include "vserver/base.h"
++#include "vserver/network.h"
++#include "vserver/debug.h"
+
-+#define current_nx_info() (current->nx_info)
++#define IPI_LOOPBACK htonl(INADDR_LOOPBACK)
+
++#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]"
+
-+/* generic flag merging */
+
-+#define vs_check_flags(v, m, f) (((v) & (m)) ^ (f))
-+
-+#define vs_mask_flags(v, f, m) (((v) & ~(m)) | ((f) & (m)))
-+
-+#define vs_mask_mask(v, f, m) (((v) & ~(m)) | ((v) & (f) & (m)))
-+
-+#define vs_check_bit(v, n) ((v) & (1LL << (n)))
++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;
++ }
+
-+/* context flags */
++ 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_flags(v) ((v) ? (v)->vx_flags : 0)
++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 vx_current_flags() __vx_flags(current->vx_info)
++ if (!nxi)
++ goto out;
+
-+#define vx_info_flags(v, m, f) \
-+ vs_check_flags(__vx_flags(v), m, f)
++ 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 task_vx_flags(t, m, f) \
-+ ((t) && vx_info_flags((t)->vx_info, m, f))
++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 vx_flags(m, f) vx_info_flags(current->vx_info, m, f)
++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;
++}
+
-+/* context caps */
++#include <net/inet_sock.h>
+
-+#define __vx_ccaps(v) ((v) ? (v)->vx_ccaps : 0)
++/*
++ * 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 vx_current_ccaps() __vx_ccaps(current->vx_info)
++ if (addr && (saddr == addr || bcast == addr))
++ return 1;
++ if (!saddr)
++ return v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND);
++ return 0;
++}
+
-+#define vx_info_ccaps(v, c) (__vx_ccaps(v) & (c))
+
-+#define vx_ccaps(c) vx_info_ccaps(current->vx_info, (c))
++/* inet related checks and helpers */
+
+
++struct in_ifaddr;
++struct net_device;
++struct sock;
+
-+/* network flags */
++#ifdef CONFIG_INET
+
-+#define __nx_flags(n) ((n) ? (n)->nx_flags : 0)
++#include <linux/netdevice.h>
++#include <linux/inetdevice.h>
++#include <net/inet_sock.h>
++#include <net/inet_timewait_sock.h>
+
-+#define nx_current_flags() __nx_flags(current->nx_info)
+
-+#define nx_info_flags(n, m, f) \
-+ vs_check_flags(__nx_flags(n), 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 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)
++/*
++ * check if address is covered by socket
++ *
++ * sk: the socket to check against
++ * addr: the address in question (must be != 0)
++ */
+
++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);
+
-+/* network caps */
++ 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 __nx_ncaps(n) ((n) ? (n)->nx_ncaps : 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;
++ }
++}
+
-+#define nx_current_ncaps() __nx_ncaps(current->nx_info)
+
-+#define nx_info_ncaps(n, c) (__nx_ncaps(n) & (c))
+
-+#define nx_ncaps(c) nx_info_ncaps(current->nx_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;
++}
+
-+/* context mask capabilities */
+
-+#define __vx_mcaps(v) ((v) ? (v)->vx_ccaps >> 32UL : ~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 vx_info_mcaps(v, c) (__vx_mcaps(v) & (c))
++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 vx_mcaps(c) vx_info_mcaps(current->vx_info, c)
++ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++ return 1;
++ if (v4_ifa_in_nx_info(ifa, nxi))
++ return 1;
++ return 0;
++}
+
+
-+/* context bcap mask */
++struct nx_v4_sock_addr {
++ __be32 saddr; /* Address used for validation */
++ __be32 baddr; /* Address used for socket bind */
++};
+
-+#define __vx_bcaps(v) ((v)->vx_bcaps)
++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;
+
-+#define vx_current_bcaps() __vx_bcaps(current->vx_info)
++ 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));
+
++ 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;
++ }
++ }
+
-+/* mask given bcaps */
++ vxdprintk(VXD_CBIT(net, 3),
++ "inet_bind(%p) " NIPQUAD_FMT ", " NIPQUAD_FMT,
++ sk, NIPQUAD(saddr), NIPQUAD(baddr));
+
-+#define vx_info_mbcaps(v, c) ((v) ? cap_intersect(__vx_bcaps(v), c) : c)
++ nsa->saddr = saddr;
++ nsa->baddr = baddr;
++ return 0;
++}
+
-+#define vx_mbcaps(c) vx_info_mbcaps(current->vx_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;
++}
+
+
-+/* masked cap_bset */
++/*
++ * 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_info_cap_bset(v) vx_info_mbcaps(v, current->cap_bset)
-+
-+#define vx_current_cap_bset() vx_info_cap_bset(current->vx_info)
-+
-+#if 0
-+#define vx_info_mbcap(v, b) \
-+ (!vx_info_flags(v, VXF_STATE_SETUP, 0) ? \
-+ vx_info_bcaps(v, b) : (b))
-+
-+#define task_vx_mbcap(t, b) \
-+ vx_info_mbcap((t)->vx_info, (t)->b)
-+
-+#define vx_mbcap(b) task_vx_mbcap(current, b)
-+#endif
-+
-+#define vx_cap_raised(v, c, f) cap_raised(vx_info_mbcaps(v, c), f)
-+
-+#define vx_capable(b, c) (capable(b) || \
-+ (cap_raised(current_cap(), b) && vx_ccaps(c)))
++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 nx_capable(b, c) (capable(b) || \
-+ (cap_raised(current_cap(), b) && nx_ncaps(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_current_initpid(n) \
-+ (current->vx_info && \
-+ (current->vx_info->vx_initpid == (n)))
++#else /* CONFIG_INET */
+
++static inline
++int nx_dev_visible(struct nx_info *n, struct net_device *d)
++{
++ return 1;
++}
+
-+#define __vx_state(v) ((v) ? ((v)->vx_state) : 0)
++static inline
++int nx_v4_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
++{
++ return 1;
++}
+
-+#define vx_info_state(v, m) (__vx_state(v) & (m))
++static inline
++int v4_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
++{
++ return 1;
++}
+
++static inline
++int nx_info_has_v4(struct nx_info *nxi)
++{
++ return 0;
++}
+
-+#define __nx_state(n) ((n) ? ((n)->nx_state) : 0)
++#endif /* CONFIG_INET */
+
-+#define nx_info_state(n, m) (__nx_state(n) & (m))
++#define current_nx_info_has_v4() \
++ nx_info_has_v4(current_nx_info())
+
++#else
++// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/cacct_cmd.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/cacct_cmd.h
---- linux-2.6.29.1/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/cacct_cmd.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,23 @@
-+#ifndef _VX_CACCT_CMD_H
-+#define _VX_CACCT_CMD_H
+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
+
++#include "vserver/base.h"
++#include "vserver/network.h"
++#include "vserver/debug.h"
+
-+/* virtual host info name commands */
++#include <net/ipv6.h>
+
-+#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0)
++#define NXAV6(a) &(a)->ip, &(a)->mask, (a)->prefix, (a)->type
++#define NXAV6_FMT "[%pI6/%pI6/%d:%04x]"
+
-+struct vcmd_sock_stat_v0 {
-+ uint32_t field;
-+ uint32_t count[3];
-+ uint64_t total[3];
-+};
+
++#ifdef CONFIG_IPV6
+
-+#ifdef __KERNEL__
++static inline
++int v6_addr_match(struct nx_addr_v6 *nxa,
++ const struct in6_addr *addr, uint16_t mask)
++{
++ int ret = 0;
+
-+#include <linux/compiler.h>
++ 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;
++}
+
-+extern int vc_sock_stat(struct vx_info *, void __user *);
++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;
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/cacct_def.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/cacct_def.h
---- linux-2.6.29.1/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/cacct_def.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,43 @@
-+#ifndef _VX_CACCT_DEF_H
-+#define _VX_CACCT_DEF_H
++ 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;
++}
+
-+#include <asm/atomic.h>
-+#include <linux/vserver/cacct.h>
++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;
+
-+struct _vx_sock_acc {
-+ atomic_long_t count;
-+ atomic_long_t total;
-+};
++ for (ptr = &nxi->v6; ptr; ptr = ptr->next)
++ if (v6_nx_addr_match(ptr, nxa, mask))
++ return 1;
++ return 0;
++}
+
-+/* context sub struct */
+
-+struct _vx_cacct {
-+ struct _vx_sock_acc sock[VXA_SOCK_SIZE][3];
-+ atomic_t slab[8];
-+ atomic_t page[6][8];
-+};
++/*
++ * 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);
+
-+#ifdef CONFIG_VSERVER_DEBUG
++ 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;
++}
+
-+static inline void __dump_vx_cacct(struct _vx_cacct *cacct)
++/*
++ * 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)
+{
-+ int i, j;
++ struct nx_info *nxi = sk->sk_nx_info;
++ 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];
++ 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));
+
-+ 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");
++ 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;
+ }
+}
+
-+#endif
+
-+#endif /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/cacct.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/cacct.h
---- linux-2.6.29.1/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/cacct.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,15 @@
-+#ifndef _VX_CACCT_H
-+#define _VX_CACCT_H
++/* inet related checks and helpers */
+
+
-+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 */
-+};
++struct in_ifaddr;
++struct net_device;
++struct sock;
+
-+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/cacct_int.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/cacct_int.h
---- linux-2.6.29.1/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/cacct_int.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,21 @@
-+#ifndef _VX_CACCT_INT_H
-+#define _VX_CACCT_INT_H
++
++#include <linux/netdevice.h>
++#include <linux/inetdevice.h>
++#include <net/inet_timewait_sock.h>
+
+
-+#ifdef __KERNEL__
++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 *);
+
-+static inline
-+unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
-+{
-+ return atomic_long_read(&cacct->sock[type][pos].count);
-+}
+
+
+static inline
-+unsigned long vx_sock_total(struct _vx_cacct *cacct, int type, int pos)
++int v6_ifa_in_nx_info(struct inet6_ifaddr *ifa, struct nx_info *nxi)
+{
-+ return atomic_long_read(&cacct->sock[type][pos].total);
-+}
-+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/check.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/check.h
---- linux-2.6.29.1/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/check.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,89 @@
-+#ifndef _VS_CHECK_H
-+#define _VS_CHECK_H
++ if (!nxi)
++ return 1;
++ if (!ifa)
++ return 0;
++ return v6_addr_in_nx_info(nxi, &ifa->addr, -1);
++}
+
++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);
+
-+#define MAX_S_CONTEXT 65535 /* Arbitrary limit */
++ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++ return 1;
++ if (v6_ifa_in_nx_info(ifa, nxi))
++ return 1;
++ return 0;
++}
+
-+#ifdef CONFIG_VSERVER_DYNAMIC_IDS
-+#define MIN_D_CONTEXT 49152 /* dynamic contexts start here */
-+#else
-+#define MIN_D_CONTEXT 65536
-+#endif
+
-+/* check conditions */
++struct nx_v6_sock_addr {
++ struct in6_addr saddr; /* Address used for validation */
++ struct in6_addr baddr; /* Address used for socket bind */
++};
+
-+#define VS_ADMIN 0x0001
-+#define VS_WATCH 0x0002
-+#define VS_HIDE 0x0004
-+#define VS_HOSTID 0x0008
++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;
+
-+#define VS_IDENT 0x0010
-+#define VS_EQUIV 0x0020
-+#define VS_PARENT 0x0040
-+#define VS_CHILD 0x0080
++ nsa->saddr = saddr;
++ nsa->baddr = baddr;
++ return 0;
++}
+
-+#define VS_ARG_MASK 0x00F0
++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);
+
-+#define VS_DYNAMIC 0x0100
-+#define VS_STATIC 0x0200
++ // *saddr = nsa->baddr;
++ // inet->saddr = nsa->baddr;
++}
+
-+#define VS_ATR_MASK 0x0F00
++static inline
++int nx_info_has_v6(struct nx_info *nxi)
++{
++ if (!nxi)
++ return 1;
++ if (NX_IPV6(nxi))
++ return 1;
++ return 0;
++}
+
-+#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
++#else /* CONFIG_IPV6 */
+
-+#define VS_HARDIRQ 0x1000
-+#define VS_SOFTIRQ 0x2000
-+#define VS_IRQ 0x4000
++static inline
++int nx_v6_dev_visible(struct nx_info *n, struct net_device *d)
++{
++ return 1;
++}
+
-+#define VS_IRQ_MASK 0xF000
+
-+#include <linux/hardirq.h>
++static inline
++int nx_v6_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
++{
++ return 1;
++}
+
-+/*
-+ * check current context for ADMIN/WATCH and
-+ * optionally against supplied argument
-+ */
-+static inline int __vs_check(int cid, int id, unsigned int mode)
++static inline
++int v6_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
+{
-+ 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)));
++ return 1;
+}
+
-+#define vx_check(c, m) __vs_check(vx_current_xid(), c, (m) | VS_IRQ)
++static inline
++int nx_info_has_v6(struct nx_info *nxi)
++{
++ return 0;
++}
+
-+#define vx_weak_check(c, m) ((m) ? vx_check(c, m) : 1)
++#endif /* CONFIG_IPV6 */
+
++#define current_nx_info_has_v6() \
++ nx_info_has_v6(current_nx_info())
+
-+#define nx_check(c, m) __vs_check(nx_current_nid(), c, m)
++#else
++#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
+
-+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
++#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"
+
-+#endif
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/context_cmd.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/context_cmd.h
---- linux-2.6.29.1/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/context_cmd.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,128 @@
-+#ifndef _VX_CONTEXT_CMD_H
-+#define _VX_CONTEXT_CMD_H
+
++#define vx_acc_cres(v, d, p, r) \
++ __vx_acc_cres(v, r, d, p, __FILE__, __LINE__)
+
-+/* vinfo commands */
++#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 VCMD_task_xid VC_CMD(VINFO, 1, 0)
+
-+#ifdef __KERNEL__
-+extern int vc_task_xid(uint32_t);
++#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)
+
-+#endif /* __KERNEL__ */
++#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 VCMD_vx_info VC_CMD(VINFO, 5, 0)
+
-+struct vcmd_vx_info_v0 {
-+ uint32_t xid;
-+ uint32_t initpid;
-+ /* more to come */
-+};
++/* process and file limits */
+
-+#ifdef __KERNEL__
-+extern int vc_vx_info(struct vx_info *, void __user *);
++#define vx_nproc_inc(p) \
++ vx_acc_cres((p)->vx_info, 1, p, RLIMIT_NPROC)
+
-+#endif /* __KERNEL__ */
++#define vx_nproc_dec(p) \
++ vx_acc_cres((p)->vx_info,-1, p, RLIMIT_NPROC)
+
-+#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0)
++#define vx_files_inc(f) \
++ vx_acc_cres_cond((f)->f_xid, 1, f, RLIMIT_NOFILE)
+
-+struct vcmd_ctx_stat_v0 {
-+ uint32_t usecnt;
-+ uint32_t tasks;
-+ /* more to come */
-+};
++#define vx_files_dec(f) \
++ vx_acc_cres_cond((f)->f_xid,-1, f, RLIMIT_NOFILE)
+
-+#ifdef __KERNEL__
-+extern int vc_ctx_stat(struct vx_info *, void __user *);
++#define vx_locks_inc(l) \
++ vx_acc_cres_cond((l)->fl_xid, 1, l, RLIMIT_LOCKS)
+
-+#endif /* __KERNEL__ */
++#define vx_locks_dec(l) \
++ vx_acc_cres_cond((l)->fl_xid,-1, l, RLIMIT_LOCKS)
+
-+/* context commands */
++#define vx_openfd_inc(f) \
++ vx_acc_cres(current_vx_info(), 1, (void *)(long)(f), VLIMIT_OPENFD)
+
-+#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0)
-+#define VCMD_ctx_create VC_CMD(VPROC, 1, 1)
++#define vx_openfd_dec(f) \
++ vx_acc_cres(current_vx_info(),-1, (void *)(long)(f), VLIMIT_OPENFD)
+
-+struct vcmd_ctx_create {
-+ uint64_t flagword;
-+};
+
-+#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0)
-+#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1)
++#define vx_cres_avail(v, n, r) \
++ __vx_cres_avail(v, r, n, __FILE__, __LINE__)
+
-+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 *);
++#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 vx_locks_avail(n) \
++ vx_cres_avail(current_vx_info(), n, RLIMIT_LOCKS)
+
-+/* flag commands */
++#define vx_openfd_avail(n) \
++ vx_cres_avail(current_vx_info(), n, VLIMIT_OPENFD)
+
-+#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;
-+};
++/* dentry limits */
+
-+#ifdef __KERNEL__
-+extern int vc_get_cflags(struct vx_info *, void __user *);
-+extern int vc_set_cflags(struct vx_info *, void __user *);
++#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)
+
-+#endif /* __KERNEL__ */
++#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)
+
++#define vx_dentry_avail(n) \
++ vx_cres_avail(current_vx_info(), n, VLIMIT_DENTRY)
+
-+/* context caps commands */
+
-+#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1)
-+#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1)
++/* socket limits */
+
-+struct vcmd_ctx_caps_v1 {
-+ uint64_t ccaps;
-+ uint64_t cmask;
-+};
++#define vx_sock_inc(s) \
++ vx_acc_cres((s)->sk_vx_info, 1, s, VLIMIT_NSOCK)
+
-+#ifdef __KERNEL__
-+extern int vc_get_ccaps(struct vx_info *, void __user *);
-+extern int vc_set_ccaps(struct vx_info *, void __user *);
++#define vx_sock_dec(s) \
++ vx_acc_cres((s)->sk_vx_info,-1, s, VLIMIT_NSOCK)
+
-+#endif /* __KERNEL__ */
++#define vx_sock_avail(n) \
++ vx_cres_avail(current_vx_info(), n, VLIMIT_NSOCK)
+
+
-+/* bcaps commands */
++/* ipc resource limits */
+
-+#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0)
-+#define VCMD_set_bcaps VC_CMD(FLAGS, 10, 0)
++#define vx_ipcmsg_add(v, u, a) \
++ vx_add_cres(v, a, u, RLIMIT_MSGQUEUE)
+
-+struct vcmd_bcaps {
-+ uint64_t bcaps;
-+ uint64_t bmask;
-+};
++#define vx_ipcmsg_sub(v, u, a) \
++ vx_sub_cres(v, a, u, RLIMIT_MSGQUEUE)
+
-+#ifdef __KERNEL__
-+extern int vc_get_bcaps(struct vx_info *, void __user *);
-+extern int vc_set_bcaps(struct vx_info *, void __user *);
++#define vx_ipcmsg_avail(v, a) \
++ vx_cres_avail(v, a, RLIMIT_MSGQUEUE)
+
-+#endif /* __KERNEL__ */
+
++#define vx_ipcshm_add(v, k, a) \
++ vx_add_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
+
-+/* OOM badness */
++#define vx_ipcshm_sub(v, k, a) \
++ vx_sub_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
+
-+#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0)
-+#define VCMD_set_badness VC_CMD(MEMCTRL, 6, 0)
++#define vx_ipcshm_avail(v, a) \
++ vx_cres_avail(v, a, VLIMIT_SHMEM)
+
-+struct vcmd_badness_v0 {
-+ int64_t bias;
-+};
+
-+#ifdef __KERNEL__
-+extern int vc_get_badness(struct vx_info *, void __user *);
-+extern int vc_set_badness(struct vx_info *, void __user *);
++#define vx_semary_inc(a) \
++ vx_acc_cres(current_vx_info(), 1, a, VLIMIT_SEMARY)
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/context.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/context.h
---- linux-2.6.29.1/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/context.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,179 @@
-+#ifndef _VX_CONTEXT_H
-+#define _VX_CONTEXT_H
++#define vx_semary_dec(a) \
++ vx_acc_cres(current_vx_info(), -1, a, VLIMIT_SEMARY)
+
-+#include <linux/types.h>
-+#include <linux/capability.h>
+
++#define vx_nsems_add(a,n) \
++ vx_add_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
+
-+/* context flags */
++#define vx_nsems_sub(a,n) \
++ vx_sub_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
+
-+#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
++#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 VXF_SCHED_HARD 0x00000100
-+#define VXF_SCHED_PRIO 0x00000200
-+#define VXF_SCHED_PAUSE 0x00000400
++#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 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 VXF_HIDE_MOUNT 0x01000000
-+/* was VXF_HIDE_NETIF 0x02000000 */
-+#define VXF_HIDE_VINFO 0x04000000
++#define __acc_add_long(a, v) (*(v) += (a))
++#define __acc_inc_long(v) (++*(v))
++#define __acc_dec_long(v) (--*(v))
+
-+#define VXF_STATE_SETUP (1ULL << 32)
-+#define VXF_STATE_INIT (1ULL << 33)
-+#define VXF_STATE_ADMIN (1ULL << 34)
++#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 VXF_SC_HELPER (1ULL << 36)
-+#define VXF_REBOOT_KILL (1ULL << 37)
-+#define VXF_PERSISTENT (1ULL << 38)
+
-+#define VXF_FORK_RSS (1ULL << 48)
-+#define VXF_PROLIFIC (1ULL << 49)
++#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 VXF_IGNEG_NICE (1ULL << 52)
++#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 VXF_ONE_TIME (0x0007ULL << 32)
+
-+#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN)
++#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 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)
+
-+/* context migration */
+
-+#define VXM_SET_INIT 0x00000001
-+#define VXM_SET_REAPER 0x00000002
+
-+/* context caps */
++#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)
+
-+#define VXC_CAP_MASK 0x00000000
++#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 VXC_SET_UTSNAME 0x00000001
-+#define VXC_SET_RLIMIT 0x00000002
-+#define VXC_FS_SECURITY 0x00000004
++#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))
+
-+/* was VXC_RAW_ICMP 0x00000100 */
-+#define VXC_SYSLOG 0x00001000
++#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))
+
-+#define VXC_SECURE_MOUNT 0x00010000
-+#define VXC_SECURE_REMOUNT 0x00020000
-+#define VXC_BINARY_MOUNT 0x00040000
++#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 VXC_QUOTA_CTL 0x00100000
-+#define VXC_ADMIN_MAPPER 0x00200000
-+#define VXC_ADMIN_CLOOP 0x00400000
++#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))
+
-+#define VXC_KTHREAD 0x01000000
++#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))
+
+
-+#ifdef __KERNEL__
++#define vx_pages_avail(m, p, r) \
++ __vx_cres_avail((m)->mm_vx_info, r, p, __FILE__, __LINE__)
+
-+#include <linux/list.h>
-+#include <linux/spinlock.h>
-+#include <linux/rcupdate.h>
++#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)
+
-+#include "limit_def.h"
-+#include "sched_def.h"
-+#include "cvirt_def.h"
-+#include "cacct_def.h"
-+#include "device_def.h"
++#define vx_rss_avail(m, p) \
++ __vx_cres_array_avail((m)->mm_vx_info, VLA_RSS, p, __FILE__, __LINE__)
+
-+#define VX_SPACES 2
+
-+struct _vx_info_pc {
-+ struct _vx_sched_pc sched_pc;
-+ struct _vx_cvirt_pc cvirt_pc;
++enum {
++ VXPT_UNKNOWN = 0,
++ VXPT_ANON,
++ VXPT_NONE,
++ VXPT_FILE,
++ VXPT_SWAP,
++ VXPT_WRITE
+};
+
-+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 0
++#define vx_page_fault(mm, vma, type, ret)
++#else
+
-+ 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 */
++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" };
++*/
+
-+ uint64_t vx_flags; /* context flags */
-+ uint64_t vx_ccaps; /* context caps (vserver) */
-+ kernel_cap_t vx_bcaps; /* bounding caps (system) */
-+ // kernel_cap_t vx_cap_bset; /* the guest's bset */
++ if (!vxi)
++ return;
+
-+ struct task_struct *vx_reaper; /* guest reaper process */
-+ pid_t vx_initpid; /* PID of guest init */
-+ int64_t vx_badness_bias; /* OOM points bias */
++ what = (ret & 0x3);
+
-+ 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 */
++/* 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]);
++}
+
-+ struct _vx_device dmap; /* default device map targets */
++#define vx_page_fault(mm, vma, type, ret) __vx_page_fault(mm, vma, type, ret)
++#endif
+
-+#ifndef CONFIG_SMP
-+ struct _vx_info_pc info_pc; /* per cpu data */
-+#else
-+ struct _vx_info_pc *ptr_pc; /* per cpu array */
-+#endif
-+
-+ 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 */
-+};
++extern unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm);
+
-+#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
++#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 vx_cpu(vxi, v) vx_per_cpu(vxi, v, smp_processor_id())
-+
-+
-+struct vx_info_save {
-+ struct vx_info *vxi;
-+ xid_t xid;
-+};
-+
++#include "vserver/context.h"
++#include "vserver/network.h"
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/debug.h"
+
-+/* status flags */
++#include <linux/sched.h>
+
-+#define VXS_HASHED 0x0001
-+#define VXS_PAUSED 0x0010
-+#define VXS_SHUTDOWN 0x0100
-+#define VXS_HELPER 0x1000
-+#define VXS_RELEASED 0x8000
+
++#define get_nx_info(i) __get_nx_info(i, __FILE__, __LINE__)
+
-+extern void claim_vx_info(struct vx_info *, struct task_struct *);
-+extern void release_vx_info(struct vx_info *, struct task_struct *);
++static inline struct nx_info *__get_nx_info(struct nx_info *nxi,
++ const char *_file, int _line)
++{
++ if (!nxi)
++ return NULL;
+
-+extern struct vx_info *lookup_vx_info(int);
-+extern struct vx_info *lookup_or_create_vx_info(int);
++ 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);
+
-+extern int get_xid_list(int, unsigned int *, int);
-+extern int xid_is_hashed(xid_t);
++ atomic_inc(&nxi->nx_usecnt);
++ return nxi;
++}
+
-+extern int vx_migrate_task(struct task_struct *, struct vx_info *, int);
+
-+extern long vs_state_change(struct vx_info *, unsigned int);
++extern void free_nx_info(struct nx_info *);
+
++#define put_nx_info(i) __put_nx_info(i, __FILE__, __LINE__)
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/cvirt_cmd.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/cvirt_cmd.h
---- linux-2.6.29.1/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/cvirt_cmd.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,53 @@
-+#ifndef _VX_CVIRT_CMD_H
-+#define _VX_CVIRT_CMD_H
++static inline void __put_nx_info(struct nx_info *nxi, const char *_file, int _line)
++{
++ if (!nxi)
++ return;
+
++ 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);
+
-+/* virtual host info name commands */
++ if (atomic_dec_and_test(&nxi->nx_usecnt))
++ free_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 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);
+
-+enum vhi_name_field {
-+ VHIN_CONTEXT = 0,
-+ VHIN_SYSNAME,
-+ VHIN_NODENAME,
-+ VHIN_RELEASE,
-+ VHIN_VERSION,
-+ VHIN_MACHINE,
-+ VHIN_DOMAINNAME,
-+};
++ atomic_inc(&nxi->nx_usecnt);
++ }
++ *nxp = nxi;
++}
+
+
-+#ifdef __KERNEL__
++#define set_nx_info(p, i) __set_nx_info(p, i, __FILE__, __LINE__)
+
-+#include <linux/compiler.h>
++static inline void __set_nx_info(struct nx_info **nxp, struct nx_info *nxi,
++ const char *_file, int _line)
++{
++ struct nx_info *nxo;
+
-+extern int vc_set_vhi_name(struct vx_info *, void __user *);
-+extern int vc_get_vhi_name(struct vx_info *, void __user *);
++ if (!nxi)
++ return;
+
-+#endif /* __KERNEL__ */
++ 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 VCMD_virt_stat VC_CMD(VSTAT, 3, 0)
++ atomic_inc(&nxi->nx_usecnt);
++ nxo = xchg(nxp, nxi);
++ BUG_ON(nxo);
++}
+
-+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 clr_nx_info(p) __clr_nx_info(p, __FILE__, __LINE__)
+
-+#ifdef __KERNEL__
-+extern int vc_virt_stat(struct vx_info *, void __user *);
++static inline void __clr_nx_info(struct nx_info **nxp,
++ const char *_file, int _line)
++{
++ struct nx_info *nxo;
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/cvirt_def.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/cvirt_def.h
---- linux-2.6.29.1/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/cvirt_def.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,80 @@
-+#ifndef _VX_CVIRT_DEF_H
-+#define _VX_CVIRT_DEF_H
++ nxo = xchg(nxp, NULL);
++ if (!nxo)
++ return;
+
-+#include <linux/jiffies.h>
-+#include <linux/spinlock.h>
-+#include <linux/wait.h>
-+#include <linux/time.h>
-+#include <asm/atomic.h>
++ 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);
+
++ if (atomic_dec_and_test(&nxo->nx_usecnt))
++ free_nx_info(nxo);
++}
+
-+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;
-+};
+
-+struct _vx_syslog {
-+ wait_queue_head_t log_wait;
-+ spinlock_t logbuf_lock; /* lock for the log buffer */
++#define claim_nx_info(v, p) __claim_nx_info(v, p, __FILE__, __LINE__)
+
-+ 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 */
++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);
+
-+ char log_buf[1024];
-+};
++ atomic_inc(&nxi->nx_tasks);
++}
+
+
-+/* context sub struct */
++extern void unhash_nx_info(struct nx_info *);
+
-+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 release_nx_info(v, p) __release_nx_info(v, p, __FILE__, __LINE__)
+
-+ atomic_t nr_onhold; /* processes on hold */
-+ uint32_t onhold_last; /* jiffies when put on hold */
++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);
+
-+ 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 */
++ might_sleep();
+
-+ 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 */
++ if (atomic_dec_and_test(&nxi->nx_tasks))
++ unhash_nx_info(nxi);
++}
+
-+ atomic_t total_forks; /* number of forks so far */
+
-+ struct _vx_syslog syslog;
-+};
++#define task_get_nx_info(i) __task_get_nx_info(i, __FILE__, __LINE__)
+
-+struct _vx_cvirt_pc {
-+ struct _vx_usage_stat cpustat;
-+};
++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 CONFIG_VSERVER_DEBUG
+
-+static inline void __dump_vx_cvirt(struct _vx_cvirt *cvirt)
++static inline void exit_nx_info(struct task_struct *p)
+{
-+ 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));
++ if (p->nx_info)
++ release_nx_info(p->nx_info, p);
+}
+
-+#endif
-+
-+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/cvirt.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/cvirt.h
---- linux-2.6.29.1/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/cvirt.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,20 @@
-+#ifndef _VX_CVIRT_H
-+#define _VX_CVIRT_H
+
++#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
+
-+#ifdef __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>
+
-+struct timespec;
+
-+void vx_vsi_uptime(struct timespec *, struct timespec *);
++#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;
++}
+
-+struct vx_info;
++#define find_task_by_real_pid(pid) find_task_by_pid_ns(pid, &init_pid_ns)
+
-+void vx_update_load(struct vx_info *);
+
++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);
+
-+int vx_do_syslog(int, char __user *, int);
++ 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;
++}
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/debug_cmd.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/debug_cmd.h
---- linux-2.6.29.1/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/debug_cmd.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,58 @@
-+#ifndef _VX_DEBUG_CMD_H
-+#define _VX_DEBUG_CMD_H
+
++#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
+
-+/* debug commands */
++#include "vserver/base.h"
++#include "vserver/context.h"
++#include "vserver/sched.h"
+
-+#define VCMD_dump_history VC_CMD(DEBUG, 1, 0)
+
-+#define VCMD_read_history VC_CMD(DEBUG, 5, 0)
-+#define VCMD_read_monitor VC_CMD(DEBUG, 6, 0)
++#define VAVAVOOM_RATIO 50
+
-+struct vcmd_read_history_v0 {
-+ uint32_t index;
-+ uint32_t count;
-+ char __user *data;
-+};
++#define MAX_PRIO_BIAS 20
++#define MIN_PRIO_BIAS -20
+
-+struct vcmd_read_monitor_v0 {
-+ uint32_t index;
-+ uint32_t count;
-+ char __user *data;
-+};
+
++#ifdef CONFIG_VSERVER_HARDCPU
+
-+#ifdef __KERNEL__
++/*
++ * 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;
+
-+#ifdef CONFIG_COMPAT
++ /* 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;
++}
+
-+#include <asm/compat.h>
+
-+struct vcmd_read_history_v0_x32 {
-+ uint32_t index;
-+ uint32_t count;
-+ compat_uptr_t data_ptr;
-+};
++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;
+
-+struct vcmd_read_monitor_v0_x32 {
-+ uint32_t index;
-+ uint32_t count;
-+ compat_uptr_t data_ptr;
-+};
++ if (!vxi)
++ return prio;
+
-+#endif /* CONFIG_COMPAT */
++ 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);
+
-+extern int vc_dump_history(uint32_t);
++ sched_pc->vavavoom = vavavoom;
++ prio += vavavoom;
++ }
++ prio += sched_pc->prio_bias;
++ return prio;
++}
+
-+extern int vc_read_history(uint32_t, void __user *);
-+extern int vc_read_monitor(uint32_t, void __user *);
++#else /* !CONFIG_VSERVER_HARDCPU */
+
-+#ifdef CONFIG_COMPAT
++static inline
++int vx_adjust_prio(struct task_struct *p, int prio, int max_user)
++{
++ struct vx_info *vxi = p->vx_info;
+
-+extern int vc_read_history_x32(uint32_t, void __user *);
-+extern int vc_read_monitor_x32(uint32_t, void __user *);
++ if (vxi)
++ prio += vx_cpu(vxi, sched_pc).prio_bias;
++ return prio;
++}
+
-+#endif /* CONFIG_COMPAT */
++#endif /* CONFIG_VSERVER_HARDCPU */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/debug.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/debug.h
---- linux-2.6.29.1/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/debug.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,127 @@
-+#ifndef _VX_DEBUG_H
-+#define _VX_DEBUG_H
+
++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 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))
++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 VXD_DEV(d) (d), (d)->bd_inode->i_ino, \
-+ imajor((d)->bd_inode), iminor((d)->bd_inode)
-+#define VXF_DEV "%p[%lu,%d:%d]"
++#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
+
++#include "vserver/debug.h"
++#include "vserver/base.h"
++#include "vserver/cacct.h"
++#include "vserver/context.h"
++#include "vserver/tag.h"
+
-+#define vxd_path(p) \
-+ ({ static char _buffer[PATH_MAX]; \
-+ d_path(p, _buffer, sizeof(_buffer)); })
+
-+#define vxd_cond_path(n) \
-+ ((n) ? vxd_path(&(n)->path) : "<null>" )
++/* socket accounting */
+
++#include <linux/socket.h>
+
-+#ifdef CONFIG_VSERVER_DEBUG
++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;
++ }
++}
+
-+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;
++#define vx_acc_sock(v, f, p, s) \
++ __vx_acc_sock(v, f, p, s, __FILE__, __LINE__)
+
++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 VX_LOGLEVEL "vxD: "
-+#define VX_PROC_FMT "%p: "
-+#define VX_PROCESS current
++ atomic_long_inc(&vxi->cacct.sock[type][pos].count);
++ atomic_long_add(size, &vxi->cacct.sock[type][pos].total);
++ }
++}
+
-+#define vxdprintk(c, f, x...) \
-+ do { \
-+ if (c) \
-+ printk(VX_LOGLEVEL VX_PROC_FMT f "\n", \
-+ VX_PROCESS , ##x); \
-+ } while (0)
++#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)
+
-+#define vxlprintk(c, f, x...) \
-+ do { \
-+ if (c) \
-+ printk(VX_LOGLEVEL f " @%s:%d\n", x); \
++
++#define sock_vx_init(s) do { \
++ (s)->sk_xid = 0; \
++ (s)->sk_vx_info = NULL; \
+ } while (0)
+
-+#define vxfprintk(c, f, x...) \
-+ do { \
-+ if (c) \
-+ printk(VX_LOGLEVEL f " %s@%s:%d\n", x); \
++#define sock_nx_init(s) do { \
++ (s)->sk_nid = 0; \
++ (s)->sk_nx_info = NULL; \
+ } while (0)
+
++#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
+
-+struct vx_info;
++#include <linux/vserver/tag.h>
+
-+void dump_vx_info(struct vx_info *, int);
-+void dump_vx_info_inactive(int);
++/* check conditions */
+
-+#else /* CONFIG_VSERVER_DEBUG */
++#define DX_ADMIN 0x0001
++#define DX_WATCH 0x0002
++#define DX_HOSTID 0x0008
+
-+#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 DX_IDENT 0x0010
+
-+#define vxdprintk(x...) do { } while (0)
-+#define vxlprintk(x...) do { } while (0)
-+#define vxfprintk(x...) do { } while (0)
++#define DX_ARG_MASK 0x0010
+
-+#endif /* CONFIG_VSERVER_DEBUG */
+
++#define dx_task_tag(t) ((t)->tag)
+
-+#ifdef CONFIG_VSERVER_WARN
++#define dx_current_tag() dx_task_tag(current)
+
-+#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 dx_check(c, m) __dx_check(dx_current_tag(), c, m)
+
-+#define vxwprintk(c, f, x...) \
-+ do { \
-+ if (c) \
-+ printk(VX_WARNLEVEL f "\n", ##x); \
-+ } while (0)
++#define dx_weak_check(c, m) ((m) ? dx_check(c, m) : 1)
+
-+#else /* CONFIG_VSERVER_WARN */
+
-+#define vxwprintk(x...) do { } while (0)
++/*
++ * 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)));
++}
+
-+#endif /* CONFIG_VSERVER_WARN */
++struct inode;
++int dx_permission(const struct inode *inode, int mask);
+
-+#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)
+
-+#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)
++#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
+
+
-+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/device_cmd.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/device_cmd.h
---- linux-2.6.29.1/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/device_cmd.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,44 @@
-+#ifndef _VX_DEVICE_CMD_H
-+#define _VX_DEVICE_CMD_H
++/* time faking stuff */
+
++#ifdef CONFIG_VSERVER_VTIME
+
-+/* device vserver commands */
++extern void vx_gettimeofday(struct timeval *tv);
++extern int vx_settimeofday(struct timespec *ts);
+
-+#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0)
-+#define VCMD_unset_mapping VC_CMD(DEVICE, 2, 0)
++#else
++#define vx_gettimeofday(t) do_gettimeofday(t)
++#define vx_settimeofday(t) do_settimeofday(t)
++#endif
+
-+struct vcmd_set_mapping_v0 {
-+ const char __user *device;
-+ const char __user *target;
-+ uint32_t flags;
-+};
++#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 @@
+
++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
+
-+#ifdef __KERNEL__
++unifdef-y += switch.h network.h monitor.h inode.h device.h
+
-+#ifdef CONFIG_COMPAT
+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
+
-+#include <asm/compat.h>
+
-+struct vcmd_set_mapping_v0_x32 {
-+ compat_uptr_t device_ptr;
-+ compat_uptr_t target_ptr;
-+ uint32_t flags;
-+};
++/* context state changes */
+
-+#endif /* CONFIG_COMPAT */
++enum {
++ VSC_STARTUP = 1,
++ VSC_SHUTDOWN,
+
-+#include <linux/compiler.h>
++ VSC_NETUP,
++ VSC_NETDOWN,
++};
+
-+extern int vc_set_mapping(struct vx_info *, void __user *);
-+extern int vc_unset_mapping(struct vx_info *, void __user *);
+
-+#ifdef CONFIG_COMPAT
+
-+extern int vc_set_mapping_x32(struct vx_info *, void __user *);
-+extern int vc_unset_mapping_x32(struct vx_info *, void __user *);
++#define vx_task_xid(t) ((t)->xid)
+
-+#endif /* CONFIG_COMPAT */
++#define vx_current_xid() vx_task_xid(current)
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/device_def.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/device_def.h
---- linux-2.6.29.1/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/device_def.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,17 @@
-+#ifndef _VX_DEVICE_DEF_H
-+#define _VX_DEVICE_DEF_H
++#define current_vx_info() (current->vx_info)
+
-+#include <linux/types.h>
+
-+struct vx_dmap_target {
-+ dev_t target;
-+ uint32_t flags;
-+};
++#define nx_task_nid(t) ((t)->nid)
+
-+struct _vx_device {
-+#ifdef CONFIG_VSERVER_DEVICE
-+ struct vx_dmap_target targets[2];
-+#endif
-+};
++#define nx_current_nid() nx_task_nid(current)
+
-+#endif /* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/device.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/device.h
---- linux-2.6.29.1/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/device.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,15 @@
-+#ifndef _VX_DEVICE_H
-+#define _VX_DEVICE_H
++#define current_nx_info() (current->nx_info)
+
+
-+#define DATTR_CREATE 0x00000001
-+#define DATTR_OPEN 0x00000002
++/* generic flag merging */
+
-+#define DATTR_REMAP 0x00000010
++#define vs_check_flags(v, m, f) (((v) & (m)) ^ (f))
+
-+#define DATTR_MASK 0x00000013
++#define vs_mask_flags(v, f, m) (((v) & ~(m)) | ((f) & (m)))
+
++#define vs_mask_mask(v, f, m) (((v) & ~(m)) | ((v) & (f) & (m)))
+
-+#else /* _VX_DEVICE_H */
-+#warning duplicate inclusion
-+#endif /* _VX_DEVICE_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/dlimit_cmd.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/dlimit_cmd.h
---- linux-2.6.29.1/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/dlimit_cmd.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,74 @@
-+#ifndef _VX_DLIMIT_CMD_H
-+#define _VX_DLIMIT_CMD_H
++#define vs_check_bit(v, n) ((v) & (1LL << (n)))
+
+
-+/* dlimit vserver commands */
++/* context flags */
+
-+#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0)
-+#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0)
++#define __vx_flags(v) ((v) ? (v)->vx_flags : 0)
+
-+#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0)
-+#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0)
++#define vx_current_flags() __vx_flags(current_vx_info())
+
-+struct vcmd_ctx_dlimit_base_v0 {
-+ const char __user *name;
-+ uint32_t flags;
-+};
++#define vx_info_flags(v, m, f) \
++ vs_check_flags(__vx_flags(v), m, f)
+
-+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 task_vx_flags(t, m, f) \
++ ((t) && vx_info_flags((t)->vx_info, m, f))
+
-+#define CDLIM_UNSET ((uint32_t)0UL)
-+#define CDLIM_INFINITY ((uint32_t)~0UL)
-+#define CDLIM_KEEP ((uint32_t)~1UL)
++#define vx_flags(m, f) vx_info_flags(current_vx_info(), m, f)
+
-+#ifdef __KERNEL__
+
-+#ifdef CONFIG_COMPAT
++/* context caps */
+
-+#include <asm/compat.h>
++#define __vx_ccaps(v) ((v) ? (v)->vx_ccaps : 0)
+
-+struct vcmd_ctx_dlimit_base_v0_x32 {
-+ compat_uptr_t name_ptr;
-+ uint32_t flags;
-+};
++#define vx_current_ccaps() __vx_ccaps(current_vx_info())
+
-+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_ccaps(v, c) (__vx_ccaps(v) & (c))
+
-+#endif /* CONFIG_COMPAT */
++#define vx_ccaps(c) vx_info_ccaps(current_vx_info(), (c))
+
-+#include <linux/compiler.h>
+
-+extern int vc_add_dlimit(uint32_t, void __user *);
-+extern int vc_rem_dlimit(uint32_t, void __user *);
+
-+extern int vc_set_dlimit(uint32_t, void __user *);
-+extern int vc_get_dlimit(uint32_t, void __user *);
++/* network flags */
+
-+#ifdef CONFIG_COMPAT
++#define __nx_flags(n) ((n) ? (n)->nx_flags : 0)
+
-+extern int vc_add_dlimit_x32(uint32_t, void __user *);
-+extern int vc_rem_dlimit_x32(uint32_t, void __user *);
++#define nx_current_flags() __nx_flags(current_nx_info())
+
-+extern int vc_set_dlimit_x32(uint32_t, void __user *);
-+extern int vc_get_dlimit_x32(uint32_t, void __user *);
++#define nx_info_flags(n, m, f) \
++ vs_check_flags(__nx_flags(n), m, f)
+
-+#endif /* CONFIG_COMPAT */
++#define task_nx_flags(t, m, f) \
++ ((t) && nx_info_flags((t)->nx_info, m, f))
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/dlimit.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/dlimit.h
---- linux-2.6.29.1/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/dlimit.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,54 @@
-+#ifndef _VX_DLIMIT_H
-+#define _VX_DLIMIT_H
++#define nx_flags(m, f) nx_info_flags(current_nx_info(), m, f)
+
-+#include "switch.h"
+
++/* network caps */
+
-+#ifdef __KERNEL__
++#define __nx_ncaps(n) ((n) ? (n)->nx_ncaps : 0)
+
-+/* keep in sync with CDLIM_INFINITY */
++#define nx_current_ncaps() __nx_ncaps(current_nx_info())
+
-+#define DLIM_INFINITY (~0ULL)
++#define nx_info_ncaps(n, c) (__nx_ncaps(n) & (c))
+
-+#include <linux/spinlock.h>
-+#include <linux/rcupdate.h>
++#define nx_ncaps(c) nx_info_ncaps(current_nx_info(), c)
+
-+struct super_block;
+
-+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 */
++/* context mask capabilities */
+
-+ struct super_block *dl_sb; /* associated superblock */
++#define __vx_mcaps(v) ((v) ? (v)->vx_ccaps >> 32UL : ~0 )
+
-+ spinlock_t dl_lock; /* protect the values */
++#define vx_info_mcaps(v, c) (__vx_mcaps(v) & (c))
+
-+ 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 vx_mcaps(c) vx_info_mcaps(current_vx_info(), c)
+
-+ unsigned int dl_nrlmult; /* non root limit mult */
-+};
+
-+struct rcu_head;
++/* context bcap mask */
+
-+extern void rcu_free_dl_info(struct rcu_head *);
-+extern void unhash_dl_info(struct dl_info *);
++#define __vx_bcaps(v) ((v)->vx_bcaps)
+
-+extern struct dl_info *locate_dl_info(struct super_block *, tag_t);
++#define vx_current_bcaps() __vx_bcaps(current_vx_info())
+
+
-+struct kstatfs;
++/* mask given bcaps */
+
-+extern void vx_vsi_statfs(struct super_block *, struct kstatfs *);
++#define vx_info_mbcaps(v, c) ((v) ? cap_intersect(__vx_bcaps(v), c) : c)
+
-+typedef uint64_t dlsize_t;
++#define vx_mbcaps(c) vx_info_mbcaps(current_vx_info(), c)
+
-+#endif /* __KERNEL__ */
-+#else /* _VX_DLIMIT_H */
-+#warning duplicate inclusion
-+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/global.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/global.h
---- linux-2.6.29.1/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/global.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,20 @@
-+#ifndef _VX_GLOBAL_H
-+#define _VX_GLOBAL_H
+
++/* masked cap_bset */
+
-+extern atomic_t vx_global_ctotal;
-+extern atomic_t vx_global_cactive;
++#define vx_info_cap_bset(v) vx_info_mbcaps(v, current->cap_bset)
+
-+extern atomic_t nx_global_ctotal;
-+extern atomic_t nx_global_cactive;
++#define vx_current_cap_bset() vx_info_cap_bset(current_vx_info())
+
-+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_ipc_ns;
-+extern atomic_t vs_global_user_ns;
-+extern atomic_t vs_global_pid_ns;
++#if 0
++#define vx_info_mbcap(v, b) \
++ (!vx_info_flags(v, VXF_STATE_SETUP, 0) ? \
++ vx_info_bcaps(v, b) : (b))
+
++#define task_vx_mbcap(t, b) \
++ vx_info_mbcap((t)->vx_info, (t)->b)
+
-+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/history.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/history.h
---- linux-2.6.29.1/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/history.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,197 @@
-+#ifndef _VX_HISTORY_H
-+#define _VX_HISTORY_H
++#define vx_mbcap(b) task_vx_mbcap(current, b)
++#endif
+
++#define vx_cap_raised(v, c, f) cap_raised(vx_info_mbcaps(v, c), f)
+
-+enum {
-+ VXH_UNUSED = 0,
-+ VXH_THROW_OOPS = 1,
++#define vx_capable(b, c) (capable(b) || \
++ (cap_raised(current_cap(), b) && vx_ccaps(c)))
+
-+ 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,
-+};
++#define nx_capable(b, c) (capable(b) || \
++ (cap_raised(current_cap(), b) && nx_ncaps(c)))
+
-+struct _vxhe_vxi {
-+ struct vx_info *ptr;
-+ unsigned xid;
-+ unsigned usecnt;
-+ unsigned tasks;
-+};
++#define vx_task_initpid(t, n) \
++ ((t)->vx_info && \
++ ((t)->vx_info->vx_initpid == (n)))
+
-+struct _vxhe_set_clr {
-+ void *data;
-+};
++#define vx_current_initpid(n) vx_task_initpid(current, n)
+
-+struct _vxhe_loc_lookup {
-+ unsigned arg;
-+};
+
-+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;
-+ };
-+};
++/* context unshare mask */
+
-+#ifdef CONFIG_VSERVER_HISTORY
++#define __vx_umask(v) ((v)->vx_umask)
+
-+extern unsigned volatile int vxh_active;
++#define vx_current_umask() __vx_umask(current_vx_info())
+
-+struct _vx_hist_entry *vxh_advance(void *loc);
++#define vx_can_unshare(b, f) (capable(b) || \
++ (cap_raised(current_cap(), b) && \
++ !((f) & ~vx_current_umask())))
+
+
-+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;
-+ }
-+}
++#define __vx_state(v) ((v) ? ((v)->vx_state) : 0)
+
++#define vx_info_state(v, m) (__vx_state(v) & (m))
+
-+#define __HERE__ current_text_addr()
+
-+#define __VXH_BODY(__type, __data, __here) \
-+ struct _vx_hist_entry *entry; \
-+ \
-+ preempt_disable(); \
-+ entry = vxh_advance(__here); \
-+ __data; \
-+ entry->type = __type; \
-+ preempt_enable();
++#define __nx_state(n) ((n) ? ((n)->nx_state) : 0)
+
++#define nx_info_state(n, m) (__nx_state(n) & (m))
+
-+ /* pass vxi only */
++#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
+
-+#define __VXH_SMPL \
-+ __vxh_copy_vxi(entry, vxi)
+
-+static inline
-+void __vxh_smpl(struct vx_info *vxi, int __type, void *__here)
-+{
-+ __VXH_BODY(__type, __VXH_SMPL, __here)
-+}
++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 */
++};
+
-+ /* pass vxi and data (void *) */
++#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
+
-+#define __VXH_DATA \
-+ __vxh_copy_vxi(entry, vxi); \
-+ entry->sc.data = data
+
-+static inline
-+void __vxh_data(struct vx_info *vxi, void *data,
-+ int __type, void *__here)
-+{
-+ __VXH_BODY(__type, __VXH_DATA, __here)
-+}
++/* virtual host info name commands */
+
-+ /* pass vxi and arg (long) */
++#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0)
+
-+#define __VXH_LONG \
-+ __vxh_copy_vxi(entry, vxi); \
-+ entry->ll.arg = arg
++struct vcmd_sock_stat_v0 {
++ uint32_t field;
++ uint32_t count[3];
++ uint64_t total[3];
++};
+
-+static inline
-+void __vxh_long(struct vx_info *vxi, long arg,
-+ int __type, void *__here)
-+{
-+ __VXH_BODY(__type, __VXH_LONG, __here)
-+}
+
++#ifdef __KERNEL__
+
-+static inline
-+void __vxh_throw_oops(void *__here)
-+{
-+ __VXH_BODY(VXH_THROW_OOPS, {}, __here);
-+ /* prevent further acquisition */
-+ vxh_active = 0;
-+}
++#include <linux/compiler.h>
+
++extern int vc_sock_stat(struct vx_info *, void __user *);
+
-+#define vxh_throw_oops() __vxh_throw_oops(__HERE__);
++#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
+
-+#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);
++#include <asm/atomic.h>
++#include <linux/vserver/cacct.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);
++struct _vx_sock_acc {
++ atomic_long_t count;
++ atomic_long_t total;
++};
+
-+#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__);
++/* context sub struct */
+
-+#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__);
++struct _vx_cacct {
++ struct _vx_sock_acc sock[VXA_SOCK_SIZE][3];
++ atomic_t slab[8];
++ atomic_t page[6][8];
++};
+
-+#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__);
++#ifdef CONFIG_VSERVER_DEBUG
+
-+extern void vxh_dump_history(void);
++static inline void __dump_vx_cacct(struct _vx_cacct *cacct)
++{
++ int i, j;
+
++ printk("\t_vx_cacct:");
++ for (i = 0; i < 6; i++) {
++ struct _vx_sock_acc *ptr = cacct->sock[i];
+
-+#else /* CONFIG_VSERVER_HISTORY */
++ 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");
++ }
++}
+
-+#define __HERE__ 0
++#endif
+
-+#define vxh_throw_oops() do { } while (0)
++#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
+
-+#define __vxh_get_vx_info(v, h) do { } while (0)
-+#define __vxh_put_vx_info(v, h) do { } while (0)
+
-+#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)
++#ifdef __KERNEL__
+
-+#define __vxh_claim_vx_info(v, d, h) do { } while (0)
-+#define __vxh_release_vx_info(v, d, h) do { } while (0)
++static inline
++unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
++{
++ return atomic_long_read(&cacct->sock[type][pos].count);
++}
+
-+#define vxh_alloc_vx_info(v) do { } while (0)
-+#define vxh_dealloc_vx_info(v) do { } while (0)
+
-+#define vxh_hash_vx_info(v) do { } while (0)
-+#define vxh_unhash_vx_info(v) do { } while (0)
++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_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__ */
++#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
+
-+#define vxh_dump_history() do { } while (0)
+
++#define MAX_S_CONTEXT 65535 /* Arbitrary limit */
+
-+#endif /* CONFIG_VSERVER_HISTORY */
++#ifdef CONFIG_VSERVER_DYNAMIC_IDS
++#define MIN_D_CONTEXT 49152 /* dynamic contexts start here */
++#else
++#define MIN_D_CONTEXT 65536
++#endif
+
-+#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/inode_cmd.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/inode_cmd.h
---- linux-2.6.29.1/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/inode_cmd.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,59 @@
-+#ifndef _VX_INODE_CMD_H
-+#define _VX_INODE_CMD_H
++/* check conditions */
+
++#define VS_ADMIN 0x0001
++#define VS_WATCH 0x0002
++#define VS_HIDE 0x0004
++#define VS_HOSTID 0x0008
+
-+/* inode vserver commands */
++#define VS_IDENT 0x0010
++#define VS_EQUIV 0x0020
++#define VS_PARENT 0x0040
++#define VS_CHILD 0x0080
+
-+#define VCMD_get_iattr VC_CMD(INODE, 1, 1)
-+#define VCMD_set_iattr VC_CMD(INODE, 2, 1)
++#define VS_ARG_MASK 0x00F0
+
-+#define VCMD_fget_iattr VC_CMD(INODE, 3, 0)
-+#define VCMD_fset_iattr VC_CMD(INODE, 4, 0)
++#define VS_DYNAMIC 0x0100
++#define VS_STATIC 0x0200
+
-+struct vcmd_ctx_iattr_v1 {
-+ const char __user *name;
-+ uint32_t tag;
-+ uint32_t flags;
-+ uint32_t mask;
-+};
++#define VS_ATR_MASK 0x0F00
+
-+struct vcmd_ctx_fiattr_v0 {
-+ uint32_t tag;
-+ uint32_t flags;
-+ uint32_t mask;
-+};
++#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
+
-+#ifdef __KERNEL__
++#define VS_IRQ_MASK 0xF000
+
++#include <linux/hardirq.h>
+
-+#ifdef CONFIG_COMPAT
++/*
++ * 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)));
++}
+
-+#include <asm/compat.h>
++#define vx_check(c, m) __vs_check(vx_current_xid(), c, (m) | VS_IRQ)
+
-+struct vcmd_ctx_iattr_v1_x32 {
-+ compat_uptr_t name_ptr;
-+ uint32_t tag;
-+ uint32_t flags;
-+ uint32_t mask;
-+};
++#define vx_weak_check(c, m) ((m) ? vx_check(c, m) : 1)
+
-+#endif /* CONFIG_COMPAT */
+
-+#include <linux/compiler.h>
++#define nx_check(c, m) __vs_check(nx_current_nid(), c, m)
+
-+extern int vc_get_iattr(void __user *);
-+extern int vc_set_iattr(void __user *);
++#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
-+extern int vc_fget_iattr(uint32_t, void __user *);
-+extern int vc_fset_iattr(uint32_t, void __user *);
++#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
+
-+#ifdef CONFIG_COMPAT
++#include <linux/types.h>
++#include <linux/capability.h>
+
-+extern int vc_get_iattr_x32(void __user *);
-+extern int vc_set_iattr_x32(void __user *);
+
-+#endif /* CONFIG_COMPAT */
++/* context flags */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/inode.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/inode.h
---- linux-2.6.29.1/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/inode.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,38 @@
-+#ifndef _VX_INODE_H
-+#define _VX_INODE_H
++#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 IATTR_TAG 0x01000000
++#define VXF_SCHED_HARD 0x00000100
++#define VXF_SCHED_PRIO 0x00000200
++#define VXF_SCHED_PAUSE 0x00000400
+
-+#define IATTR_ADMIN 0x00000001
-+#define IATTR_WATCH 0x00000002
-+#define IATTR_HIDE 0x00000004
-+#define IATTR_FLAGS 0x00000007
++#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 IATTR_BARRIER 0x00010000
-+#define IATTR_IXUNLINK 0x00020000
-+#define IATTR_IMMUTABLE 0x00040000
++#define VXF_HIDE_MOUNT 0x01000000
++/* was VXF_HIDE_NETIF 0x02000000 */
++#define VXF_HIDE_VINFO 0x04000000
+
-+#ifdef __KERNEL__
++#define VXF_STATE_SETUP (1ULL << 32)
++#define VXF_STATE_INIT (1ULL << 33)
++#define VXF_STATE_ADMIN (1ULL << 34)
+
++#define VXF_SC_HELPER (1ULL << 36)
++#define VXF_REBOOT_KILL (1ULL << 37)
++#define VXF_PERSISTENT (1ULL << 38)
+
-+#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
++#define VXF_FORK_RSS (1ULL << 48)
++#define VXF_PROLIFIC (1ULL << 49)
+
-+#define vx_hide_check(c, m) (((m) & IATTR_HIDE) ? vx_check(c, m) : 1)
++#define VXF_IGNEG_NICE (1ULL << 52)
+
-+#endif /* __KERNEL__ */
++#define VXF_ONE_TIME (0x0007ULL << 32)
+
-+/* inode ioctls */
++#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN)
+
-+#define FIOC_GETXFLG _IOR('x', 5, long)
-+#define FIOC_SETXFLG _IOW('x', 6, long)
+
-+#else /* _VX_INODE_H */
-+#warning duplicate inclusion
-+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/Kbuild linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/Kbuild
---- linux-2.6.29.1/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/Kbuild 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,8 @@
++/* context migration */
+
-+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 VXM_SET_INIT 0x00000001
++#define VXM_SET_REAPER 0x00000002
+
-+unifdef-y += switch.h network.h monitor.h inode.h device.h
++/* context caps */
+
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/limit_cmd.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/limit_cmd.h
---- linux-2.6.29.1/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/limit_cmd.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,69 @@
-+#ifndef _VX_LIMIT_CMD_H
-+#define _VX_LIMIT_CMD_H
++#define VXC_CAP_MASK 0x00000000
+
++#define VXC_SET_UTSNAME 0x00000001
++#define VXC_SET_RLIMIT 0x00000002
++#define VXC_FS_SECURITY 0x00000004
++#define VXC_FS_TRUSTED 0x00000008
++#define VXC_TIOCSTI 0x00000010
+
-+/* rlimit vserver commands */
++/* was VXC_RAW_ICMP 0x00000100 */
++#define VXC_SYSLOG 0x00001000
++#define VXC_OOM_ADJUST 0x00002000
++#define VXC_AUDIT_CONTROL 0x00004000
+
-+#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_minmax VC_CMD(RLIMIT, 9, 0)
-+
-+struct vcmd_ctx_rlimit_v0 {
-+ uint32_t id;
-+ uint64_t minimum;
-+ uint64_t softlimit;
-+ uint64_t maximum;
-+};
-+
-+struct vcmd_ctx_rlimit_mask_v0 {
-+ uint32_t minimum;
-+ uint32_t softlimit;
-+ uint32_t maximum;
-+};
++#define VXC_SECURE_MOUNT 0x00010000
++#define VXC_SECURE_REMOUNT 0x00020000
++#define VXC_BINARY_MOUNT 0x00040000
+
-+#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0)
++#define VXC_QUOTA_CTL 0x00100000
++#define VXC_ADMIN_MAPPER 0x00200000
++#define VXC_ADMIN_CLOOP 0x00400000
+
-+struct vcmd_rlimit_stat_v0 {
-+ uint32_t id;
-+ uint32_t hits;
-+ uint64_t value;
-+ uint64_t minimum;
-+ uint64_t maximum;
-+};
++#define VXC_KTHREAD 0x01000000
++#define VXC_NAMESPACE 0x02000000
+
-+#define CRLIM_UNSET (0ULL)
-+#define CRLIM_INFINITY (~0ULL)
-+#define CRLIM_KEEP (~1ULL)
+
+#ifdef __KERNEL__
+
-+#ifdef CONFIG_IA32_EMULATION
++#include <linux/list.h>
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
+
-+struct vcmd_ctx_rlimit_v0_x32 {
-+ uint32_t id;
-+ uint64_t minimum;
-+ uint64_t softlimit;
-+ uint64_t maximum;
-+} __attribute__ ((packed));
++#include "limit_def.h"
++#include "sched_def.h"
++#include "cvirt_def.h"
++#include "cacct_def.h"
++#include "device_def.h"
+
-+#endif /* CONFIG_IA32_EMULATION */
++#define VX_SPACES 2
+
-+#include <linux/compiler.h>
++struct _vx_info_pc {
++ struct _vx_sched_pc sched_pc;
++ struct _vx_cvirt_pc cvirt_pc;
++};
+
-+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_minmax(struct vx_info *, void __user *);
++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 */
+
-+extern int vc_rlimit_stat(struct vx_info *, void __user *);
++ 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 */
+
-+#ifdef CONFIG_IA32_EMULATION
++ 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_get_rlimit_x32(struct vx_info *, void __user *);
-+extern int vc_set_rlimit_x32(struct vx_info *, 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 */
+
-+#endif /* CONFIG_IA32_EMULATION */
++ 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 */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/limit_def.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/limit_def.h
---- linux-2.6.29.1/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/limit_def.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,47 @@
-+#ifndef _VX_LIMIT_DEF_H
-+#define _VX_LIMIT_DEF_H
++ struct _vx_device dmap; /* default device map targets */
+
-+#include <asm/atomic.h>
-+#include <asm/resource.h>
++#ifndef CONFIG_SMP
++ struct _vx_info_pc info_pc; /* per cpu data */
++#else
++ struct _vx_info_pc *ptr_pc; /* per cpu array */
++#endif
+
-+#include "limit.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 */
++};
+
-+struct _vx_res_limit {
-+ rlim_t soft; /* Context soft limit */
-+ rlim_t hard; /* Context hard limit */
++#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
+
-+ rlim_atomic_t rcur; /* Current value */
-+ rlim_t rmin; /* Context minimum */
-+ rlim_t rmax; /* Context maximum */
++#define vx_cpu(vxi, v) vx_per_cpu(vxi, v, smp_processor_id())
+
-+ atomic_t lhit; /* Limit hits */
++
++struct vx_info_save {
++ struct vx_info *vxi;
++ xid_t xid;
+};
+
-+/* context sub struct */
+
-+struct _vx_limit {
-+ struct _vx_res_limit res[NUM_LIMITS];
-+};
++/* status flags */
+
-+#ifdef CONFIG_VSERVER_DEBUG
++#define VXS_HASHED 0x0001
++#define VXS_PAUSED 0x0010
++#define VXS_SHUTDOWN 0x0100
++#define VXS_HELPER 0x1000
++#define VXS_RELEASED 0x8000
+
-+static inline void __dump_vx_limit(struct _vx_limit *limit)
-+{
-+ int i;
+
-+ 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)));
-+ }
-+}
++extern void claim_vx_info(struct vx_info *, struct task_struct *);
++extern void release_vx_info(struct vx_info *, struct task_struct *);
+
-+#endif
++extern struct vx_info *lookup_vx_info(int);
++extern struct vx_info *lookup_or_create_vx_info(int);
+
-+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/limit.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/limit.h
---- linux-2.6.29.1/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/limit.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,70 @@
-+#ifndef _VX_LIMIT_H
-+#define _VX_LIMIT_H
++extern int get_xid_list(int, unsigned int *, int);
++extern int xid_is_hashed(xid_t);
+
-+#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
++extern int vx_migrate_task(struct task_struct *, struct vx_info *, int);
+
++extern long vs_state_change(struct vx_info *, unsigned int);
+
-+#ifdef __KERNEL__
+
-+#define VLIM_NOCHECK ((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS))
++#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
+
-+/* keep in sync with CRLIM_INFINITY */
+
-+#define VLIM_INFINITY (~0ULL)
++/* vinfo commands */
+
-+#include <asm/atomic.h>
-+#include <asm/resource.h>
++#define VCMD_task_xid VC_CMD(VINFO, 1, 0)
+
-+#ifndef RLIM_INFINITY
-+#warning RLIM_INFINITY is undefined
-+#endif
++#ifdef __KERNEL__
++extern int vc_task_xid(uint32_t);
+
-+#define __rlim_val(l, r, v) ((l)->res[r].v)
++#endif /* __KERNEL__ */
+
-+#define __rlim_soft(l, r) __rlim_val(l, r, soft)
-+#define __rlim_hard(l, r) __rlim_val(l, r, hard)
++#define VCMD_vx_info VC_CMD(VINFO, 5, 0)
+
-+#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)
++struct vcmd_vx_info_v0 {
++ uint32_t xid;
++ uint32_t initpid;
++ /* more to come */
++};
+
-+#define __rlim_lhit(l, r) __rlim_val(l, r, lhit)
-+#define __rlim_hit(l, r) atomic_inc(&__rlim_lhit(l, r))
++#ifdef __KERNEL__
++extern int vc_vx_info(struct vx_info *, void __user *);
+
-+typedef atomic_long_t rlim_atomic_t;
-+typedef unsigned long rlim_t;
++#endif /* __KERNEL__ */
+
-+#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))
++#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0)
+
++struct vcmd_ctx_stat_v0 {
++ uint32_t usecnt;
++ uint32_t tasks;
++ /* more to come */
++};
+
-+#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
++#ifdef __KERNEL__
++extern int vc_ctx_stat(struct vx_info *, void __user *);
+
-+struct sysinfo;
++#endif /* __KERNEL__ */
+
-+void vx_vsi_meminfo(struct sysinfo *);
-+void vx_vsi_swapinfo(struct sysinfo *);
++/* context commands */
+
-+#define NUM_LIMITS 24
++#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0)
++#define VCMD_ctx_create VC_CMD(VPROC, 1, 1)
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/limit_int.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/limit_int.h
---- linux-2.6.29.1/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/limit_int.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,198 @@
-+#ifndef _VX_LIMIT_INT_H
-+#define _VX_LIMIT_INT_H
++struct vcmd_ctx_create {
++ uint64_t flagword;
++};
+
-+#include "context.h"
++#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0)
++#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1)
++
++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 *);
+
-+#define VXD_RCRES_COND(r) VXD_CBIT(cres, r)
-+#define VXD_RLIMIT_COND(r) VXD_CBIT(limit, r)
++#endif /* __KERNEL__ */
+
-+extern const char *vlimit_name[NUM_LIMITS];
+
-+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;
++/* flag commands */
+
-+ if (dir > 0)
-+ __rlim_inc(&vxi->limit, res);
-+ else
-+ __rlim_dec(&vxi->limit, res);
-+}
++#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0)
++#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0)
+
-+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 vcmd_ctx_flags_v0 {
++ uint64_t flagword;
++ uint64_t mask;
++};
+
-+static inline
-+int __vx_cres_adjust_max(struct _vx_limit *limit, int res, rlim_t value)
-+{
-+ int cond = (value > __rlim_rmax(limit, res));
++#ifdef __KERNEL__
++extern int vc_get_cflags(struct vx_info *, void __user *);
++extern int vc_set_cflags(struct vx_info *, void __user *);
+
-+ if (cond)
-+ __rlim_rmax(limit, res) = value;
-+ return cond;
-+}
++#endif /* __KERNEL__ */
+
-+static inline
-+int __vx_cres_adjust_min(struct _vx_limit *limit, int res, rlim_t value)
-+{
-+ int cond = (value < __rlim_rmin(limit, res));
+
-+ if (cond)
-+ __rlim_rmin(limit, res) = value;
-+ return cond;
-+}
++/* context caps commands */
+
-+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 VCMD_get_ccaps VC_CMD(FLAGS, 3, 1)
++#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1)
+
++struct vcmd_ctx_caps_v1 {
++ uint64_t ccaps;
++ uint64_t cmask;
++};
+
-+/* return values:
-+ +1 ... no limit hit
-+ -1 ... over soft limit
-+ 0 ... over hard limit */
++#ifdef __KERNEL__
++extern int vc_get_ccaps(struct vx_info *, void __user *);
++extern int vc_set_ccaps(struct vx_info *, void __user *);
+
-+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;
++#endif /* __KERNEL__ */
+
-+ 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);
++/* bcaps commands */
+
-+ if (!__vx_cres_adjust_max(limit, res, value))
-+ __vx_cres_adjust_min(limit, res, value);
++#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0)
++#define VCMD_set_bcaps VC_CMD(FLAGS, 10, 0)
+
-+ if (num == 0)
-+ return 1;
++struct vcmd_bcaps {
++ uint64_t bcaps;
++ uint64_t bmask;
++};
+
-+ if (__rlim_soft(limit, res) == RLIM_INFINITY)
-+ return -1;
-+ if (value + num <= __rlim_soft(limit, res))
-+ return -1;
++#ifdef __KERNEL__
++extern int vc_get_bcaps(struct vx_info *, void __user *);
++extern int vc_set_bcaps(struct vx_info *, void __user *);
+
-+ if (__rlim_hard(limit, res) == RLIM_INFINITY)
-+ return 1;
-+ if (value + num <= __rlim_hard(limit, res))
-+ return 1;
++#endif /* __KERNEL__ */
+
-+ __rlim_hit(limit, res);
-+ return 0;
-+}
+
++/* umask commands */
+
-+static const int VLA_RSS[] = { RLIMIT_RSS, VLIMIT_ANON, VLIMIT_MAPPED, 0 };
++#define VCMD_get_umask VC_CMD(FLAGS, 13, 0)
++#define VCMD_set_umask VC_CMD(FLAGS, 14, 0)
+
-+static inline
-+rlim_t __vx_cres_array_sum(struct _vx_limit *limit, const int *array)
-+{
-+ rlim_t value, sum = 0;
-+ int res;
++struct vcmd_umask {
++ uint64_t umask;
++ uint64_t mask;
++};
+
-+ while ((res = *array++)) {
-+ value = __rlim_get(limit, res);
-+ __vx_cres_fixup(limit, res, value);
-+ sum += value;
-+ }
-+ return sum;
-+}
++#ifdef __KERNEL__
++extern int vc_get_umask(struct vx_info *, void __user *);
++extern int vc_set_umask(struct vx_info *, void __user *);
+
-+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;
++#endif /* __KERNEL__ */
+
-+ 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);
++/* OOM badness */
+
-+ return value;
-+}
++#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0)
++#define VCMD_set_badness VC_CMD(MEMCTRL, 6, 0)
+
-+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;
++struct vcmd_badness_v0 {
++ int64_t bias;
++};
+
-+ if (num == 0)
-+ return 1;
-+ if (!vxi)
-+ return 1;
++#ifdef __KERNEL__
++extern int vc_get_badness(struct vx_info *, void __user *);
++extern int vc_set_badness(struct vx_info *, void __user *);
+
-+ limit = &vxi->limit;
-+ res = *array;
-+ value = __vx_cres_array_sum(limit, array + 1);
++#endif /* __KERNEL__ */
++#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
+
-+ __rlim_set(limit, res, value);
-+ __vx_cres_fixup(limit, res, value);
+
-+ return __vx_cres_avail(vxi, res, num, _file, _line);
-+}
++#ifdef __KERNEL__
+
++struct timespec;
+
-+static inline void vx_limit_fixup(struct _vx_limit *limit, int id)
-+{
-+ rlim_t value;
-+ int res;
++void vx_vsi_uptime(struct timespec *, struct timespec *);
+
-+ /* complex resources first */
-+ if ((id < 0) || (id == RLIMIT_RSS))
-+ __vx_cres_array_fixup(limit, VLA_RSS);
+
-+ for (res = 0; res < NUM_LIMITS; res++) {
-+ if ((id > 0) && (res != id))
-+ continue;
++struct vx_info;
+
-+ value = __rlim_get(limit, res);
-+ __vx_cres_fixup(limit, res, value);
++void vx_update_load(struct vx_info *);
+
-+ /* not supposed to happen, maybe warn? */
-+ if (__rlim_rmax(limit, res) > __rlim_hard(limit, res))
-+ __rlim_rmax(limit, res) = __rlim_hard(limit, res);
-+ }
-+}
+
++int vx_do_syslog(int, char __user *, int);
+
+#endif /* __KERNEL__ */
-+#endif /* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/monitor.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/monitor.h
---- linux-2.6.29.1/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/monitor.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,96 @@
-+#ifndef _VX_MONITOR_H
-+#define _VX_MONITOR_H
++#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
+
-+#include <linux/types.h>
+
-+enum {
-+ VXM_UNUSED = 0,
++/* virtual host info name commands */
+
-+ VXM_SYNC = 0x10,
++#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0)
++#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0)
+
-+ VXM_UPDATE = 0x20,
-+ VXM_UPDATE_1,
-+ VXM_UPDATE_2,
++struct vcmd_vhi_name_v0 {
++ uint32_t field;
++ char name[65];
++};
+
-+ VXM_RQINFO_1 = 0x24,
-+ VXM_RQINFO_2,
+
-+ VXM_ACTIVATE = 0x40,
-+ VXM_DEACTIVATE,
-+ VXM_IDLE,
++enum vhi_name_field {
++ VHIN_CONTEXT = 0,
++ VHIN_SYSNAME,
++ VHIN_NODENAME,
++ VHIN_RELEASE,
++ VHIN_VERSION,
++ VHIN_MACHINE,
++ VHIN_DOMAINNAME,
++};
+
-+ VXM_HOLD = 0x44,
-+ VXM_UNHOLD,
+
-+ VXM_MIGRATE = 0x48,
-+ VXM_RESCHED,
++#ifdef __KERNEL__
+
-+ /* all other bits are flags */
-+ VXM_SCHED = 0x80,
-+};
++#include <linux/compiler.h>
+
-+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 _vxm_rqinfo_1 {
-+ uint16_t running;
-+ uint16_t onhold;
-+ uint16_t iowait;
-+ uint16_t uintr;
-+ uint32_t idle_tokens;
-+};
-+
-+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;
-+};
-+
-+struct _vxm_task {
-+ uint16_t pid;
-+ uint16_t state;
-+};
-+
-+struct _vxm_event {
-+ uint32_t jif;
-+ union {
-+ uint32_t seq;
-+ uint32_t sec;
-+ };
-+ union {
-+ uint32_t tokens;
-+ uint32_t nsec;
-+ struct _vxm_task tsk;
-+ };
-+};
-+
-+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;
-+ };
-+};
-+
-+
-+#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/network_cmd.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/network_cmd.h
---- linux-2.6.29.1/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/network_cmd.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,150 @@
-+#ifndef _VX_NETWORK_CMD_H
-+#define _VX_NETWORK_CMD_H
-+
-+
-+/* vinfo commands */
-+
-+#define VCMD_task_nid VC_CMD(VINFO, 2, 0)
-+
-+#ifdef __KERNEL__
-+extern int vc_task_nid(uint32_t);
++extern int vc_set_vhi_name(struct vx_info *, void __user *);
++extern int vc_get_vhi_name(struct vx_info *, void __user *);
+
+#endif /* __KERNEL__ */
+
-+#define VCMD_nx_info VC_CMD(VINFO, 6, 0)
++#define VCMD_virt_stat VC_CMD(VSTAT, 3, 0)
+
-+struct vcmd_nx_info_v0 {
-+ uint32_t nid;
-+ /* more to come */
++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];
+};
+
+#ifdef __KERNEL__
-+extern int vc_nx_info(struct nx_info *, void __user *);
++extern int vc_virt_stat(struct vx_info *, void __user *);
+
+#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
+
-+#include <linux/in.h>
-+#include <linux/in6.h>
++#include <linux/jiffies.h>
++#include <linux/spinlock.h>
++#include <linux/wait.h>
++#include <linux/time.h>
++#include <asm/atomic.h>
+
-+#define VCMD_net_create_v0 VC_CMD(VNET, 1, 0)
-+#define VCMD_net_create VC_CMD(VNET, 1, 1)
+
-+struct vcmd_net_create {
-+ uint64_t flagword;
++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;
+};
+
-+#define VCMD_net_migrate VC_CMD(NETMIG, 1, 0)
++struct _vx_syslog {
++ wait_queue_head_t log_wait;
++ spinlock_t logbuf_lock; /* lock for the log buffer */
+
-+#define VCMD_net_add VC_CMD(NETALT, 1, 0)
-+#define VCMD_net_remove VC_CMD(NETALT, 2, 0)
++ 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 */
+
-+struct vcmd_net_addr_v0 {
-+ uint16_t type;
-+ uint16_t count;
-+ struct in_addr ip[4];
-+ struct in_addr mask[4];
++ char log_buf[1024];
+};
+
-+#define VCMD_net_add_ipv4 VC_CMD(NETALT, 1, 1)
-+#define VCMD_net_remove_ipv4 VC_CMD(NETALT, 2, 1)
+
-+struct vcmd_net_addr_ipv4_v1 {
-+ uint16_t type;
-+ uint16_t flags;
-+ struct in_addr ip;
-+ struct in_addr mask;
-+};
++/* context sub struct */
+
-+#define VCMD_net_add_ipv6 VC_CMD(NETALT, 3, 1)
-+#define VCMD_net_remove_ipv6 VC_CMD(NETALT, 4, 1)
++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 */
+
-+struct vcmd_net_addr_ipv6_v1 {
-+ uint16_t type;
-+ uint16_t flags;
-+ uint32_t prefix;
-+ struct in6_addr ip;
-+ struct in6_addr mask;
-+};
++ atomic_t nr_onhold; /* processes on hold */
++ uint32_t onhold_last; /* jiffies when put on hold */
+
-+#define VCMD_add_match_ipv4 VC_CMD(NETALT, 5, 0)
-+#define VCMD_get_match_ipv4 VC_CMD(NETALT, 6, 0)
++ 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 */
+
-+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;
-+};
++ 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 */
+
-+#define VCMD_add_match_ipv6 VC_CMD(NETALT, 7, 0)
-+#define VCMD_get_match_ipv6 VC_CMD(NETALT, 8, 0)
++ atomic_t total_forks; /* number of forks so far */
+
-+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 _vx_syslog syslog;
+};
+
++struct _vx_cvirt_pc {
++ struct _vx_usage_stat cpustat;
++};
+
-+#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 *);
++#ifdef CONFIG_VSERVER_DEBUG
+
-+extern int vc_net_add_ipv4(struct nx_info *, void __user *);
-+extern int vc_net_remove_ipv4(struct nx_info *, void __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));
++}
+
-+extern int vc_net_add_ipv6(struct nx_info *, void __user *);
-+extern int vc_net_remove_ipv6(struct nx_info *, void __user *);
++#endif
+
-+extern int vc_add_match_ipv4(struct nx_info *, void __user *);
-+extern int vc_get_match_ipv4(struct nx_info *, void __user *);
++#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
+
-+extern int vc_add_match_ipv6(struct nx_info *, void __user *);
-+extern int vc_get_match_ipv6(struct nx_info *, void __user *);
+
-+#endif /* __KERNEL__ */
++#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))
+
++#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]"
+
-+/* flag commands */
+
-+#define VCMD_get_nflags VC_CMD(FLAGS, 5, 0)
-+#define VCMD_set_nflags VC_CMD(FLAGS, 6, 0)
++#define vxd_path(p) \
++ ({ static char _buffer[PATH_MAX]; \
++ d_path(p, _buffer, sizeof(_buffer)); })
+
-+struct vcmd_net_flags_v0 {
-+ uint64_t flagword;
-+ uint64_t mask;
-+};
++#define vxd_cond_path(n) \
++ ((n) ? vxd_path(&(n)->path) : "<null>" )
+
-+#ifdef __KERNEL__
-+extern int vc_get_nflags(struct nx_info *, void __user *);
-+extern int vc_set_nflags(struct nx_info *, void __user *);
+
-+#endif /* __KERNEL__ */
++#ifdef CONFIG_VSERVER_DEBUG
+
++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;
+
-+/* network caps commands */
+
-+#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0)
-+#define VCMD_set_ncaps VC_CMD(FLAGS, 8, 0)
++#define VX_LOGLEVEL "vxD: "
++#define VX_PROC_FMT "%p: "
++#define VX_PROCESS current
+
-+struct vcmd_net_caps_v0 {
-+ uint64_t ncaps;
-+ uint64_t cmask;
-+};
-+
-+#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.29.1/include/linux/vserver/network.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/network.h
---- linux-2.6.29.1/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/network.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,146 @@
-+#ifndef _VX_NETWORK_H
-+#define _VX_NETWORK_H
++#define vxdprintk(c, f, x...) \
++ do { \
++ if (c) \
++ printk(VX_LOGLEVEL VX_PROC_FMT f "\n", \
++ VX_PROCESS , ##x); \
++ } while (0)
+
-+#include <linux/types.h>
++#define vxlprintk(c, f, x...) \
++ do { \
++ if (c) \
++ printk(VX_LOGLEVEL f " @%s:%d\n", x); \
++ } while (0)
+
++#define vxfprintk(c, f, x...) \
++ do { \
++ if (c) \
++ printk(VX_LOGLEVEL f " %s@%s:%d\n", x); \
++ } while (0)
+
-+#define MAX_N_CONTEXT 65535 /* Arbitrary limit */
+
++struct vx_info;
+
-+/* network flags */
++void dump_vx_info(struct vx_info *, int);
++void dump_vx_info_inactive(int);
+
-+#define NXF_INFO_PRIVATE 0x00000008
++#else /* CONFIG_VSERVER_DEBUG */
+
-+#define NXF_SINGLE_IP 0x00000100
-+#define NXF_LBACK_REMAP 0x00000200
-+#define NXF_LBACK_ALLOW 0x00000400
++#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 NXF_HIDE_NETIF 0x02000000
-+#define NXF_HIDE_LBACK 0x04000000
++#define vxdprintk(x...) do { } while (0)
++#define vxlprintk(x...) do { } while (0)
++#define vxfprintk(x...) do { } while (0)
+
-+#define NXF_STATE_SETUP (1ULL << 32)
-+#define NXF_STATE_ADMIN (1ULL << 34)
++#endif /* CONFIG_VSERVER_DEBUG */
+
-+#define NXF_SC_HELPER (1ULL << 36)
-+#define NXF_PERSISTENT (1ULL << 38)
+
-+#define NXF_ONE_TIME (0x0005ULL << 32)
++#ifdef CONFIG_VSERVER_WARN
+
++#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 NXF_INIT_SET (__nxf_init_set())
++#define vxwprintk(c, f, x...) \
++ do { \
++ if (c) \
++ printk(VX_WARNLEVEL f "\n", ##x); \
++ } while (0)
+
-+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;
-+}
++#else /* CONFIG_VSERVER_WARN */
+
++#define vxwprintk(x...) do { } while (0)
+
-+/* network caps */
++#endif /* CONFIG_VSERVER_WARN */
+
-+#define NXC_TUN_CREATE 0x00000001
++#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 NXC_RAW_ICMP 0x00000100
++#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
+
+
-+/* address types */
++#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
+
-+#define NXA_TYPE_IPV4 0x0001
-+#define NXA_TYPE_IPV6 0x0002
+
-+#define NXA_TYPE_NONE 0x0000
-+#define NXA_TYPE_ANY 0x00FF
++/* debug commands */
+
-+#define NXA_TYPE_ADDR 0x0010
-+#define NXA_TYPE_MASK 0x0020
-+#define NXA_TYPE_RANGE 0x0040
++#define VCMD_dump_history VC_CMD(DEBUG, 1, 0)
+
-+#define NXA_MASK_ALL (NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE)
++#define VCMD_read_history VC_CMD(DEBUG, 5, 0)
++#define VCMD_read_monitor VC_CMD(DEBUG, 6, 0)
+
-+#define NXA_MOD_BCAST 0x0100
-+#define NXA_MOD_LBACK 0x0200
++struct vcmd_read_history_v0 {
++ uint32_t index;
++ uint32_t count;
++ char __user *data;
++};
+
-+#define NXA_LOOPBACK 0x1000
++struct vcmd_read_monitor_v0 {
++ uint32_t index;
++ uint32_t count;
++ char __user *data;
++};
+
-+#define NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK)
-+#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
+
+#ifdef __KERNEL__
+
-+#include <linux/list.h>
-+#include <linux/spinlock.h>
-+#include <linux/rcupdate.h>
-+#include <linux/in.h>
-+#include <linux/in6.h>
-+#include <asm/atomic.h>
++#ifdef CONFIG_COMPAT
+
-+struct nx_addr_v4 {
-+ struct nx_addr_v4 *next;
-+ struct in_addr ip[2];
-+ struct in_addr mask;
-+ uint16_t type;
-+ uint16_t flags;
++#include <asm/compat.h>
++
++struct vcmd_read_history_v0_x32 {
++ uint32_t index;
++ uint32_t count;
++ compat_uptr_t data_ptr;
+};
+
-+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 vcmd_read_monitor_v0_x32 {
++ uint32_t index;
++ uint32_t count;
++ compat_uptr_t data_ptr;
+};
+
-+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 */
++#endif /* CONFIG_COMPAT */
+
-+ uint64_t nx_flags; /* network flag word */
-+ uint64_t nx_ncaps; /* network capabilities */
++extern int vc_dump_history(uint32_t);
+
-+ 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 */
-+};
++extern int vc_read_history(uint32_t, void __user *);
++extern int vc_read_monitor(uint32_t, void __user *);
+
++#ifdef CONFIG_COMPAT
+
-+/* status flags */
++extern int vc_read_history_x32(uint32_t, void __user *);
++extern int vc_read_monitor_x32(uint32_t, void __user *);
+
-+#define NXS_HASHED 0x0001
-+#define NXS_SHUTDOWN 0x0100
-+#define NXS_RELEASED 0x8000
++#endif /* CONFIG_COMPAT */
+
-+extern struct nx_info *lookup_nx_info(int);
++#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
+
-+extern int get_nid_list(int, unsigned int *, int);
-+extern int nid_is_hashed(nid_t);
+
-+extern int nx_migrate_task(struct task_struct *, struct nx_info *);
++#define DATTR_CREATE 0x00000001
++#define DATTR_OPEN 0x00000002
+
-+extern long vs_net_change(struct nx_info *, unsigned int);
++#define DATTR_REMAP 0x00000010
+
-+struct sock;
++#define DATTR_MASK 0x00000013
+
+
-+#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
++#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
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/percpu.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/percpu.h
---- linux-2.6.29.1/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/percpu.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,14 @@
-+#ifndef _VX_PERCPU_H
-+#define _VX_PERCPU_H
+
-+#include "cvirt_def.h"
-+#include "sched_def.h"
++/* device vserver commands */
+
-+struct _vx_percpu {
-+ struct _vx_cvirt_pc cvirt;
-+ struct _vx_sched_pc sched;
++#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;
+};
+
-+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
-+#endif /* _VX_PERCPU_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/pid.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/pid.h
---- linux-2.6.29.1/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/pid.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,51 @@
-+#ifndef _VSERVER_PID_H
-+#define _VSERVER_PID_H
++#ifdef __KERNEL__
+
-+/* pid faking stuff */
++#ifdef CONFIG_COMPAT
+
-+#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)
++#include <asm/compat.h>
+
-+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;
-+}
++struct vcmd_set_mapping_v0_x32 {
++ compat_uptr_t device_ptr;
++ compat_uptr_t target_ptr;
++ uint32_t flags;
++};
+
-+#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)
++#endif /* CONFIG_COMPAT */
+
-+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;
-+}
++#include <linux/compiler.h>
+
-+#endif
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/sched_cmd.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/sched_cmd.h
---- linux-2.6.29.1/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/sched_cmd.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,108 @@
-+#ifndef _VX_SCHED_CMD_H
-+#define _VX_SCHED_CMD_H
++extern int vc_set_mapping(struct vx_info *, void __user *);
++extern int vc_unset_mapping(struct vx_info *, void __user *);
+
++#ifdef CONFIG_COMPAT
+
-+/* sched vserver commands */
++extern int vc_set_mapping_x32(struct vx_info *, void __user *);
++extern int vc_unset_mapping_x32(struct vx_info *, void __user *);
+
-+#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)
++#endif /* CONFIG_COMPAT */
+
-+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;
-+};
++#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
+
-+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 <linux/types.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;
++struct vx_dmap_target {
++ dev_t target;
++ uint32_t flags;
+};
+
-+#define VCMD_set_sched VC_CMD(SCHED, 1, 5)
-+#define VCMD_get_sched VC_CMD(SCHED, 2, 5)
-+
-+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;
++struct _vx_device {
++#ifdef CONFIG_VSERVER_DEVICE
++ struct vx_dmap_target targets[2];
++#endif
+};
+
-+#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
++#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 VXSM_IDLE_TIME 0x0200
-+#define VXSM_FORCE 0x0400
++#include "switch.h"
+
-+#define VXSM_V3_MASK 0x0173
-+#define VXSM_SET_MASK 0x01FF
+
-+#define VXSM_CPU_ID 0x1000
-+#define VXSM_BUCKET_ID 0x2000
++#ifdef __KERNEL__
+
-+#define VXSM_MSEC 0x4000
++/* keep in sync with CDLIM_INFINITY */
+
-+#define SCHED_KEEP (-2) /* only for v2 */
++#define DLIM_INFINITY (~0ULL)
+
-+#ifdef __KERNEL__
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
+
-+#include <linux/compiler.h>
++struct super_block;
+
-+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 *);
++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 */
+
-+#endif /* __KERNEL__ */
++ struct super_block *dl_sb; /* associated superblock */
+
-+#define VCMD_sched_info VC_CMD(SCHED, 3, 0)
++ spinlock_t dl_lock; /* protect the values */
+
-+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;
-+};
++ 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 */
+
-+#ifdef __KERNEL__
++ unsigned int dl_nrlmult; /* non root limit mult */
++};
+
-+extern int vc_sched_info(struct vx_info *, void __user *);
++struct rcu_head;
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/sched_def.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/sched_def.h
---- linux-2.6.29.1/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/sched_def.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,68 @@
-+#ifndef _VX_SCHED_DEF_H
-+#define _VX_SCHED_DEF_H
++extern void rcu_free_dl_info(struct rcu_head *);
++extern void unhash_dl_info(struct dl_info *);
+
-+#include <linux/spinlock.h>
-+#include <linux/jiffies.h>
-+#include <linux/cpumask.h>
-+#include <asm/atomic.h>
-+#include <asm/param.h>
++extern struct dl_info *locate_dl_info(struct super_block *, tag_t);
+
+
-+/* context sub struct */
++struct kstatfs;
+
-+struct _vx_sched {
-+ spinlock_t tokens_lock; /* lock for token bucket */
++extern void vx_vsi_statfs(struct super_block *, struct kstatfs *);
+
-+ 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 */
++typedef uint64_t dlsize_t;
+
-+ int prio_bias; /* bias offset for priority */
++#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
+
-+ unsigned update_mask; /* which features should be updated */
-+ cpumask_t update; /* CPUs which should update */
-+};
+
-+struct _vx_sched_pc {
-+ int tokens; /* number of CPU tokens */
-+ int flags; /* bucket flags */
++/* dlimit vserver commands */
+
-+ 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 */
++#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0)
++#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0)
+
-+ int prio_bias; /* bias offset for priority */
-+ int vavavoom; /* last calculated vavavoom */
++#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0)
++#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0)
+
-+ 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 */
++struct vcmd_ctx_dlimit_base_v0 {
++ const char __user *name;
++ uint32_t flags;
++};
+
-+ uint64_t user_ticks; /* token tick events */
-+ uint64_t sys_ticks; /* token tick events */
-+ uint64_t hold_ticks; /* token ticks paused */
++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 CDLIM_UNSET ((uint32_t)0UL)
++#define CDLIM_INFINITY ((uint32_t)~0UL)
++#define CDLIM_KEEP ((uint32_t)~1UL)
+
-+#define VXSF_ONHOLD 0x0001
-+#define VXSF_IDLE_TIME 0x0100
++#define DLIME_UNIT 0
++#define DLIME_KILO 1
++#define DLIME_MEGA 2
++#define DLIME_GIGA 3
+
-+#ifdef CONFIG_VSERVER_DEBUG
++#define DLIMF_SHIFT 0x10
+
-+static inline void __dump_vx_sched(struct _vx_sched *sched)
++#define DLIMS_USED 0
++#define DLIMS_TOTAL 2
++
++static inline
++uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift)
+{
-+ 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);
++ int exp = (flags & DLIMF_SHIFT) ?
++ (flags >> shift) & DLIME_GIGA : DLIME_KILO;
++ return ((uint64_t)val) << (10 * exp);
+}
+
-+#endif
-+
-+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/sched.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/sched.h
---- linux-2.6.29.1/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/sched.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,26 @@
-+#ifndef _VX_SCHED_H
-+#define _VX_SCHED_H
++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;
++}
+
+#ifdef __KERNEL__
+
-+struct timespec;
++#ifdef CONFIG_COMPAT
+
-+void vx_vsi_uptime(struct timespec *, struct timespec *);
++#include <asm/compat.h>
+
++struct vcmd_ctx_dlimit_base_v0_x32 {
++ compat_uptr_t name_ptr;
++ uint32_t flags;
++};
+
-+struct vx_info;
++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;
++};
+
-+void vx_update_load(struct vx_info *);
++#endif /* CONFIG_COMPAT */
+
++#include <linux/compiler.h>
+
-+int vx_tokens_recalc(struct _vx_sched_pc *,
-+ unsigned long *, unsigned long *, int [2]);
++extern int vc_add_dlimit(uint32_t, void __user *);
++extern int vc_rem_dlimit(uint32_t, void __user *);
+
-+void vx_update_sched_param(struct _vx_sched *sched,
-+ struct _vx_sched_pc *sched_pc);
++extern int vc_set_dlimit(uint32_t, void __user *);
++extern int vc_get_dlimit(uint32_t, void __user *);
+
-+#endif /* __KERNEL__ */
-+#else /* _VX_SCHED_H */
-+#warning duplicate inclusion
-+#endif /* _VX_SCHED_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/signal_cmd.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/signal_cmd.h
---- linux-2.6.29.1/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/signal_cmd.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,43 @@
-+#ifndef _VX_SIGNAL_CMD_H
-+#define _VX_SIGNAL_CMD_H
++#ifdef CONFIG_COMPAT
+
++extern int vc_add_dlimit_x32(uint32_t, void __user *);
++extern int vc_rem_dlimit_x32(uint32_t, void __user *);
+
-+/* signalling vserver commands */
++extern int vc_set_dlimit_x32(uint32_t, void __user *);
++extern int vc_get_dlimit_x32(uint32_t, void __user *);
+
-+#define VCMD_ctx_kill VC_CMD(PROCTRL, 1, 0)
-+#define VCMD_wait_exit VC_CMD(EVENT, 99, 0)
++#endif /* CONFIG_COMPAT */
+
-+struct vcmd_ctx_kill_v0 {
-+ int32_t pid;
-+ int32_t sig;
-+};
++#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
+
-+struct vcmd_wait_exit_v0 {
-+ int32_t reboot_cmd;
-+ int32_t exit_code;
-+};
+
-+#ifdef __KERNEL__
++extern atomic_t vx_global_ctotal;
++extern atomic_t vx_global_cactive;
+
-+extern int vc_ctx_kill(struct vx_info *, void __user *);
-+extern int vc_wait_exit(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;
+
-+/* process alteration commands */
+
-+#define VCMD_get_pflags VC_CMD(PROCALT, 5, 0)
-+#define VCMD_set_pflags VC_CMD(PROCALT, 6, 0)
++#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
+
-+struct vcmd_pflags_v0 {
-+ uint32_t flagword;
-+ uint32_t mask;
-+};
+
-+#ifdef __KERNEL__
++enum {
++ VXH_UNUSED = 0,
++ VXH_THROW_OOPS = 1,
+
-+extern int vc_get_pflags(uint32_t pid, void __user *);
-+extern int vc_set_pflags(uint32_t pid, void __user *);
++ 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,
++};
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/signal.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/signal.h
---- linux-2.6.29.1/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/signal.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,14 @@
-+#ifndef _VX_SIGNAL_H
-+#define _VX_SIGNAL_H
++struct _vxhe_vxi {
++ struct vx_info *ptr;
++ unsigned xid;
++ unsigned usecnt;
++ unsigned tasks;
++};
+
++struct _vxhe_set_clr {
++ void *data;
++};
+
-+#ifdef __KERNEL__
++struct _vxhe_loc_lookup {
++ unsigned arg;
++};
+
-+struct vx_info;
++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 vx_info_kill(struct vx_info *, int, int);
++#ifdef CONFIG_VSERVER_HISTORY
+
-+#endif /* __KERNEL__ */
-+#else /* _VX_SIGNAL_H */
-+#warning duplicate inclusion
-+#endif /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/space_cmd.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/space_cmd.h
---- linux-2.6.29.1/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/space_cmd.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,38 @@
-+#ifndef _VX_SPACE_CMD_H
-+#define _VX_SPACE_CMD_H
++extern unsigned volatile int vxh_active;
+
++struct _vx_hist_entry *vxh_advance(void *loc);
+
-+#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 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 __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;
++ }
++}
+
-+#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 __HERE__ current_text_addr()
+
++#define __VXH_BODY(__type, __data, __here) \
++ struct _vx_hist_entry *entry; \
++ \
++ preempt_disable(); \
++ entry = vxh_advance(__here); \
++ __data; \
++ entry->type = __type; \
++ preempt_enable();
+
-+struct vcmd_space_mask_v1 {
-+ uint64_t mask;
-+};
+
-+struct vcmd_space_mask_v2 {
-+ uint64_t mask;
-+ uint32_t index;
-+};
++ /* pass vxi only */
+
++#define __VXH_SMPL \
++ __vxh_copy_vxi(entry, vxi)
+
-+#ifdef __KERNEL__
++static inline
++void __vxh_smpl(struct vx_info *vxi, int __type, void *__here)
++{
++ __VXH_BODY(__type, __VXH_SMPL, __here)
++}
+
-+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);
++ /* pass vxi and data (void *) */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_SPACE_CMD_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/space.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/space.h
---- linux-2.6.29.1/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/space.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,12 @@
-+#ifndef _VX_SPACE_H
-+#define _VX_SPACE_H
++#define __VXH_DATA \
++ __vxh_copy_vxi(entry, vxi); \
++ entry->sc.data = data
+
-+#include <linux/types.h>
++static inline
++void __vxh_data(struct vx_info *vxi, void *data,
++ int __type, void *__here)
++{
++ __VXH_BODY(__type, __VXH_DATA, __here)
++}
+
-+struct vx_info;
++ /* pass vxi and arg (long) */
+
-+int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index);
++#define __VXH_LONG \
++ __vxh_copy_vxi(entry, vxi); \
++ entry->ll.arg = arg
+
-+#else /* _VX_SPACE_H */
-+#warning duplicate inclusion
-+#endif /* _VX_SPACE_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/switch.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/switch.h
---- linux-2.6.29.1/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/switch.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,98 @@
-+#ifndef _VX_SWITCH_H
-+#define _VX_SWITCH_H
++static inline
++void __vxh_long(struct vx_info *vxi, long arg,
++ int __type, void *__here)
++{
++ __VXH_BODY(__type, __VXH_LONG, __here)
++}
+
-+#include <linux/types.h>
+
++static inline
++void __vxh_throw_oops(void *__here)
++{
++ __VXH_BODY(VXH_THROW_OOPS, {}, __here);
++ /* prevent further acquisition */
++ vxh_active = 0;
++}
+
-+#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 vxh_throw_oops() __vxh_throw_oops(__HERE__);
+
-+/*
++#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);
+
-+ Syscall Matrix V2.8
++#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);
+
-+ |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|
-+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++#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 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 VC_CAT_VERSION 0
++#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__);
+
-+#define VC_CAT_VSETUP 1
-+#define VC_CAT_VHOST 2
++#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__);
+
-+#define VC_CAT_DEVICE 6
++extern void vxh_dump_history(void);
+
-+#define VC_CAT_VPROC 9
-+#define VC_CAT_PROCALT 10
-+#define VC_CAT_PROCMIG 11
-+#define VC_CAT_PROCTRL 12
+
-+#define VC_CAT_SCHED 14
-+#define VC_CAT_MEMCTRL 20
++#else /* CONFIG_VSERVER_HISTORY */
+
-+#define VC_CAT_VNET 25
-+#define VC_CAT_NETALT 26
-+#define VC_CAT_NETMIG 27
-+#define VC_CAT_NETCTRL 28
++#define __HERE__ 0
+
-+#define VC_CAT_TAGMIG 35
-+#define VC_CAT_DLIMIT 36
-+#define VC_CAT_INODE 38
++#define vxh_throw_oops() do { } while (0)
+
-+#define VC_CAT_VSTAT 40
-+#define VC_CAT_VINFO 46
-+#define VC_CAT_EVENT 48
++#define __vxh_get_vx_info(v, h) do { } while (0)
++#define __vxh_put_vx_info(v, h) do { } while (0)
+
-+#define VC_CAT_FLAGS 52
-+#define VC_CAT_VSPACE 54
-+#define VC_CAT_DEBUG 56
-+#define VC_CAT_RLIMIT 60
++#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 VC_CAT_SYSTEST 61
-+#define VC_CAT_COMPAT 63
++#define __vxh_claim_vx_info(v, d, h) do { } while (0)
++#define __vxh_release_vx_info(v, d, h) do { } while (0)
+
-+/* query version */
++#define vxh_alloc_vx_info(v) do { } while (0)
++#define vxh_dealloc_vx_info(v) do { } while (0)
+
-+#define VCMD_get_version VC_CMD(VERSION, 0, 0)
-+#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
++#define vxh_hash_vx_info(v) do { } while (0)
++#define vxh_unhash_vx_info(v) do { } while (0)
+
++#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)
+
-+#ifdef __KERNEL__
++#define vxh_dump_history() do { } while (0)
+
-+#include <linux/errno.h>
+
-+#endif /* __KERNEL__ */
++#endif /* CONFIG_VSERVER_HISTORY */
+
-+#endif /* _VX_SWITCH_H */
++#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
+
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/tag_cmd.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/tag_cmd.h
---- linux-2.6.29.1/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/tag_cmd.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,22 @@
-+#ifndef _VX_TAG_CMD_H
-+#define _VX_TAG_CMD_H
+
++#define IATTR_TAG 0x01000000
+
-+/* vinfo commands */
++#define IATTR_ADMIN 0x00000001
++#define IATTR_WATCH 0x00000002
++#define IATTR_HIDE 0x00000004
++#define IATTR_FLAGS 0x00000007
+
-+#define VCMD_task_tag VC_CMD(VINFO, 3, 0)
++#define IATTR_BARRIER 0x00010000
++#define IATTR_IXUNLINK 0x00020000
++#define IATTR_IMMUTABLE 0x00040000
++#define IATTR_COW 0x00080000
+
+#ifdef __KERNEL__
-+extern int vc_task_tag(uint32_t);
-+
-+#endif /* __KERNEL__ */
+
-+/* context commands */
+
-+#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0)
++#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
+
-+#ifdef __KERNEL__
-+extern int vc_tag_migrate(uint32_t);
++#define vx_hide_check(c, m) (((m) & IATTR_HIDE) ? vx_check(c, m) : 1)
+
+#endif /* __KERNEL__ */
-+#endif /* _VX_TAG_CMD_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vserver/tag.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/tag.h
---- linux-2.6.29.1/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vserver/tag.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,143 @@
-+#ifndef _DX_TAG_H
-+#define _DX_TAG_H
+
-+#include <linux/types.h>
++/* inode ioctls */
+
++#define FIOC_GETXFLG _IOR('x', 5, long)
++#define FIOC_SETXFLG _IOW('x', 6, long)
+
-+#define DX_TAG(in) (IS_TAGGED(in))
++#else /* _VX_INODE_H */
++#warning duplicate inclusion
++#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
+
+
-+#ifdef CONFIG_TAG_NFSD
-+#define DX_TAG_NFSD 1
-+#else
-+#define DX_TAG_NFSD 0
-+#endif
++/* inode vserver commands */
+
++#define VCMD_get_iattr VC_CMD(INODE, 1, 1)
++#define VCMD_set_iattr VC_CMD(INODE, 2, 1)
+
-+#ifdef CONFIG_TAGGING_NONE
++#define VCMD_fget_iattr VC_CMD(INODE, 3, 0)
++#define VCMD_fset_iattr VC_CMD(INODE, 4, 0)
+
-+#define MAX_UID 0xFFFFFFFF
-+#define MAX_GID 0xFFFFFFFF
++struct vcmd_ctx_iattr_v1 {
++ const char __user *name;
++ uint32_t tag;
++ uint32_t flags;
++ uint32_t mask;
++};
+
-+#define INOTAG_TAG(cond, uid, gid, tag) (0)
++struct vcmd_ctx_fiattr_v0 {
++ uint32_t tag;
++ uint32_t flags;
++ uint32_t mask;
++};
+
-+#define TAGINO_UID(cond, uid, tag) (uid)
-+#define TAGINO_GID(cond, gid, tag) (gid)
+
-+#endif
++#ifdef __KERNEL__
+
+
-+#ifdef CONFIG_TAGGING_GID16
++#ifdef CONFIG_COMPAT
+
-+#define MAX_UID 0xFFFFFFFF
-+#define MAX_GID 0x0000FFFF
++#include <asm/compat.h>
+
-+#define INOTAG_TAG(cond, uid, gid, tag) \
-+ ((cond) ? (((gid) >> 16) & 0xFFFF) : 0)
++struct vcmd_ctx_iattr_v1_x32 {
++ compat_uptr_t name_ptr;
++ uint32_t tag;
++ uint32_t flags;
++ uint32_t mask;
++};
+
-+#define TAGINO_UID(cond, uid, tag) (uid)
-+#define TAGINO_GID(cond, gid, tag) \
-+ ((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid))
++#endif /* CONFIG_COMPAT */
+
-+#endif
++#include <linux/compiler.h>
+
++extern int vc_get_iattr(void __user *);
++extern int vc_set_iattr(void __user *);
+
-+#ifdef CONFIG_TAGGING_ID24
++extern int vc_fget_iattr(uint32_t, void __user *);
++extern int vc_fset_iattr(uint32_t, void __user *);
+
-+#define MAX_UID 0x00FFFFFF
-+#define MAX_GID 0x00FFFFFF
++#ifdef CONFIG_COMPAT
+
-+#define INOTAG_TAG(cond, uid, gid, tag) \
-+ ((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0)
++extern int vc_get_iattr_x32(void __user *);
++extern int vc_set_iattr_x32(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_COMPAT */
+
-+#endif
++#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 CONFIG_TAGGING_UID16
+
-+#define MAX_UID 0x0000FFFF
-+#define MAX_GID 0xFFFFFFFF
++#ifdef __KERNEL__
+
-+#define INOTAG_TAG(cond, uid, gid, tag) \
-+ ((cond) ? (((uid) >> 16) & 0xFFFF) : 0)
++#define VLIM_NOCHECK ((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS))
+
-+#define TAGINO_UID(cond, uid, tag) \
-+ ((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid))
-+#define TAGINO_GID(cond, gid, tag) (gid)
++/* keep in sync with CRLIM_INFINITY */
+
-+#endif
++#define VLIM_INFINITY (~0ULL)
+
++#include <asm/atomic.h>
++#include <asm/resource.h>
+
-+#ifdef CONFIG_TAGGING_INTERN
++#ifndef RLIM_INFINITY
++#warning RLIM_INFINITY is undefined
++#endif
+
-+#define MAX_UID 0xFFFFFFFF
-+#define MAX_GID 0xFFFFFFFF
++#define __rlim_val(l, r, v) ((l)->res[r].v)
+
-+#define INOTAG_TAG(cond, uid, gid, tag) \
-+ ((cond) ? (tag) : 0)
++#define __rlim_soft(l, r) __rlim_val(l, r, soft)
++#define __rlim_hard(l, r) __rlim_val(l, r, hard)
+
-+#define TAGINO_UID(cond, uid, tag) (uid)
-+#define TAGINO_GID(cond, gid, tag) (gid)
++#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
++#define __rlim_lhit(l, r) __rlim_val(l, r, lhit)
++#define __rlim_hit(l, r) atomic_inc(&__rlim_lhit(l, r))
+
++typedef atomic_long_t rlim_atomic_t;
++typedef unsigned long rlim_t;
+
-+#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 __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))
+
-+#ifndef CONFIG_TAGGING_INTERN
-+#define TAGINO_TAG(cond, tag) (0)
++
++#if (RLIM_INFINITY == VLIM_INFINITY)
++#define VX_VLIM(r) ((long long)(long)(r))
++#define VX_RLIM(v) ((rlim_t)(v))
+#else
-+#define TAGINO_TAG(cond, tag) ((cond) ? (tag) : 0)
++#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
+
-+#define INOTAG_UID(cond, uid, gid) \
-+ ((cond) ? ((uid) & MAX_UID) : (uid))
-+#define INOTAG_GID(cond, uid, gid) \
-+ ((cond) ? ((gid) & MAX_GID) : (gid))
++struct sysinfo;
+
++void vx_vsi_meminfo(struct sysinfo *);
++void vx_vsi_swapinfo(struct sysinfo *);
++long vx_vsi_cached(struct sysinfo *);
+
-+static inline uid_t dx_map_uid(uid_t uid)
-+{
-+ if ((uid > MAX_UID) && (uid != -1))
-+ uid = -2;
-+ return (uid & MAX_UID);
-+}
++#define NUM_LIMITS 24
+
-+static inline gid_t dx_map_gid(gid_t gid)
-+{
-+ if ((gid > MAX_GID) && (gid != -1))
-+ gid = -2;
-+ return (gid & MAX_GID);
-+}
++#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
+
-+struct peer_tag {
-+ int32_t xid;
-+ int32_t nid;
++
++/* rlimit vserver 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)
++
++struct vcmd_ctx_rlimit_v0 {
++ uint32_t id;
++ uint64_t minimum;
++ uint64_t softlimit;
++ uint64_t maximum;
+};
+
-+#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK))
++struct vcmd_ctx_rlimit_mask_v0 {
++ uint32_t minimum;
++ uint32_t softlimit;
++ uint32_t maximum;
++};
+
-+int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags,
-+ unsigned long *flags);
++#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0)
+
-+#ifdef CONFIG_PROPAGATE
++struct vcmd_rlimit_stat_v0 {
++ uint32_t id;
++ uint32_t hits;
++ uint64_t value;
++ uint64_t minimum;
++ uint64_t maximum;
++};
+
-+void __dx_propagate_tag(struct nameidata *nd, struct inode *inode);
++#define CRLIM_UNSET (0ULL)
++#define CRLIM_INFINITY (~0ULL)
++#define CRLIM_KEEP (~1ULL)
+
-+#define dx_propagate_tag(n, i) __dx_propagate_tag(n, i)
++#ifdef __KERNEL__
+
-+#else
-+#define dx_propagate_tag(n, i) do { } while (0)
-+#endif
++#ifdef CONFIG_IA32_EMULATION
+
-+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vs_inet6.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_inet6.h
---- linux-2.6.29.1/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_inet6.h 2009-03-25 00:46:50.000000000 +0100
-@@ -0,0 +1,246 @@
-+#ifndef _VS_INET6_H
-+#define _VS_INET6_H
++struct vcmd_ctx_rlimit_v0_x32 {
++ uint32_t id;
++ uint64_t minimum;
++ uint64_t softlimit;
++ uint64_t maximum;
++} __attribute__ ((packed));
+
-+#include "vserver/base.h"
-+#include "vserver/network.h"
-+#include "vserver/debug.h"
++#endif /* CONFIG_IA32_EMULATION */
+
-+#include <net/ipv6.h>
++#include <linux/compiler.h>
+
-+#define NXAV6(a) &(a)->ip, &(a)->mask, (a)->prefix, (a)->type
-+#define NXAV6_FMT "[%pI6/%pI6/%d:%04x]"
++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 *);
+
++extern int vc_rlimit_stat(struct vx_info *, void __user *);
+
-+#ifdef CONFIG_IPV6
++#ifdef CONFIG_IA32_EMULATION
+
-+static inline
-+int v6_addr_match(struct nx_addr_v6 *nxa,
-+ const struct in6_addr *addr, uint16_t mask)
-+{
-+ int ret = 0;
++extern int vc_get_rlimit_x32(struct vx_info *, void __user *);
++extern int vc_set_rlimit_x32(struct vx_info *, void __user *);
+
-+ 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;
-+}
++#endif /* CONFIG_IA32_EMULATION */
+
-+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;
++#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
+
-+ 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;
-+}
++#include <asm/atomic.h>
++#include <asm/resource.h>
+
-+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);
-+}
++#include "limit.h"
+
-+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;
+
-+ for (ptr = &nxi->v6; ptr; ptr = ptr->next)
-+ if (v6_nx_addr_match(ptr, nxa, mask))
-+ return 1;
-+ return 0;
-+}
++struct _vx_res_limit {
++ rlim_t soft; /* Context soft limit */
++ rlim_t hard; /* Context hard limit */
+
++ rlim_atomic_t rcur; /* Current value */
++ rlim_t rmin; /* Context minimum */
++ rlim_t rmax; /* Context maximum */
+
-+/*
-+ * 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);
++ atomic_t lhit; /* Limit hits */
++};
+
-+ 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;
-+}
++/* context sub struct */
+
-+/*
-+ * check if address is covered by socket
-+ *
-+ * sk: the socket to check against
-+ * addr: the address in question (must be != 0)
-+ */
++struct _vx_limit {
++ struct _vx_res_limit res[NUM_LIMITS];
++};
+
-+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);
++#ifdef CONFIG_VSERVER_DEBUG
+
-+ 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));
++static inline void __dump_vx_limit(struct _vx_limit *limit)
++{
++ int i;
+
-+ 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;
++ 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
+
-+/* inet related checks and helpers */
-+
-+
-+struct in_ifaddr;
-+struct net_device;
-+struct sock;
++#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
+
++#include "context.h"
+
-+#include <linux/netdevice.h>
-+#include <linux/inetdevice.h>
-+#include <net/inet_timewait_sock.h>
++#ifdef __KERNEL__
+
++#define VXD_RCRES_COND(r) VXD_CBIT(cres, r)
++#define VXD_RLIMIT_COND(r) VXD_CBIT(limit, r)
+
-+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 *);
++extern const char *vlimit_name[NUM_LIMITS];
+
++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;
+
++ if (dir > 0)
++ __rlim_inc(&vxi->limit, res);
++ else
++ __rlim_dec(&vxi->limit, res);
++}
+
-+static inline
-+int v6_ifa_in_nx_info(struct inet6_ifaddr *ifa, struct nx_info *nxi)
++static inline void __vx_add_cres(struct vx_info *vxi,
++ int res, int amount, void *_data, char *_file, int _line)
+{
-+ if (!nxi)
-+ return 1;
-+ if (!ifa)
-+ return 0;
-+ return v6_addr_in_nx_info(nxi, &ifa->addr, -1);
++ 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);
+}
+
+static inline
-+int nx_v6_ifa_visible(struct nx_info *nxi, struct inet6_ifaddr *ifa)
++int __vx_cres_adjust_max(struct _vx_limit *limit, int res, rlim_t value)
+{
-+ 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);
++ int cond = (value > __rlim_rmax(limit, res));
+
-+ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
-+ return 1;
-+ if (v6_ifa_in_nx_info(ifa, nxi))
-+ return 1;
-+ return 0;
++ if (cond)
++ __rlim_rmax(limit, res) = value;
++ return cond;
+}
+
-+
-+struct nx_v6_sock_addr {
-+ struct in6_addr saddr; /* Address used for validation */
-+ struct in6_addr baddr; /* Address used for socket bind */
-+};
-+
+static inline
-+int v6_map_sock_addr(struct inet_sock *inet, struct sockaddr_in6 *addr,
-+ struct nx_v6_sock_addr *nsa)
++int __vx_cres_adjust_min(struct _vx_limit *limit, int res, rlim_t value)
+{
-+ // 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;
++ int cond = (value < __rlim_rmin(limit, res));
+
-+ nsa->saddr = saddr;
-+ nsa->baddr = baddr;
-+ return 0;
++ if (cond)
++ __rlim_rmin(limit, res) = value;
++ return cond;
+}
+
+static inline
-+void v6_set_sock_addr(struct inet_sock *inet, struct nx_v6_sock_addr *nsa)
++void __vx_cres_fixup(struct _vx_limit *limit, int res, rlim_t value)
+{
-+ // struct sock *sk = &inet->sk;
-+ // struct in6_addr *saddr = inet6_rcv_saddr(sk);
-+
-+ // *saddr = nsa->baddr;
-+ // inet->saddr = nsa->baddr;
++ if (!__vx_cres_adjust_max(limit, res, value))
++ __vx_cres_adjust_min(limit, res, value);
+}
+
-+static inline
-+int nx_info_has_v6(struct nx_info *nxi)
++
++/* return values:
++ +1 ... no limit hit
++ -1 ... over soft limit
++ 0 ... over hard limit */
++
++static inline int __vx_cres_avail(struct vx_info *vxi,
++ int res, int num, char *_file, int _line)
+{
-+ if (!nxi)
++ struct _vx_limit *limit;
++ rlim_t value;
++
++ 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;
-+ if (NX_IPV6(nxi))
++
++ limit = &vxi->limit;
++ value = __rlim_get(limit, res);
++
++ if (!__vx_cres_adjust_max(limit, res, value))
++ __vx_cres_adjust_min(limit, res, value);
++
++ if (num == 0)
+ return 1;
-+ return 0;
-+}
+
-+#else /* CONFIG_IPV6 */
++ if (__rlim_soft(limit, res) == RLIM_INFINITY)
++ return -1;
++ if (value + num <= __rlim_soft(limit, res))
++ return -1;
+
-+static inline
-+int nx_v6_dev_visible(struct nx_info *n, struct net_device *d)
-+{
-+ return 1;
++ if (__rlim_hard(limit, res) == RLIM_INFINITY)
++ return 1;
++ if (value + num <= __rlim_hard(limit, res))
++ return 1;
++
++ __rlim_hit(limit, res);
++ return 0;
+}
+
+
++static const int VLA_RSS[] = { RLIMIT_RSS, VLIMIT_ANON, VLIMIT_MAPPED, 0 };
++
+static inline
-+int nx_v6_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
++rlim_t __vx_cres_array_sum(struct _vx_limit *limit, const int *array)
+{
-+ return 1;
++ 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_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
++rlim_t __vx_cres_array_fixup(struct _vx_limit *limit, const int *array)
+{
-+ return 1;
++ rlim_t value = __vx_cres_array_sum(limit, array + 1);
++ int res = *array;
++
++ 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);
++
++ return value;
+}
+
-+static inline
-+int nx_info_has_v6(struct nx_info *nxi)
++static inline int __vx_cres_array_avail(struct vx_info *vxi,
++ const int *array, int num, char *_file, int _line)
+{
-+ return 0;
-+}
++ struct _vx_limit *limit;
++ rlim_t value = 0;
++ int res;
+
-+#endif /* CONFIG_IPV6 */
++ if (num == 0)
++ return 1;
++ if (!vxi)
++ return 1;
+
-+#define current_nx_info_has_v6() \
-+ nx_info_has_v6(current_nx_info())
++ limit = &vxi->limit;
++ res = *array;
++ value = __vx_cres_array_sum(limit, array + 1);
+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vs_inet.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_inet.h
---- linux-2.6.29.1/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_inet.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,342 @@
-+#ifndef _VS_INET_H
-+#define _VS_INET_H
++ __rlim_set(limit, res, value);
++ __vx_cres_fixup(limit, res, value);
+
-+#include "vserver/base.h"
-+#include "vserver/network.h"
-+#include "vserver/debug.h"
++ return __vx_cres_avail(vxi, res, num, _file, _line);
++}
+
-+#define IPI_LOOPBACK htonl(INADDR_LOOPBACK)
+
-+#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]"
++static inline void vx_limit_fixup(struct _vx_limit *limit, int id)
++{
++ rlim_t value;
++ int res;
+
++ /* complex resources first */
++ if ((id < 0) || (id == RLIMIT_RSS))
++ __vx_cres_array_fixup(limit, VLA_RSS);
+
-+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;
++ for (res = 0; res < NUM_LIMITS; res++) {
++ if ((id > 0) && (res != id))
++ continue;
+
-+ 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;
-+ }
++ value = __rlim_get(limit, res);
++ __vx_cres_fixup(limit, res, value);
+
-+ vxdprintk(VXD_CBIT(net, 0),
-+ "v4_addr_match(%p" NXAV4_FMT "," NIPQUAD_FMT ",%04x) = %d",
-+ nxa, NXAV4(nxa), NIPQUAD(addr), tmask, ret);
-+ return ret;
++ /* not supposed to happen, maybe warn? */
++ if (__rlim_rmax(limit, res) > __rlim_hard(limit, res))
++ __rlim_rmax(limit, res) = __rlim_hard(limit, res);
++ }
+}
+
-+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;
++#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
+
-+ 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;
-+}
++#include <linux/types.h>
+
-+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);
-+}
++enum {
++ VXM_UNUSED = 0,
+
-+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;
++ VXM_SYNC = 0x10,
+
-+ for (ptr = &nxi->v4; ptr; ptr = ptr->next)
-+ if (v4_nx_addr_match(ptr, nxa, mask))
-+ return 1;
-+ return 0;
-+}
++ VXM_UPDATE = 0x20,
++ VXM_UPDATE_1,
++ VXM_UPDATE_2,
+
-+#include <net/inet_sock.h>
++ VXM_RQINFO_1 = 0x24,
++ VXM_RQINFO_2,
+
-+/*
-+ * 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;
++ VXM_ACTIVATE = 0x40,
++ VXM_DEACTIVATE,
++ VXM_IDLE,
+
-+ if (addr && (saddr == addr || bcast == addr))
-+ return 1;
-+ if (!saddr)
-+ return v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND);
-+ return 0;
-+}
++ VXM_HOLD = 0x44,
++ VXM_UNHOLD,
+
++ VXM_MIGRATE = 0x48,
++ VXM_RESCHED,
+
-+/* inet related checks and helpers */
++ /* all other bits are flags */
++ VXM_SCHED = 0x80,
++};
+
++struct _vxm_update_1 {
++ uint32_t tokens_max;
++ uint32_t fill_rate;
++ uint32_t interval;
++};
+
-+struct in_ifaddr;
-+struct net_device;
-+struct sock;
++struct _vxm_update_2 {
++ uint32_t tokens_min;
++ uint32_t fill_rate;
++ uint32_t interval;
++};
+
-+#ifdef CONFIG_INET
++struct _vxm_rqinfo_1 {
++ uint16_t running;
++ uint16_t onhold;
++ uint16_t iowait;
++ uint16_t uintr;
++ uint32_t idle_tokens;
++};
+
-+#include <linux/netdevice.h>
-+#include <linux/inetdevice.h>
-+#include <net/inet_sock.h>
-+#include <net/inet_timewait_sock.h>
++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;
++};
+
-+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 _vxm_task {
++ uint16_t pid;
++ uint16_t state;
++};
+
++struct _vxm_event {
++ uint32_t jif;
++ union {
++ uint32_t seq;
++ uint32_t sec;
++ };
++ union {
++ uint32_t tokens;
++ uint32_t nsec;
++ struct _vxm_task tsk;
++ };
++};
+
-+/*
-+ * check if address is covered by socket
-+ *
-+ * sk: the socket to check against
-+ * addr: the address in question (must be != 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;
++ };
++};
+
-+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);
+
-+ 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));
++#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
+
-+ 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;
-+ }
-+}
++#include <linux/types.h>
+
+
++#define MAX_N_CONTEXT 65535 /* Arbitrary limit */
+
-+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 NXF_INFO_PRIVATE 0x00000008
+
-+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 NXF_SINGLE_IP 0x00000100
++#define NXF_LBACK_REMAP 0x00000200
++#define NXF_LBACK_ALLOW 0x00000400
+
-+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 NXF_HIDE_NETIF 0x02000000
++#define NXF_HIDE_LBACK 0x04000000
+
-+ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
-+ return 1;
-+ if (v4_ifa_in_nx_info(ifa, nxi))
-+ return 1;
-+ return 0;
-+}
++#define NXF_STATE_SETUP (1ULL << 32)
++#define NXF_STATE_ADMIN (1ULL << 34)
+
++#define NXF_SC_HELPER (1ULL << 36)
++#define NXF_PERSISTENT (1ULL << 38)
+
-+struct nx_v4_sock_addr {
-+ __be32 saddr; /* Address used for validation */
-+ __be32 baddr; /* Address used for socket bind */
-+};
++#define NXF_ONE_TIME (0x0005ULL << 32)
+
-+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;
+
-+ 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 NXF_INIT_SET (__nxf_init_set())
+
-+ 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;
-+ }
-+ }
-+
-+ vxdprintk(VXD_CBIT(net, 3),
-+ "inet_bind(%p) " NIPQUAD_FMT ", " NIPQUAD_FMT,
-+ sk, NIPQUAD(saddr), NIPQUAD(baddr));
-+
-+ nsa->saddr = saddr;
-+ nsa->baddr = baddr;
-+ return 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;
++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;
+}
+
+
-+/*
-+ * 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;
-+}
++/* network caps */
+
-+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 NXC_TUN_CREATE 0x00000001
+
-+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 NXC_RAW_ICMP 0x00000100
+
-+#else /* CONFIG_INET */
+
-+static inline
-+int nx_dev_visible(struct nx_info *n, struct net_device *d)
-+{
-+ return 1;
-+}
++/* address types */
+
-+static inline
-+int nx_v4_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
-+{
-+ return 1;
-+}
++#define NXA_TYPE_IPV4 0x0001
++#define NXA_TYPE_IPV6 0x0002
+
-+static inline
-+int v4_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
-+{
-+ return 1;
-+}
++#define NXA_TYPE_NONE 0x0000
++#define NXA_TYPE_ANY 0x00FF
+
-+static inline
-+int nx_info_has_v4(struct nx_info *nxi)
-+{
-+ return 0;
-+}
++#define NXA_TYPE_ADDR 0x0010
++#define NXA_TYPE_MASK 0x0020
++#define NXA_TYPE_RANGE 0x0040
+
-+#endif /* CONFIG_INET */
++#define NXA_MASK_ALL (NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE)
+
-+#define current_nx_info_has_v4() \
-+ nx_info_has_v4(current_nx_info())
++#define NXA_MOD_BCAST 0x0100
++#define NXA_MOD_LBACK 0x0200
+
-+#else
-+// #warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vs_limit.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_limit.h
---- linux-2.6.29.1/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_limit.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,140 @@
-+#ifndef _VS_LIMIT_H
-+#define _VS_LIMIT_H
++#define NXA_LOOPBACK 0x1000
+
-+#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 NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK)
++#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
+
++#ifdef __KERNEL__
+
-+#define vx_acc_cres(v, d, p, r) \
-+ __vx_acc_cres(v, r, d, p, __FILE__, __LINE__)
++#include <linux/list.h>
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
++#include <linux/in.h>
++#include <linux/in6.h>
++#include <asm/atomic.h>
+
-+#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 nx_addr_v4 {
++ struct nx_addr_v4 *next;
++ struct in_addr ip[2];
++ struct in_addr mask;
++ uint16_t type;
++ uint16_t flags;
++};
+
++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;
++};
+
-+#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)
++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 */
+
-+#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)
++ uint64_t nx_flags; /* network flag word */
++ uint64_t nx_ncaps; /* network capabilities */
+
++ 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 */
++};
+
-+/* process and file limits */
+
-+#define vx_nproc_inc(p) \
-+ vx_acc_cres((p)->vx_info, 1, p, RLIMIT_NPROC)
++/* status flags */
+
-+#define vx_nproc_dec(p) \
-+ vx_acc_cres((p)->vx_info,-1, p, RLIMIT_NPROC)
++#define NXS_HASHED 0x0001
++#define NXS_SHUTDOWN 0x0100
++#define NXS_RELEASED 0x8000
+
-+#define vx_files_inc(f) \
-+ vx_acc_cres_cond((f)->f_xid, 1, f, RLIMIT_NOFILE)
++extern struct nx_info *lookup_nx_info(int);
+
-+#define vx_files_dec(f) \
-+ vx_acc_cres_cond((f)->f_xid,-1, f, RLIMIT_NOFILE)
++extern int get_nid_list(int, unsigned int *, int);
++extern int nid_is_hashed(nid_t);
+
-+#define vx_locks_inc(l) \
-+ vx_acc_cres_cond((l)->fl_xid, 1, l, RLIMIT_LOCKS)
++extern int nx_migrate_task(struct task_struct *, struct nx_info *);
+
-+#define vx_locks_dec(l) \
-+ vx_acc_cres_cond((l)->fl_xid,-1, l, RLIMIT_LOCKS)
++extern long vs_net_change(struct nx_info *, unsigned int);
+
-+#define vx_openfd_inc(f) \
-+ vx_acc_cres(current->vx_info, 1, (void *)(long)(f), VLIMIT_OPENFD)
++struct sock;
+
-+#define vx_openfd_dec(f) \
-+ vx_acc_cres(current->vx_info,-1, (void *)(long)(f), VLIMIT_OPENFD)
+
++#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
+
-+#define vx_cres_avail(v, n, r) \
-+ __vx_cres_avail(v, r, n, __FILE__, __LINE__)
++#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
+
+
-+#define vx_nproc_avail(n) \
-+ vx_cres_avail(current->vx_info, n, RLIMIT_NPROC)
++/* vinfo commands */
+
-+#define vx_files_avail(n) \
-+ vx_cres_avail(current->vx_info, n, RLIMIT_NOFILE)
++#define VCMD_task_nid VC_CMD(VINFO, 2, 0)
+
-+#define vx_locks_avail(n) \
-+ vx_cres_avail(current->vx_info, n, RLIMIT_LOCKS)
++#ifdef __KERNEL__
++extern int vc_task_nid(uint32_t);
+
-+#define vx_openfd_avail(n) \
-+ vx_cres_avail(current->vx_info, n, VLIMIT_OPENFD)
++#endif /* __KERNEL__ */
+
++#define VCMD_nx_info VC_CMD(VINFO, 6, 0)
+
-+/* dentry limits */
++struct vcmd_nx_info_v0 {
++ uint32_t nid;
++ /* more to come */
++};
+
-+#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)
++#ifdef __KERNEL__
++extern int vc_nx_info(struct nx_info *, void __user *);
+
-+#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 /* __KERNEL__ */
+
-+#define vx_dentry_avail(n) \
-+ vx_cres_avail(current->vx_info, n, VLIMIT_DENTRY)
++#include <linux/in.h>
++#include <linux/in6.h>
+
++#define VCMD_net_create_v0 VC_CMD(VNET, 1, 0)
++#define VCMD_net_create VC_CMD(VNET, 1, 1)
+
-+/* socket limits */
++struct vcmd_net_create {
++ uint64_t flagword;
++};
+
-+#define vx_sock_inc(s) \
-+ vx_acc_cres((s)->sk_vx_info, 1, s, VLIMIT_NSOCK)
++#define VCMD_net_migrate VC_CMD(NETMIG, 1, 0)
+
-+#define vx_sock_dec(s) \
-+ vx_acc_cres((s)->sk_vx_info,-1, s, VLIMIT_NSOCK)
++#define VCMD_net_add VC_CMD(NETALT, 1, 0)
++#define VCMD_net_remove VC_CMD(NETALT, 2, 0)
+
-+#define vx_sock_avail(n) \
-+ vx_cres_avail(current->vx_info, n, VLIMIT_NSOCK)
++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)
+
-+/* ipc resource limits */
++struct vcmd_net_addr_ipv4_v1 {
++ uint16_t type;
++ uint16_t flags;
++ struct in_addr ip;
++ struct in_addr mask;
++};
+
-+#define vx_ipcmsg_add(v, u, a) \
-+ vx_add_cres(v, a, u, RLIMIT_MSGQUEUE)
++#define VCMD_net_add_ipv6 VC_CMD(NETALT, 3, 1)
++#define VCMD_net_remove_ipv6 VC_CMD(NETALT, 4, 1)
+
-+#define vx_ipcmsg_sub(v, u, a) \
-+ vx_sub_cres(v, a, u, RLIMIT_MSGQUEUE)
++struct vcmd_net_addr_ipv6_v1 {
++ uint16_t type;
++ uint16_t flags;
++ uint32_t prefix;
++ struct in6_addr ip;
++ struct in6_addr mask;
++};
+
-+#define vx_ipcmsg_avail(v, a) \
-+ vx_cres_avail(v, a, RLIMIT_MSGQUEUE)
++#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_ipcshm_add(v, k, a) \
-+ vx_add_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
++#define VCMD_add_match_ipv6 VC_CMD(NETALT, 7, 0)
++#define VCMD_get_match_ipv6 VC_CMD(NETALT, 8, 0)
+
-+#define vx_ipcshm_sub(v, k, a) \
-+ vx_sub_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
++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_ipcshm_avail(v, a) \
-+ vx_cres_avail(v, a, VLIMIT_SHMEM)
+
++#ifdef __KERNEL__
++extern int vc_net_create(uint32_t, void __user *);
++extern int vc_net_migrate(struct nx_info *, void __user *);
+
-+#define vx_semary_inc(a) \
-+ vx_acc_cres(current->vx_info, 1, a, VLIMIT_SEMARY)
++extern int vc_net_add(struct nx_info *, void __user *);
++extern int vc_net_remove(struct nx_info *, void __user *);
+
-+#define vx_semary_dec(a) \
-+ vx_acc_cres(current->vx_info, -1, a, VLIMIT_SEMARY)
++extern int vc_net_add_ipv4(struct nx_info *, void __user *);
++extern int vc_net_remove_ipv4(struct nx_info *, void __user *);
+
++extern int vc_net_add_ipv6(struct nx_info *, void __user *);
++extern int vc_net_remove_ipv6(struct nx_info *, void __user *);
+
-+#define vx_nsems_add(a,n) \
-+ vx_add_cres(current->vx_info, n, a, VLIMIT_NSEMS)
++extern int vc_add_match_ipv4(struct nx_info *, void __user *);
++extern int vc_get_match_ipv4(struct nx_info *, void __user *);
+
-+#define vx_nsems_sub(a,n) \
-+ vx_sub_cres(current->vx_info, n, a, VLIMIT_NSEMS)
++extern int vc_add_match_ipv6(struct nx_info *, void __user *);
++extern int vc_get_match_ipv6(struct nx_info *, void __user *);
+
++#endif /* __KERNEL__ */
+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vs_memory.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_memory.h
---- linux-2.6.29.1/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_memory.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,159 @@
-+#ifndef _VS_MEMORY_H
-+#define _VS_MEMORY_H
+
-+#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"
++/* flag commands */
+
++#define VCMD_get_nflags VC_CMD(FLAGS, 5, 0)
++#define VCMD_set_nflags VC_CMD(FLAGS, 6, 0)
+
-+#define __acc_add_long(a, v) (*(v) += (a))
-+#define __acc_inc_long(v) (++*(v))
-+#define __acc_dec_long(v) (--*(v))
++struct vcmd_net_flags_v0 {
++ uint64_t flagword;
++ uint64_t mask;
++};
+
-+#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 */
++#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_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 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)
++/* network caps commands */
+
++#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0)
++#define VCMD_set_ncaps VC_CMD(FLAGS, 8, 0)
+
-+#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)
++struct vcmd_net_caps_v0 {
++ uint64_t ncaps;
++ uint64_t cmask;
++};
+
-+#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__
++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.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"
+
-+#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 _vx_percpu {
++ struct _vx_cvirt_pc cvirt;
++ struct _vx_sched_pc sched;
++};
+
-+#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 PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
-+#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 /* _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_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))
++/* pid faking stuff */
+
-+#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_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 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))
++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_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 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)
++{
++ 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_pages_avail(m, p, r) \
-+ __vx_cres_avail((m)->mm_vx_info, r, p, __FILE__, __LINE__)
++#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
+
-+#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 vx_rss_avail(m, p) \
-+ __vx_cres_array_avail((m)->mm_vx_info, VLA_RSS, p, __FILE__, __LINE__)
++#ifdef __KERNEL__
+
++struct timespec;
+
-+enum {
-+ VXPT_UNKNOWN = 0,
-+ VXPT_ANON,
-+ VXPT_NONE,
-+ VXPT_FILE,
-+ VXPT_SWAP,
-+ VXPT_WRITE
-+};
++void vx_vsi_uptime(struct timespec *, struct timespec *);
+
-+#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_info;
+
-+ if (!vxi)
-+ return;
++void vx_update_load(struct vx_info *);
+
-+ what = (ret & 0x3);
+
-+/* 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]);
-+}
++int vx_tokens_recalc(struct _vx_sched_pc *,
++ unsigned long *, unsigned long *, int [2]);
+
-+#define vx_page_fault(mm, vma, type, ret) __vx_page_fault(mm, vma, type, ret)
-+#endif
++void vx_update_sched_param(struct _vx_sched *sched,
++ struct _vx_sched_pc *sched_pc);
+
++#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
+
-+extern unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm);
+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vs_network.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_network.h
---- linux-2.6.29.1/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_network.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,169 @@
-+#ifndef _NX_VS_NETWORK_H
-+#define _NX_VS_NETWORK_H
++/* sched vserver commands */
+
-+#include "vserver/context.h"
-+#include "vserver/network.h"
-+#include "vserver/base.h"
-+#include "vserver/check.h"
-+#include "vserver/debug.h"
++#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 <linux/sched.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_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;
++};
+
-+#define get_nx_info(i) __get_nx_info(i, __FILE__, __LINE__)
++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;
++};
+
-+static inline struct nx_info *__get_nx_info(struct nx_info *nxi,
-+ const char *_file, int _line)
-+{
-+ if (!nxi)
-+ return NULL;
++#define VCMD_set_sched VC_CMD(SCHED, 1, 5)
++#define VCMD_get_sched VC_CMD(SCHED, 2, 5)
+
-+ 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);
++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;
++};
+
-+ atomic_inc(&nxi->nx_usecnt);
-+ return nxi;
-+}
++#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
+
-+extern void free_nx_info(struct nx_info *);
++#define VXSM_V3_MASK 0x0173
++#define VXSM_SET_MASK 0x01FF
+
-+#define put_nx_info(i) __put_nx_info(i, __FILE__, __LINE__)
++#define VXSM_CPU_ID 0x1000
++#define VXSM_BUCKET_ID 0x2000
+
-+static inline void __put_nx_info(struct nx_info *nxi, const char *_file, int _line)
-+{
-+ if (!nxi)
-+ return;
++#define VXSM_MSEC 0x4000
+
-+ 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);
++#define SCHED_KEEP (-2) /* only for v2 */
+
-+ if (atomic_dec_and_test(&nxi->nx_usecnt))
-+ free_nx_info(nxi);
-+}
++#ifdef __KERNEL__
+
++#include <linux/compiler.h>
+
-+#define init_nx_info(p, i) __init_nx_info(p, i, __FILE__, __LINE__)
++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 *);
+
-+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);
++#endif /* __KERNEL__ */
+
-+ atomic_inc(&nxi->nx_usecnt);
-+ }
-+ *nxp = nxi;
-+}
++#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;
++};
+
-+#define set_nx_info(p, i) __set_nx_info(p, i, __FILE__, __LINE__)
++#ifdef __KERNEL__
+
-+static inline void __set_nx_info(struct nx_info **nxp, struct nx_info *nxi,
-+ const char *_file, int _line)
-+{
-+ struct nx_info *nxo;
++extern int vc_sched_info(struct vx_info *, void __user *);
+
-+ if (!nxi)
-+ return;
++#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
+
-+ 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);
++#include <linux/spinlock.h>
++#include <linux/jiffies.h>
++#include <linux/cpumask.h>
++#include <asm/atomic.h>
++#include <asm/param.h>
+
-+ atomic_inc(&nxi->nx_usecnt);
-+ nxo = xchg(nxp, nxi);
-+ BUG_ON(nxo);
-+}
+
-+#define clr_nx_info(p) __clr_nx_info(p, __FILE__, __LINE__)
++/* context sub struct */
+
-+static inline void __clr_nx_info(struct nx_info **nxp,
-+ const char *_file, int _line)
-+{
-+ struct nx_info *nxo;
++struct _vx_sched {
++ spinlock_t tokens_lock; /* lock for token bucket */
+
-+ nxo = xchg(nxp, NULL);
-+ if (!nxo)
-+ return;
++ 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 */
+
-+ 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);
++ int prio_bias; /* bias offset for priority */
+
-+ if (atomic_dec_and_test(&nxo->nx_usecnt))
-+ free_nx_info(nxo);
-+}
++ unsigned update_mask; /* which features should be updated */
++ cpumask_t update; /* CPUs which should update */
++};
+
++struct _vx_sched_pc {
++ int tokens; /* number of CPU tokens */
++ int flags; /* bucket flags */
+
-+#define claim_nx_info(v, p) __claim_nx_info(v, p, __FILE__, __LINE__)
++ 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 __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 prio_bias; /* bias offset for priority */
++ int vavavoom; /* last calculated vavavoom */
+
-+ atomic_inc(&nxi->nx_tasks);
-+}
++ 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 */
+
++ uint64_t user_ticks; /* token tick events */
++ uint64_t sys_ticks; /* token tick events */
++ uint64_t hold_ticks; /* token ticks paused */
++};
+
-+extern void unhash_nx_info(struct nx_info *);
+
-+#define release_nx_info(v, p) __release_nx_info(v, p, __FILE__, __LINE__)
++#define VXSF_ONHOLD 0x0001
++#define VXSF_IDLE_TIME 0x0100
+
-+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();
++#ifdef CONFIG_VSERVER_DEBUG
+
-+ if (atomic_dec_and_test(&nxi->nx_tasks))
-+ unhash_nx_info(nxi);
++static inline void __dump_vx_sched(struct _vx_sched *sched)
++{
++ 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
+
-+#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;
++#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
+
-+ 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);
-+}
++struct vx_info;
+
++int vx_info_kill(struct vx_info *, int, int);
+
-+#else
++#endif /* __KERNEL__ */
++#else /* _VX_SIGNAL_H */
+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vs_pid.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_pid.h
---- linux-2.6.29.1/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_pid.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,95 @@
-+#ifndef _VS_PID_H
-+#define _VS_PID_H
++#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
+
-+#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>
+
++/* signalling vserver commands */
+
-+#define VXF_FAKE_INIT (VXF_INFO_INIT | VXF_STATE_INIT)
++#define VCMD_ctx_kill VC_CMD(PROCTRL, 1, 0)
++#define VCMD_wait_exit VC_CMD(EVENT, 99, 0)
+
-+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;
-+}
++struct vcmd_ctx_kill_v0 {
++ int32_t pid;
++ int32_t sig;
++};
+
-+#define find_task_by_real_pid(pid) find_task_by_pid_ns(pid, &init_pid_ns)
++struct vcmd_wait_exit_v0 {
++ int32_t reboot_cmd;
++ int32_t exit_code;
++};
+
-+#if 0
++#ifdef __KERNEL__
+
-+static inline
-+struct task_struct *vx_find_proc_task_by_pid(int pid)
-+{
-+ struct task_struct *task = find_task_by_real_pid(pid);
++extern int vc_ctx_kill(struct vx_info *, void __user *);
++extern int vc_wait_exit(struct vx_info *, void __user *);
+
-+ 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;
-+}
++#endif /* __KERNEL__ */
+
-+#endif
++/* process alteration commands */
+
-+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 VCMD_get_pflags VC_CMD(PROCALT, 5, 0)
++#define VCMD_set_pflags VC_CMD(PROCALT, 6, 0)
+
-+ 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 vcmd_pflags_v0 {
++ uint32_t flagword;
++ uint32_t mask;
++};
+
-+#if 0
++#ifdef __KERNEL__
+
-+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);
++extern int vc_get_pflags(uint32_t pid, void __user *);
++extern int vc_set_pflags(uint32_t pid, void __user *);
+
-+ if (!vxi)
-+ goto out;
++#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
+
-+ BUG_ON(!p->vx_info->vx_reaper);
++#include <linux/types.h>
+
-+ /* child reaper for the guest reaper */
-+ if (vxi->vx_reaper == p)
-+ goto out;
++struct vx_info;
+
-+ 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;
-+}
++int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index);
+
-+#endif
++#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
+
+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vs_sched.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_sched.h
---- linux-2.6.29.1/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_sched.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,110 @@
-+#ifndef _VS_SCHED_H
-+#define _VS_SCHED_H
++#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)
+
-+#include "vserver/base.h"
-+#include "vserver/context.h"
-+#include "vserver/sched.h"
++#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)
+
++#define VCMD_get_space_mask_v0 VC_CMD(PROCALT, 4, 0)
+
-+#define VAVAVOOM_RATIO 50
++#define VCMD_get_space_mask VC_CMD(VSPACE, 0, 1)
++#define VCMD_get_space_default VC_CMD(VSPACE, 1, 0)
+
-+#define MAX_PRIO_BIAS 20
-+#define MIN_PRIO_BIAS -20
+
++struct vcmd_space_mask_v1 {
++ uint64_t mask;
++};
+
-+#ifdef CONFIG_VSERVER_HARDCPU
++struct vcmd_space_mask_v2 {
++ uint64_t mask;
++ uint32_t index;
++};
+
-+/*
-+ * 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;
+
-+ /* 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 __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
-+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;
++#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
+
-+ if (!vxi)
-+ return prio;
++#include <linux/types.h>
+
-+ 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);
+
-+ sched_pc->vavavoom = vavavoom;
-+ prio += vavavoom;
-+ }
-+ prio += sched_pc->prio_bias;
-+ return prio;
-+}
++#define VC_CATEGORY(c) (((c) >> 24) & 0x3F)
++#define VC_COMMAND(c) (((c) >> 16) & 0xFF)
++#define VC_VERSION(c) ((c) & 0xFFF)
+
-+#else /* !CONFIG_VSERVER_HARDCPU */
++#define VC_CMD(c, i, v) ((((VC_CAT_ ## c) & 0x3F) << 24) \
++ | (((i) & 0xFF) << 16) | ((v) & 0xFFF))
+
-+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;
-+}
++ Syscall Matrix V2.8
+
-+#endif /* CONFIG_VSERVER_HARDCPU */
++ |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|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
+
++*/
+
-+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 VC_CAT_VERSION 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 VC_CAT_VSETUP 1
++#define VC_CAT_VHOST 2
+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vs_socket.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_socket.h
---- linux-2.6.29.1/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_socket.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,67 @@
-+#ifndef _VS_SOCKET_H
-+#define _VS_SOCKET_H
++#define VC_CAT_DEVICE 6
+
-+#include "vserver/debug.h"
-+#include "vserver/base.h"
-+#include "vserver/cacct.h"
-+#include "vserver/context.h"
-+#include "vserver/tag.h"
++#define VC_CAT_VPROC 9
++#define VC_CAT_PROCALT 10
++#define VC_CAT_PROCMIG 11
++#define VC_CAT_PROCTRL 12
+
++#define VC_CAT_SCHED 14
++#define VC_CAT_MEMCTRL 20
+
-+/* socket accounting */
++#define VC_CAT_VNET 25
++#define VC_CAT_NETALT 26
++#define VC_CAT_NETMIG 27
++#define VC_CAT_NETCTRL 28
+
-+#include <linux/socket.h>
++#define VC_CAT_TAGMIG 35
++#define VC_CAT_DLIMIT 36
++#define VC_CAT_INODE 38
+
-+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 VC_CAT_VSTAT 40
++#define VC_CAT_VINFO 46
++#define VC_CAT_EVENT 48
+
-+#define vx_acc_sock(v, f, p, s) \
-+ __vx_acc_sock(v, f, p, s, __FILE__, __LINE__)
++#define VC_CAT_FLAGS 52
++#define VC_CAT_VSPACE 54
++#define VC_CAT_DEBUG 56
++#define VC_CAT_RLIMIT 60
+
-+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 VC_CAT_SYSTEST 61
++#define VC_CAT_COMPAT 63
+
-+ atomic_long_inc(&vxi->cacct.sock[type][pos].count);
-+ atomic_long_add(size, &vxi->cacct.sock[type][pos].total);
-+ }
-+}
++/* query version */
+
-+#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)
++#define VCMD_get_version VC_CMD(VERSION, 0, 0)
++#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
+
+
-+#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)
++#include <linux/errno.h>
++
++#endif /* __KERNEL__ */
++
++#endif /* _VX_SWITCH_H */
++
+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>
++
++
++#define DX_TAG(in) (IS_TAGGED(in))
+
++
++#ifdef CONFIG_TAG_NFSD
++#define DX_TAG_NFSD 1
+#else
-+#warning duplicate inclusion
++#define DX_TAG_NFSD 0
+#endif
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vs_tag.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_tag.h
---- linux-2.6.29.1/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_tag.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,47 @@
-+#ifndef _VS_TAG_H
-+#define _VS_TAG_H
+
-+#include <linux/vserver/tag.h>
+
-+/* check conditions */
++#ifdef CONFIG_TAGGING_NONE
+
-+#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) (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)
++#ifdef CONFIG_TAGGING_GID16
+
-+#define dx_check(c, m) __dx_check(dx_current_tag(), c, m)
++#define MAX_UID 0xFFFFFFFF
++#define MAX_GID 0x0000FFFF
+
-+#define dx_weak_check(c, m) ((m) ? dx_check(c, m) : 1)
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? (((gid) >> 16) & 0xFFFF) : 0)
+
++#define TAGINO_UID(cond, uid, tag) (uid)
++#define TAGINO_GID(cond, gid, tag) \
++ ((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (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)
-+{
-+ 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)));
-+}
++#endif
+
-+struct inode;
-+int dx_permission(struct inode *inode, int mask);
+
++#ifdef CONFIG_TAGGING_ID24
++
++#define MAX_UID 0x00FFFFFF
++#define MAX_GID 0x00FFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0)
++
++#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))
+
-+#else
-+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.29.1/include/linux/vs_time.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_time.h
---- linux-2.6.29.1/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/linux/vs_time.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,19 @@
-+#ifndef _VS_TIME_H
-+#define _VS_TIME_H
+
+
-+/* time faking stuff */
++#ifdef CONFIG_TAGGING_UID16
+
-+#ifdef CONFIG_VSERVER_VTIME
++#define MAX_UID 0x0000FFFF
++#define MAX_GID 0xFFFFFFFF
+
-+extern void vx_gettimeofday(struct timeval *tv);
-+extern int vx_settimeofday(struct timespec *ts);
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? (((uid) >> 16) & 0xFFFF) : 0)
+
++#define TAGINO_UID(cond, uid, tag) \
++ ((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid))
++#define TAGINO_GID(cond, gid, tag) (gid)
++
++#endif
++
++
++#ifdef CONFIG_TAGGING_INTERN
++
++#define MAX_UID 0xFFFFFFFF
++#define MAX_GID 0xFFFFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? (tag) : 0)
++
++#define TAGINO_UID(cond, uid, tag) (uid)
++#define TAGINO_GID(cond, gid, tag) (gid)
++
++#endif
++
++
++#ifndef CONFIG_TAGGING_NONE
++#define dx_current_fstag(sb) \
++ ((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0)
+#else
-+#define vx_gettimeofday(t) do_gettimeofday(t)
-+#define vx_settimeofday(t) do_settimeofday(t)
++#define dx_current_fstag(sb) (0)
+#endif
+
++#ifndef CONFIG_TAGGING_INTERN
++#define TAGINO_TAG(cond, tag) (0)
+#else
-+#warning duplicate inclusion
++#define TAGINO_TAG(cond, tag) ((cond) ? (tag) : 0)
+#endif
-diff -NurpP --minimal linux-2.6.29.1/include/net/addrconf.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/net/addrconf.h
---- linux-2.6.29.1/include/net/addrconf.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/net/addrconf.h 2009-02-22 22:54:26.000000000 +0100
-@@ -84,7 +84,8 @@ extern int ipv6_dev_get_saddr(struct n
++
++#define INOTAG_UID(cond, uid, gid) \
++ ((cond) ? ((uid) & MAX_UID) : (uid))
++#define INOTAG_GID(cond, uid, gid) \
++ ((cond) ? ((gid) & MAX_GID) : (gid))
++
++
++static inline uid_t dx_map_uid(uid_t uid)
++{
++ if ((uid > MAX_UID) && (uid != -1))
++ uid = -2;
++ return (uid & MAX_UID);
++}
++
++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;
++};
++
++#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);
++
++#ifdef CONFIG_PROPAGATE
++
++void __dx_propagate_tag(struct nameidata *nd, struct inode *inode);
++
++#define dx_propagate_tag(n, i) __dx_propagate_tag(n, i)
++
++#else
++#define dx_propagate_tag(n, i) do { } while (0)
++#endif
++
++#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,
unsigned int srcprefs,
extern int ipv6_get_lladdr(struct net_device *dev,
struct in6_addr *addr,
unsigned char banned_flags);
-diff -NurpP --minimal linux-2.6.29.1/include/net/af_unix.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/net/af_unix.h
---- linux-2.6.29.1/include/net/af_unix.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/net/af_unix.h 2009-02-22 22:54:26.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.29.1/include/net/inet_timewait_sock.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/net/inet_timewait_sock.h
---- linux-2.6.29.1/include/net/inet_timewait_sock.h 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/net/inet_timewait_sock.h 2009-03-24 14:48:36.000000000 +0100
-@@ -15,15 +15,14 @@
- #ifndef _INET_TIMEWAIT_SOCK_
- #define _INET_TIMEWAIT_SOCK_
-
-+// #include <net/inet_sock.h>
-+#include <net/sock.h>
-
- #include <linux/list.h>
- #include <linux/module.h>
- #include <linux/timer.h>
- #include <linux/types.h>
- #include <linux/workqueue.h>
--
--#include <net/inet_sock.h>
--#include <net/sock.h>
- #include <net/tcp_states.h>
- #include <net/timewait_sock.h>
-
-@@ -116,6 +115,10 @@ struct inet_timewait_sock {
+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
#define tw_net __tw_common.skc_net
int tw_timeout;
volatile unsigned char tw_substate;
/* 3 bits hole, try to pack */
-diff -NurpP --minimal linux-2.6.29.1/include/net/route.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/net/route.h
---- linux-2.6.29.1/include/net/route.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/net/route.h 2009-02-22 22:54:26.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);
}
int err;
struct net *net = sock_net(sk);
-+ struct nx_info *nx_info = current->nx_info;
++ struct nx_info *nx_info = current_nx_info();
if (inet_sk(sk)->transparent)
fl.flags |= FLOWI_FLAG_ANYSRC;
err = __ip_route_output_key(net, rp, &fl);
if (err)
return err;
-diff -NurpP --minimal linux-2.6.29.1/include/net/sock.h linux-2.6.29.1-vs2.3.0.36.9-pre5/include/net/sock.h
---- linux-2.6.29.1/include/net/sock.h 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/include/net/sock.h 2009-03-24 14:48:36.000000000 +0100
-@@ -134,6 +134,10 @@ struct sock_common {
+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;
#endif
};
/**
-@@ -218,6 +222,10 @@ struct sock {
- #define sk_hash __sk_common.skc_hash
+@@ -225,6 +229,10 @@ struct sock {
+ #define sk_bind_node __sk_common.skc_bind_node
#define sk_prot __sk_common.skc_prot
#define sk_net __sk_common.skc_net
+#define sk_xid __sk_common.skc_xid
+#define sk_vx_info __sk_common.skc_vx_info
+#define sk_nid __sk_common.skc_nid
+#define sk_nx_info __sk_common.skc_nx_info
- unsigned char sk_shutdown : 2,
- sk_no_check : 2,
- sk_userlocks : 4;
-diff -NurpP --minimal linux-2.6.29.1/init/main.c linux-2.6.29.1-vs2.3.0.36.9-pre5/init/main.c
---- linux-2.6.29.1/init/main.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/init/main.c 2009-03-24 17:22:37.000000000 +0100
-@@ -64,6 +64,7 @@
- #include <linux/ftrace.h>
- #include <linux/async.h>
+ kmemcheck_bitfield_begin(flags);
+ unsigned int sk_shutdown : 2,
+ sk_no_check : 2,
+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"
++ depends on EXPERIMENTAL
++ depends on FAIR_GROUP_SCHED && CGROUP_SCHED
++ default n
++ help
++ This option enables hard limiting of CPU time obtained by
++ a fair task group. Use this if you want to throttle a group of tasks
++ based on its CPU usage. For more details refer to
++ Documentation/scheduler/sched-cfs-hard-limits.txt
++
++ Say N if unsure.
++
+ menuconfig CGROUPS
+ boolean "Control Group support"
+ help
+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 <trace/boot.h>
+#include <linux/vserver/percpu.h>
#include <asm/io.h>
#include <asm/bugs.h>
-@@ -381,12 +382,14 @@ EXPORT_SYMBOL(__per_cpu_offset);
-
- static void __init setup_per_cpu_areas(void)
- {
-- unsigned long size, i;
-+ unsigned long size, vspc, i;
- char *ptr;
- unsigned long nr_possible_cpus = num_possible_cpus();
-
-+ vspc = PERCPU_PERCTX * CONFIG_VSERVER_CONTEXTS;
-+
- /* Copy section for each CPU (we discard the original) */
-- size = ALIGN(PERCPU_ENOUGH_ROOM, PAGE_SIZE);
-+ size = ALIGN(PERCPU_ENOUGH_ROOM + vspc, PAGE_SIZE);
- ptr = alloc_bootmem_pages(size * nr_possible_cpus);
-
- for_each_possible_cpu(i) {
-diff -NurpP --minimal linux-2.6.29.1/ipc/mqueue.c linux-2.6.29.1-vs2.3.0.36.9-pre5/ipc/mqueue.c
---- linux-2.6.29.1/ipc/mqueue.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/ipc/mqueue.c 2009-03-24 17:24:19.000000000 +0100
-@@ -31,6 +31,8 @@
- #include <linux/mutex.h>
- #include <linux/nsproxy.h>
+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>
+ #include <linux/ima.h>
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
#include <net/sock.h>
#include "util.h"
-@@ -79,6 +81,7 @@ struct mqueue_inode_info {
+@@ -66,6 +68,7 @@ struct mqueue_inode_info {
struct sigevent notify;
struct pid* notify_owner;
struct user_struct *user; /* user who created, for accounting */
struct sock *notify_sock;
struct sk_buff *notify_cookie;
-@@ -126,6 +129,7 @@ static struct inode *mqueue_get_inode(st
+@@ -125,6 +128,7 @@ static struct inode *mqueue_get_inode(st
if (S_ISREG(mode)) {
struct mqueue_inode_info *info;
struct task_struct *p = current;
unsigned long mq_bytes, mq_msg_tblsz;
inode->i_fop = &mqueue_file_operations;
-@@ -140,6 +144,7 @@ static struct inode *mqueue_get_inode(st
+@@ -139,6 +143,7 @@ static struct inode *mqueue_get_inode(st
info->notify_owner = NULL;
info->qsize = 0;
info->user = NULL; /* set when all is ok */
+ info->vxi = NULL;
memset(&info->attr, 0, sizeof(info->attr));
- info->attr.mq_maxmsg = msg_max;
- info->attr.mq_msgsize = msgsize_max;
-@@ -154,22 +159,26 @@ static struct inode *mqueue_get_inode(st
+ info->attr.mq_maxmsg = ipc_ns->mq_msg_max;
+ info->attr.mq_msgsize = ipc_ns->mq_msgsize_max;
+@@ -153,22 +158,26 @@ static struct inode *mqueue_get_inode(st
spin_lock(&mq_lock);
if (u->mq_bytes + mq_bytes < u->mq_bytes ||
u->mq_bytes + mq_bytes >
} else if (S_ISDIR(mode)) {
inc_nlink(inode);
/* Some things misbehave if size == 0 on a directory */
-@@ -260,10 +269,14 @@ static void mqueue_delete_inode(struct i
+@@ -269,8 +278,11 @@ static void mqueue_delete_inode(struct i
(info->attr.mq_maxmsg * info->attr.mq_msgsize));
user = info->user;
if (user) {
spin_lock(&mq_lock);
user->mq_bytes -= mq_bytes;
+ vx_ipcmsg_sub(vxi, user, mq_bytes);
- queues_count--;
+ /*
+ * get_ns_from_inode() ensures that the
+ * (ipc_ns = sb->s_fs_info) is either a valid ipc_ns
+@@ -280,6 +292,7 @@ static void mqueue_delete_inode(struct i
+ if (ipc_ns)
+ ipc_ns->mq_queues_count--;
spin_unlock(&mq_lock);
+ put_vx_info(vxi);
free_uid(user);
}
- }
-diff -NurpP --minimal linux-2.6.29.1/ipc/msg.c linux-2.6.29.1-vs2.3.0.36.9-pre5/ipc/msg.c
---- linux-2.6.29.1/ipc/msg.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/ipc/msg.c 2009-02-22 22:54:26.000000000 +0100
+ if (ipc_ns)
+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.29.1/ipc/namespace.c linux-2.6.29.1-vs2.3.0.36.9-pre5/ipc/namespace.c
---- linux-2.6.29.1/ipc/namespace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/ipc/namespace.c 2009-02-22 22:54:26.000000000 +0100
-@@ -9,6 +9,8 @@
- #include <linux/rcupdate.h>
- #include <linux/nsproxy.h>
+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 <linux/mount.h>
+#include <linux/vs_base.h>
+#include <linux/vserver/global.h>
#include "util.h"
-@@ -35,6 +37,7 @@ static struct ipc_namespace *clone_ipc_n
- register_ipcns_notifier(ns);
-
- kref_init(&ns->kref);
-+ atomic_inc(&vs_global_ipc_ns);
- return ns;
- }
-
-@@ -101,6 +104,7 @@ void free_ipc_ns(struct kref *kref)
- sem_exit_ns(ns);
- msg_exit_ns(ns);
- shm_exit_ns(ns);
-+ atomic_dec(&vs_global_ipc_ns);
- kfree(ns);
- atomic_dec(&nr_ipc_ns);
-
-diff -NurpP --minimal linux-2.6.29.1/ipc/sem.c linux-2.6.29.1-vs2.3.0.36.9-pre5/ipc/sem.c
---- linux-2.6.29.1/ipc/sem.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/ipc/sem.c 2009-03-31 23:31:33.000000000 +0200
+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.29.1/ipc/shm.c linux-2.6.29.1-vs2.3.0.36.9-pre5/ipc/shm.c
---- linux-2.6.29.1/ipc/shm.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/ipc/shm.c 2009-03-24 14:48:36.000000000 +0100
-@@ -39,6 +39,8 @@
- #include <linux/nsproxy.h>
+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 <linux/ima.h>
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
#include <asm/uaccess.h>
-@@ -168,7 +170,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))
-@@ -178,6 +185,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);
}
-@@ -348,11 +356,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;
-+ if (!vx_ipcshm_avail(current->vx_info, numpages))
++ if (!vx_ipcshm_avail(current_vx_info(), numpages))
+ return -ENOSPC;
+
shp = ipc_rcu_alloc(sizeof(*shp));
shp->shm_perm.mode = (shmflg & S_IRWXUGO);
shp->mlock_user = NULL;
-@@ -406,6 +418,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);
-+ vx_ipcshm_add(current->vx_info, key, numpages);
++ vx_ipcshm_add(current_vx_info(), key, numpages);
return error;
no_id:
-diff -NurpP --minimal linux-2.6.29.1/kernel/capability.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/capability.c
---- linux-2.6.29.1/kernel/capability.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/capability.c 2009-03-24 17:27:28.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.29.1/kernel/compat.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/compat.c
---- linux-2.6.29.1/kernel/compat.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/compat.c 2009-03-24 14:48:36.000000000 +0100
-@@ -891,7 +891,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) {
-@@ -916,7 +916,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.29.1/kernel/exit.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/exit.c
---- linux-2.6.29.1/kernel/exit.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/exit.c 2009-03-24 17:28:40.000000000 +0100
-@@ -47,6 +47,11 @@
- #include <linux/task_io_accounting_ops.h>
- #include <linux/tracehook.h>
+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 <linux/perf_event.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_pid.h>
-+#include <linux/vserver/global.h>
- #include <trace/sched.h>
+ #include <trace/events/sched.h>
#include <asm/uaccess.h>
-@@ -502,9 +507,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();
}
}
}
}
-@@ -571,6 +578,7 @@ void put_fs_struct(struct fs_struct *fs)
- if (atomic_dec_and_test(&fs->count)) {
- path_put(&fs->root);
- path_put(&fs->pwd);
-+ atomic_dec(&vs_global_fs);
- kmem_cache_free(fs_cachep, fs);
- }
- }
-@@ -1122,10 +1130,15 @@ NORET_TYPE void do_exit(long code)
- if (tsk->splice_pipe)
- __free_pipe_info(tsk->splice_pipe);
+@@ -1027,11 +1033,16 @@ NORET_TYPE void do_exit(long code)
+
+ validate_creds_for_do_exit(tsk);
+ /* needs to stay after exit_notify() */
+ exit_vx_info(tsk, code);
+ exit_nx_info(tsk);
+
preempt_disable();
+ exit_rcu();
/* causes final put_task_struct in finish_task_switch(). */
tsk->state = TASK_DEAD;
schedule();
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-diff -NurpP --minimal linux-2.6.29.1/kernel/fork.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/fork.c
---- linux-2.6.29.1/kernel/fork.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/fork.c 2009-03-24 17:31:42.000000000 +0100
-@@ -60,6 +60,11 @@
- #include <linux/tty.h>
- #include <linux/proc_fs.h>
- #include <linux/blkdev.h>
+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>
+ #include <linux/posix-timers.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_memory.h>
-+#include <linux/vserver/global.h>
- #include <trace/sched.h>
#include <asm/pgtable.h>
-@@ -140,6 +145,8 @@ void free_task(struct task_struct *tsk)
- prop_local_destroy_single(&tsk->dirties);
+ #include <asm/pgalloc.h>
+@@ -151,6 +155,8 @@ void free_task(struct task_struct *tsk)
+ account_kernel_stack(tsk->stack, -1);
free_thread_info(tsk->stack);
rt_mutex_debug_task_free(tsk);
+ clr_vx_info(&tsk->vx_info);
ftrace_graph_exit_task(tsk);
free_task_struct(tsk);
}
-@@ -279,6 +286,8 @@ static int dup_mmap(struct mm_struct *mm
+@@ -296,6 +302,8 @@ static int dup_mmap(struct mm_struct *mm
mm->free_area_cache = oldmm->mmap_base;
mm->cached_hole_size = ~0UL;
mm->map_count = 0;
+ __set_mm_counter(mm, file_rss, 0);
+ __set_mm_counter(mm, anon_rss, 0);
- cpus_clear(mm->cpu_vm_mask);
+ cpumask_clear(mm_cpumask(mm));
mm->mm_rb = RB_ROOT;
rb_link = &mm->mm_rb.rb_node;
-@@ -290,7 +299,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;
-@@ -423,8 +432,8 @@ static struct mm_struct * mm_init(struct
- mm->flags = (current->mm) ? current->mm->flags : default_dump_filter;
+@@ -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;
- set_mm_counter(mm, file_rss, 0);
+ __set_mm_counter(mm, file_rss, 0);
+ __set_mm_counter(mm, anon_rss, 0);
spin_lock_init(&mm->page_table_lock);
- spin_lock_init(&mm->ioctx_lock);
- INIT_HLIST_HEAD(&mm->ioctx_list);
-@@ -435,6 +444,7 @@ static struct mm_struct * mm_init(struct
+ mm->free_area_cache = TASK_UNMAPPED_BASE;
+ mm->cached_hole_size = ~0UL;
+@@ -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;
}
-@@ -468,6 +478,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);
-@@ -594,6 +605,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;
-@@ -627,6 +639,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;
-@@ -690,6 +703,7 @@ static struct fs_struct *__copy_fs_struc
- fs->pwd = old->pwd;
- path_get(&old->pwd);
- read_unlock(&old->lock);
-+ atomic_inc(&vs_global_fs);
- }
- return fs;
- }
-@@ -955,6 +969,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);
-@@ -989,12 +1005,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
-+ init_vx_info(&p->vx_info, current->vx_info);
-+ init_nx_info(&p->nx_info, current->nx_info);
++ init_vx_info(&p->vx_info, current_vx_info());
++ init_nx_info(&p->nx_info, current_nx_info());
+
+ /* check vserver memory */
+ if (p->mm && !(clone_flags & CLONE_VM)) {
}
retval = copy_creds(p, clone_flags);
-@@ -1271,6 +1303,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);
-@@ -1315,6 +1359,9 @@ bad_fork_cleanup_count:
+@@ -1330,6 +1372,9 @@ bad_fork_cleanup_cgroup:
+ bad_fork_cleanup_count:
atomic_dec(&p->cred->user->processes);
- put_cred(p->real_cred);
- put_cred(p->cred);
+ exit_creds(p);
+bad_fork_cleanup_vm:
+ if (p->mm && !(clone_flags & CLONE_VM))
+ vx_pages_sub(p->vx_info, RLIMIT_AS, p->mm->total_vm);
bad_fork_free:
free_task(p);
fork_out:
-diff -NurpP --minimal linux-2.6.29.1/kernel/kthread.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/kthread.c
---- linux-2.6.29.1/kernel/kthread.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/kthread.c 2009-03-24 14:48:36.000000000 +0100
-@@ -13,6 +13,7 @@
+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 <linux/mutex.h>
+#include <linux/vs_pid.h>
- #include <trace/sched.h>
-
- #define KTHREAD_NICE_LEVEL (-5)
-@@ -102,7 +103,7 @@ static void create_kthread(struct kthrea
- struct sched_param param = { .sched_priority = 0 };
- wait_for_completion(&create->started);
- read_lock(&tasklist_lock);
-- create->result = find_task_by_pid_ns(pid, &init_pid_ns);
-+ create->result = find_task_by_real_pid(pid);
- read_unlock(&tasklist_lock);
- /*
- * root may have changed our (kthreadd's) priority or CPU mask.
-diff -NurpP --minimal linux-2.6.29.1/kernel/Makefile linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/Makefile
---- linux-2.6.29.1/kernel/Makefile 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/Makefile 2009-03-24 14:48:36.000000000 +0100
-@@ -22,6 +22,7 @@ CFLAGS_REMOVE_cgroup-debug.o = -pg
- CFLAGS_REMOVE_sched_clock.o = -pg
- endif
+ #include <trace/events/sched.h>
-+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.29.1/kernel/nsproxy.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/nsproxy.c
---- linux-2.6.29.1/kernel/nsproxy.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/nsproxy.c 2009-03-25 00:39:02.000000000 +0100
+ static DEFINE_SPINLOCK(kthread_create_lock);
+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>
#include <net/net_namespace.h>
#include <linux/ipc_namespace.h>
-@@ -37,6 +39,9 @@ static inline struct nsproxy *clone_nspr
- if (ns) {
- memcpy(ns, orig, sizeof(struct nsproxy));
- atomic_set(&ns->count, 1);
-+ vxdprintk(VXD_CBIT(space, 2), "clone_nsproxy(%p[%u] = %p[1]",
-+ orig, atomic_read(&orig->count), ns);
+@@ -31,8 +33,11 @@ static inline struct nsproxy *create_nsp
+ struct nsproxy *nsproxy;
+
+ nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
+- if (nsproxy)
++ if (nsproxy) {
+ atomic_set(&nsproxy->count, 1);
+ atomic_inc(&vs_global_nsproxy);
- }
- return ns;
++ }
++ vxdprintk(VXD_CBIT(space, 2), "create_nsproxy = %p[1]", nsproxy);
+ return nsproxy;
}
-@@ -46,41 +51,52 @@ static inline struct nsproxy *clone_nspr
+
+@@ -41,41 +46,52 @@ static inline struct nsproxy *create_nsp
* Return the newly created nsproxy. Do not attach this to the task,
* leave it to the caller to do proper locking and attach it to task.
*/
struct nsproxy *new_nsp;
int err;
-- new_nsp = clone_nsproxy(tsk->nsproxy);
+ vxdprintk(VXD_CBIT(space, 4),
+ "unshare_namespaces(0x%08lx,%p,%p)",
+ flags, orig, new_fs);
+
-+ new_nsp = clone_nsproxy(orig);
+ new_nsp = create_nsproxy();
if (!new_nsp)
return ERR_PTR(-ENOMEM);
if (IS_ERR(new_nsp->net_ns)) {
err = PTR_ERR(new_nsp->net_ns);
goto out_net;
-@@ -105,6 +121,35 @@ out_ns:
+@@ -100,6 +116,38 @@ out_ns:
return ERR_PTR(err);
}
+ */
+struct nsproxy *copy_nsproxy(struct nsproxy *orig)
+{
-+ struct nsproxy *ns = clone_nsproxy(orig);
++ struct nsproxy *ns = create_nsproxy();
+
+ if (ns) {
++ memcpy(ns, orig, sizeof(struct nsproxy));
++ atomic_set(&ns->count, 1);
++
+ if (ns->mnt_ns)
+ get_mnt_ns(ns->mnt_ns);
+ if (ns->uts_ns)
/*
* called from clone. This now handles copy for nsproxy and all
* namespaces therein.
-@@ -112,9 +157,12 @@ out_ns:
+@@ -107,9 +155,12 @@ out_ns:
int copy_namespaces(unsigned long flags, struct task_struct *tsk)
{
struct nsproxy *old_ns = tsk->nsproxy;
if (!old_ns)
return 0;
-@@ -151,6 +199,9 @@ int copy_namespaces(unsigned long flags,
+@@ -119,7 +170,7 @@ int copy_namespaces(unsigned long flags,
+ CLONE_NEWPID | CLONE_NEWNET)))
+ return 0;
+
+- if (!capable(CAP_SYS_ADMIN)) {
++ if (!vx_can_unshare(CAP_SYS_ADMIN, flags)) {
+ err = -EPERM;
+ goto out;
+ }
+@@ -146,6 +197,9 @@ int copy_namespaces(unsigned long flags,
out:
put_nsproxy(old_ns);
return err;
}
-@@ -164,7 +215,9 @@ void free_nsproxy(struct nsproxy *ns)
+@@ -159,7 +213,9 @@ void free_nsproxy(struct nsproxy *ns)
put_ipc_ns(ns->ipc_ns);
if (ns->pid_ns)
put_pid_ns(ns->pid_ns);
kmem_cache_free(nsproxy_cachep, ns);
}
-@@ -177,6 +230,10 @@ int unshare_nsproxy_namespaces(unsigned
+@@ -172,11 +228,15 @@ int unshare_nsproxy_namespaces(unsigned
{
int err = 0;
if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC |
CLONE_NEWNET)))
return 0;
-diff -NurpP --minimal linux-2.6.29.1/kernel/pid.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/pid.c
---- linux-2.6.29.1/kernel/pid.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/pid.c 2009-03-24 14:48:36.000000000 +0100
-@@ -36,6 +36,8 @@
+
+- if (!capable(CAP_SYS_ADMIN))
++ if (!vx_can_unshare(CAP_SYS_ADMIN, unshare_flags))
+ return -EPERM;
+
+ *new_nsp = create_new_namespaces(unshare_flags, current,
+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>
#include <linux/syscalls.h>
+#include <linux/vs_pid.h>
-+#include <linux/vserver/global.h>
#define pid_hashfn(nr, ns) \
hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift)
-@@ -305,7 +307,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 +367,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);
-@@ -388,14 +393,14 @@ EXPORT_SYMBOL(find_task_by_pid_type_ns);
-
- struct task_struct *find_task_by_vpid(pid_t vnr)
- {
-- return find_task_by_pid_type_ns(PIDTYPE_PID, vnr,
-+ return find_task_by_pid_type_ns(PIDTYPE_PID, vx_rmap_pid(vnr),
- current->nsproxy->pid_ns);
- }
- EXPORT_SYMBOL(find_task_by_vpid);
-
+@@ -383,7 +387,7 @@ EXPORT_SYMBOL(pid_task);
+ */
struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
{
-- return find_task_by_pid_type_ns(PIDTYPE_PID, nr, ns);
-+ return find_task_by_pid_type_ns(PIDTYPE_PID, vx_rmap_pid(nr), ns);
+- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
++ return pid_task(find_pid_ns(vx_rmap_pid(nr), ns), PIDTYPE_PID);
}
- EXPORT_SYMBOL(find_task_by_pid_ns);
-@@ -431,7 +436,7 @@ struct pid *find_get_pid(pid_t nr)
+ struct task_struct *find_task_by_vpid(pid_t vnr)
+@@ -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;
-@@ -444,6 +449,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.29.1/kernel/pid_namespace.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/pid_namespace.c
---- linux-2.6.29.1/kernel/pid_namespace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/pid_namespace.c 2009-02-22 22:54:26.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>
#define BITS_PER_PAGE (PAGE_SIZE*8)
-@@ -85,6 +86,7 @@ static struct pid_namespace *create_pid_
+@@ -86,6 +87,7 @@ static struct pid_namespace *create_pid_
goto out_free_map;
kref_init(&ns->kref);
+ atomic_inc(&vs_global_pid_ns);
ns->level = level;
+ ns->parent = get_pid_ns(parent_pid_ns);
- set_bit(0, ns->pidmap[0].page);
-@@ -109,6 +111,7 @@ static void destroy_pid_namespace(struct
+@@ -111,6 +113,7 @@ static void destroy_pid_namespace(struct
for (i = 0; i < PIDMAP_ENTRIES; i++)
kfree(ns->pidmap[i].page);
kmem_cache_free(pid_ns_cachep, ns);
}
-diff -NurpP --minimal linux-2.6.29.1/kernel/posix-timers.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/posix-timers.c
---- linux-2.6.29.1/kernel/posix-timers.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/posix-timers.c 2009-03-24 17:36:18.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>
/*
* Management arrays for POSIX timers. Timers are kept in slab memory
-@@ -321,6 +322,12 @@ int posix_timer_event(struct k_itimer *t
+@@ -363,6 +364,7 @@ int posix_timer_event(struct k_itimer *t
{
struct task_struct *task;
int shared, ret = -1;
-+ struct vx_info_save vxis;
-+ struct vx_info *vxi;
+
-+ /* FIXME: move that down where we have the task */
-+ vxi = task_get_vx_info(timr->it_process);
-+ enter_vx_info(vxi, &vxis);
/*
* FIXME: if ->sigq is queued we can race with
* dequeue_signal()->do_schedule_next_timer().
-@@ -341,6 +348,9 @@ int posix_timer_event(struct k_itimer *t
+@@ -379,10 +381,18 @@ int posix_timer_event(struct k_itimer *t
+ rcu_read_lock();
+ task = pid_task(timr->it_pid, PIDTYPE_PID);
+ if (task) {
++ struct vx_info_save vxis;
++ struct vx_info *vxi;
++
++ vxi = get_vx_info(task->vx_info);
++ enter_vx_info(vxi, &vxis);
+ shared = !(timr->it_sigev_notify & SIGEV_THREAD_ID);
ret = send_sigqueue(timr->sigq, task, shared);
++ leave_vx_info(&vxis);
++ put_vx_info(vxi);
}
rcu_read_unlock();
+
-+ leave_vx_info(&vxis);
-+ put_vx_info(vxi);
/* If we failed to send the signal the timer stops. */
return ret > 0;
}
-diff -NurpP --minimal linux-2.6.29.1/kernel/printk.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/printk.c
---- linux-2.6.29.1/kernel/printk.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/printk.c 2009-03-24 14:48:36.000000000 +0100
-@@ -32,6 +32,7 @@
- #include <linux/security.h>
+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>
+ #include <linux/kexec.h>
+#include <linux/vs_cvirt.h>
#include <asm/uaccess.h>
-@@ -251,18 +252,13 @@ int do_syslog(int type, char __user *buf
+@@ -276,18 +277,13 @@ int do_syslog(int type, char __user *buf
unsigned i, j, limit, count;
int do_clear = 0;
char c;
error = -EINVAL;
if (!buf || len < 0)
goto out;
-@@ -273,6 +269,16 @@ int do_syslog(int type, char __user *buf
+@@ -298,6 +294,16 @@ int do_syslog(int type, char __user *buf
error = -EFAULT;
goto out;
}
error = wait_event_interruptible(log_wait,
(log_start - log_end));
if (error)
-@@ -297,16 +303,6 @@ int do_syslog(int type, char __user *buf
+@@ -322,16 +328,6 @@ int do_syslog(int type, char __user *buf
do_clear = 1;
/* FALL THRU */
case 3: /* Read last kernel messages */
count = len;
if (count > log_buf_len)
count = log_buf_len;
-diff -NurpP --minimal linux-2.6.29.1/kernel/ptrace.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/ptrace.c
---- linux-2.6.29.1/kernel/ptrace.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/ptrace.c 2009-03-24 14:48:36.000000000 +0100
-@@ -21,6 +21,7 @@
- #include <linux/audit.h>
+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>
+ #include <linux/uaccess.h>
+#include <linux/vs_context.h>
- #include <asm/pgtable.h>
- #include <asm/uaccess.h>
-@@ -159,6 +160,11 @@ int __ptrace_may_access(struct task_stru
+
+ /*
+@@ -151,6 +152,11 @@ int __ptrace_may_access(struct task_stru
dumpable = get_dumpable(task->mm);
if (!dumpable && !capable(CAP_SYS_PTRACE))
return -EPERM;
+ !task_vx_flags(task, VXF_STATE_ADMIN, 0))
+ return -EACCES;
- return security_ptrace_may_access(task, mode);
+ return security_ptrace_access_check(task, mode);
}
-@@ -596,6 +602,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.29.1/kernel/sched.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/sched.c
---- linux-2.6.29.1/kernel/sched.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/sched.c 2009-03-24 21:52:21.000000000 +0100
-@@ -72,6 +72,8 @@
+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>
#include <linux/ftrace.h>
+#include <linux/vs_sched.h>
+#include <linux/vs_cvirt.h>
- #include <trace/sched.h>
#include <asm/tlb.h>
-@@ -610,6 +612,16 @@ struct rq {
- #endif
- struct hrtimer hrtick_timer;
- #endif
-+ unsigned long norm_time;
-+ unsigned long idle_time;
-+#ifdef CONFIG_VSERVER_IDLETIME
-+ int idle_skip;
-+#endif
-+#ifdef CONFIG_VSERVER_HARDCPU
-+ struct list_head hold_queue;
-+ unsigned long nr_onhold;
-+ int idle_tokens;
-+#endif
-
- #ifdef CONFIG_SCHEDSTATS
- /* latency stats */
-@@ -1705,6 +1717,7 @@ static void update_avg(u64 *avg, u64 sam
+ #include <asm/irq_regs.h>
+@@ -237,6 +239,15 @@ static DEFINE_MUTEX(sched_domains_mutex)
- static void enqueue_task(struct rq *rq, struct task_struct *p, int wakeup)
- {
-+ // BUG_ON(p->state & TASK_ONHOLD);
- sched_info_queued(p);
- p->sched_class->enqueue_task(rq, p, wakeup);
- p->se.on_rq = 1;
-@@ -1828,6 +1841,8 @@ static inline void check_class_changed(s
- p->sched_class->prio_changed(rq, p, oldprio, running);
- }
+ #include <linux/cgroup.h>
-+#include "sched_mon.h"
++#if defined(CONFIG_FAIR_GROUP_SCHED) && defined(CONFIG_CFS_HARD_LIMITS)
++struct cfs_bandwidth {
++ spinlock_t cfs_runtime_lock;
++ ktime_t cfs_period;
++ u64 cfs_runtime;
++ struct hrtimer cfs_period_timer;
++};
++#endif
+
- #ifdef CONFIG_SMP
+ struct cfs_rq;
- /* Used instead of source_load when we know the type == 0 */
-@@ -1915,6 +1930,7 @@ migrate_task(struct task_struct *p, int
- {
- struct rq *rq = task_rq(p);
+ static LIST_HEAD(task_groups);
+@@ -251,6 +262,9 @@ struct task_group {
+ /* runqueue "owned" by this group on each cpu */
+ struct cfs_rq **cfs_rq;
+ unsigned long shares;
++#ifdef CONFIG_CFS_HARD_LIMITS
++ struct cfs_bandwidth cfs_bandwidth;
++#endif
+ #endif
-+ vxm_migrate_task(p, rq, dest_cpu);
- /*
- * If the task is not on a runqueue (and not running), then
- * it is sufficient to simply update the task's cpu field.
-@@ -2242,6 +2258,8 @@ static int sched_balance_self(int cpu, i
-
- #endif /* CONFIG_SMP */
-
-+#include "sched_hard.h"
-+
- /***
- * try_to_wake_up - wake up a thread
- * @p: the to-be-woken-up thread
-@@ -2286,6 +2304,13 @@ static int try_to_wake_up(struct task_st
- rq = task_rq_lock(p, &flags);
- update_rq_clock(rq);
- old_state = p->state;
-+
-+ /* we need to unhold suspended tasks */
-+ if (old_state & TASK_ONHOLD) {
-+ vx_unhold_task(p, rq);
-+ old_state = p->state;
-+ }
+ #ifdef CONFIG_RT_GROUP_SCHED
+@@ -404,6 +418,19 @@ struct cfs_rq {
+ unsigned long rq_weight;
+ #endif
+ #endif
++#ifdef CONFIG_CFS_HARD_LIMITS
++ /* set when the group is throttled on this cpu */
++ int cfs_throttled;
+
- if (!(old_state & state))
- goto out;
-
-@@ -2307,6 +2332,12 @@ static int try_to_wake_up(struct task_st
- /* might preempt at this point */
- rq = task_rq_lock(p, &flags);
- old_state = p->state;
++ /* runtime currently consumed by the group on this rq */
++ u64 cfs_time;
+
-+ /* we need to unhold suspended tasks
-+ if (old_state & TASK_ONHOLD) {
-+ vx_unhold_task(p, rq);
-+ old_state = p->state;
-+ } */
- if (!(old_state & state))
- goto out;
- if (p->se.on_rq)
-@@ -4169,16 +4200,19 @@ void account_user_time(struct task_struc
- cputime_t cputime_scaled)
- {
- struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+ struct vx_info *vxi = p->vx_info; /* p is _always_ current */
- cputime64_t tmp;
-+ int nice = (TASK_NICE(p) > 0);
-
- /* Add user time to process. */
- p->utime = cputime_add(p->utime, cputime);
- p->utimescaled = cputime_add(p->utimescaled, cputime_scaled);
-+ vx_account_user(vxi, cputime, nice);
- account_group_user_time(p, cputime);
++ /* runtime available to the group on this rq */
++ u64 cfs_runtime;
++
++ /* Protects the cfs runtime related fields of this cfs_rq */
++ spinlock_t cfs_runtime_lock;
++#endif
+ };
- /* Add user time to cpustat. */
- tmp = cputime_to_cputime64(cputime);
-- if (TASK_NICE(p) > 0)
-+ if (nice)
- cpustat->nice = cputime64_add(cpustat->nice, tmp);
- else
- cpustat->user = cputime64_add(cpustat->user, tmp);
-@@ -4222,6 +4256,7 @@ void account_system_time(struct task_str
- cputime_t cputime, cputime_t cputime_scaled)
- {
- struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+ struct vx_info *vxi = p->vx_info; /* p is _always_ current */
- cputime64_t tmp;
+ /* Real-Time classes' related field in a runqueue: */
+@@ -1586,6 +1613,7 @@ static void update_group_shares_cpu(stru
+ }
+ }
- if ((p->flags & PF_VCPU) && (irq_count() - hardirq_offset == 0)) {
-@@ -4232,6 +4267,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);
-+ vx_account_system(vxi, cputime, 0 /* do we have idle time? */);
- account_group_system_time(p, cputime);
++static inline int cfs_rq_throttled(struct cfs_rq *cfs_rq);
+ /*
+ * 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
+@@ -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.
++ * Also if the group is throttled on this cpu, pretend that
++ * it has no tasks.
+ */
+- if (!weight)
++ if (!weight || cfs_rq_throttled(tg->cfs_rq[i]))
+ weight = NICE_0_LOAD;
- /* Add system time to cpustat. */
-@@ -4587,6 +4623,11 @@ need_resched_nonpreemptible:
- idle_balance(cpu, rq);
+ 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);
- prev->sched_class->put_prev_task(rq, prev);
+
-+ vx_set_rq_time(rq, jiffies); /* update time */
-+ vx_schedule(prev, rq, cpu); /* hold if over limit */
-+ vx_try_unhold(rq, cpu); /* unhold if refilled */
++#if defined(CONFIG_RT_GROUP_SCHED) || defined(CONFIG_FAIR_GROUP_SCHED)
+
- next = pick_next_task(rq, prev);
-
- if (likely(prev != next)) {
-@@ -5152,7 +5193,7 @@ SYSCALL_DEFINE1(nice, int, increment)
- nice = 19;
-
- if (increment < 0 && !can_nice(current, nice))
-- return -EPERM;
-+ return vx_flags(VXF_IGNEG_NICE, 0) ? 0 : -EPERM;
-
- retval = security_task_setnice(current, nice);
- if (retval)
-@@ -8428,7 +8469,10 @@ void __init sched_init(void)
-
- #endif
- #endif /* CONFIG_FAIR_GROUP_SCHED */
--
-+#ifdef CONFIG_VSERVER_HARDCPU
-+ INIT_LIST_HEAD(&rq->hold_queue);
-+ rq->nr_onhold = 0;
-+#endif
- rq->rt.rt_runtime = def_rt_bandwidth.rt_runtime;
- #ifdef CONFIG_RT_GROUP_SCHED
- INIT_LIST_HEAD(&rq->leaf_rt_rq_list);
-diff -NurpP --minimal linux-2.6.29.1/kernel/sched_fair.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/sched_fair.c
---- linux-2.6.29.1/kernel/sched_fair.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/sched_fair.c 2009-03-24 14:48:36.000000000 +0100
-@@ -717,6 +717,9 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
- 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 __clear_buddies(struct cfs_rq *cfs_rq, struct sched_entity *se)
-@@ -760,6 +763,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st
-
- if (se != cfs_rq->curr)
- __dequeue_entity(cfs_rq, se);
-+ if (entity_is_task(se))
-+ vx_deactivate_task(task_of(se));
- account_entity_dequeue(cfs_rq, se);
- update_min_vruntime(cfs_rq);
- }
-diff -NurpP --minimal linux-2.6.29.1/kernel/sched_hard.h linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/sched_hard.h
---- linux-2.6.29.1/kernel/sched_hard.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/sched_hard.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,353 @@
-+
-+#ifdef CONFIG_VSERVER_IDLELIMIT
-+
-+/*
-+ * vx_idle_resched - reschedule after maxidle
-+ */
-+static inline
-+void vx_idle_resched(struct rq *rq)
++#ifdef CONFIG_SMP
++static inline const struct cpumask *sched_bw_period_mask(void)
+{
-+ /* maybe have a better criterion for paused */
-+ if (!--rq->idle_tokens && !list_empty(&rq->hold_queue))
-+ set_need_resched();
++ return cpu_rq(smp_processor_id())->rd->span;
+}
++#else /* !CONFIG_SMP */
++static inline const struct cpumask *sched_bw_period_mask(void)
++{
++ return cpu_online_mask;
++}
++#endif /* CONFIG_SMP */
+
-+#else /* !CONFIG_VSERVER_IDLELIMIT */
-+
-+#define vx_idle_resched(rq)
-+
-+#endif /* CONFIG_VSERVER_IDLELIMIT */
-+
++#else
++static inline const struct cpumask *sched_bw_period_mask(void)
++{
++ return cpu_online_mask;
++}
+
++#endif
+
-+#ifdef CONFIG_VSERVER_IDLETIME
++#ifdef CONFIG_FAIR_GROUP_SCHED
++#ifdef CONFIG_CFS_HARD_LIMITS
+
-+#define vx_set_rq_min_skip(rq, min) \
-+ (rq)->idle_skip = (min)
++/*
++ * Runtime allowed for a cfs group before it is hard limited.
++ * default: Infinite which means no hard limiting.
++ */
++u64 sched_cfs_runtime = RUNTIME_INF;
+
-+#define vx_save_min_skip(ret, min, val) \
-+ __vx_save_min_skip(ret, min, val)
++/*
++ * period over which we hard limit the cfs group's bandwidth.
++ * default: 0.5s
++ */
++u64 sched_cfs_period = 500000;
+
-+static inline
-+void __vx_save_min_skip(int ret, int *min, int val)
++static inline u64 global_cfs_period(void)
+{
-+ if (ret > -2)
-+ return;
-+ if ((*min > val) || !*min)
-+ *min = val;
++ return sched_cfs_period * NSEC_PER_USEC;
+}
+
-+static inline
-+int vx_try_skip(struct rq *rq, int cpu)
-+{
-+ /* artificially advance time */
-+ if (rq->idle_skip > 0) {
-+ vxdprintk(list_empty(&rq->hold_queue),
-+ "hold queue empty on cpu %d", cpu);
-+ rq->idle_time += rq->idle_skip;
-+ vxm_idle_skip(rq, cpu);
-+ return 1;
-+ }
-+ return 0;
++static inline u64 global_cfs_runtime(void)
++{
++ return RUNTIME_INF;
+}
+
-+#else /* !CONFIG_VSERVER_IDLETIME */
-+
-+#define vx_set_rq_min_skip(rq, min) \
-+ ({ int dummy = (min); dummy; })
++void do_sched_cfs_period_timer(struct cfs_bandwidth *cfs_b);
+
-+#define vx_save_min_skip(ret, min, val)
-+
-+static inline
-+int vx_try_skip(struct rq *rq, int cpu)
++static inline void cfs_rq_runtime_lock(struct cfs_rq *cfs_rq)
+{
-+ return 0;
++ spin_lock(&cfs_rq->cfs_runtime_lock);
+}
+
-+#endif /* CONFIG_VSERVER_IDLETIME */
-+
-+
-+
-+#ifdef CONFIG_VSERVER_HARDCPU
-+
-+#define vx_set_rq_max_idle(rq, max) \
-+ (rq)->idle_tokens = (max)
-+
-+#define vx_save_max_idle(ret, min, val) \
-+ __vx_save_max_idle(ret, min, val)
-+
-+static inline
-+void __vx_save_max_idle(int ret, int *min, int val)
++static inline void cfs_rq_runtime_unlock(struct cfs_rq *cfs_rq)
+{
-+ if (*min > val)
-+ *min = val;
++ spin_unlock(&cfs_rq->cfs_runtime_lock);
+}
+
++/*
++ * Refresh the runtimes of the throttled groups.
++ * But nothing much to do now, will populate this in later patches.
++ */
++static enum hrtimer_restart sched_cfs_period_timer(struct hrtimer *timer)
++{
++ struct cfs_bandwidth *cfs_b =
++ container_of(timer, struct cfs_bandwidth, cfs_period_timer);
++
++ do_sched_cfs_period_timer(cfs_b);
++ hrtimer_add_expires_ns(timer, ktime_to_ns(cfs_b->cfs_period));
++ return HRTIMER_RESTART;
++}
+
+/*
-+ * vx_hold_task - put a task on the hold queue
++ * TODO: Check if this kind of timer setup is sufficient for cfs or
++ * should we do what rt is doing.
+ */
-+static inline
-+void vx_hold_task(struct task_struct *p, struct rq *rq)
++static void start_cfs_bandwidth(struct task_group *tg)
+{
-+ // printk("@ hold_task(%p[%lx])\n", p, p->state);
++ struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth;
+
-+ /* ignore dead/killed tasks */
-+ if (unlikely(p->state & (TASK_DEAD | TASK_WAKEKILL)))
++ /*
++ * Timer isn't setup for groups with infinite runtime
++ */
++ if (cfs_b->cfs_runtime == RUNTIME_INF)
+ return;
+
-+ /* ignore sleeping tasks */
-+ if (unlikely(p->state & TASK_NORMAL))
++ if (hrtimer_active(&cfs_b->cfs_period_timer))
+ return;
+
-+ /* remove task from runqueue */
-+ if (likely(p->se.on_rq))
-+ dequeue_task(rq, p, 0);
-+ else
-+ printk("@ woops, task %p not on runqueue?\n", p);
-+
-+ p->state |= TASK_ONHOLD;
-+ /* a new one on hold */
-+ rq->nr_onhold++;
-+ vxm_hold_task(p, rq);
-+ list_add_tail(&p->hq, &rq->hold_queue);
-+ // list_add_tail(&p->run_list, &rq->hold_queue);
++ hrtimer_start_range_ns(&cfs_b->cfs_period_timer, cfs_b->cfs_period,
++ 0, HRTIMER_MODE_REL);
+}
+
-+/*
-+ * vx_unhold_task - put a task back to the runqueue
-+ */
-+static inline
-+void vx_unhold_task(struct task_struct *p, struct rq *rq)
++static void init_cfs_bandwidth(struct task_group *tg)
+{
-+ // printk("@ unhold_task(%p[%lx])\n", p, p->state);
-+ list_del_init(&p->hq);
-+ // list_del(&p->run_list);
-+ /* one less waiting */
-+ rq->nr_onhold--;
-+ p->state &= ~TASK_ONHOLD;
-+ enqueue_task(rq, p, 0);
-+ // ? inc_nr_running(p, rq);
-+ vxm_unhold_task(p, rq);
++ struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth;
++
++ cfs_b->cfs_period = ns_to_ktime(global_cfs_period());
++ cfs_b->cfs_runtime = global_cfs_runtime();
++
++ spin_lock_init(&cfs_b->cfs_runtime_lock);
++
++ hrtimer_init(&cfs_b->cfs_period_timer,
++ CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++ cfs_b->cfs_period_timer.function = &sched_cfs_period_timer;
+}
+
-+/*
-+ * vx_remove_hold - remove a task from the hold queue
-+ */
-+static inline
-+void vx_remove_hold(struct task_struct *p, struct rq *rq)
++static inline void destroy_cfs_bandwidth(struct task_group *tg)
+{
-+ printk("@ remove_hold(%p[%lx])\n", p, p->state);
-+ list_del_init(&p->hq);
-+ // list_del(&p->run_list);
-+ /* one less waiting */
-+ rq->nr_onhold--;
-+ p->state &= ~TASK_ONHOLD;
++ hrtimer_cancel(&tg->cfs_bandwidth.cfs_period_timer);
+}
+
-+unsigned long nr_onhold(void)
++static void init_cfs_hard_limits(struct cfs_rq *cfs_rq, struct task_group *tg)
+{
-+ unsigned long i, sum = 0;
-+
-+ for_each_online_cpu(i)
-+ sum += cpu_rq(i)->nr_onhold;
-+
-+ return sum;
++ cfs_rq->cfs_time = 0;
++ cfs_rq->cfs_throttled = 0;
++ cfs_rq->cfs_runtime = tg->cfs_bandwidth.cfs_runtime;
++ spin_lock_init(&cfs_rq->cfs_runtime_lock);
+}
+
++#else /* !CONFIG_CFS_HARD_LIMITS */
+
-+
-+static inline
-+int __vx_tokens_avail(struct _vx_sched_pc *sched_pc)
++static void init_cfs_bandwidth(struct task_group *tg)
+{
-+ return sched_pc->tokens;
++ return;
+}
+
-+static inline
-+void __vx_consume_token(struct _vx_sched_pc *sched_pc)
++static inline void destroy_cfs_bandwidth(struct task_group *tg)
+{
-+ sched_pc->tokens--;
++ return;
+}
+
-+static inline
-+int vx_need_resched(struct task_struct *p, int slice, int cpu)
++static void init_cfs_hard_limits(struct cfs_rq *cfs_rq, struct task_group *tg)
+{
-+ struct vx_info *vxi = p->vx_info;
-+
-+ if (vx_info_flags(vxi, VXF_SCHED_HARD|VXF_SCHED_PRIO, 0)) {
-+ struct _vx_sched_pc *sched_pc =
-+ &vx_per_cpu(vxi, sched_pc, cpu);
-+ int tokens;
-+
-+ /* maybe we can simplify that to decrement
-+ the token counter unconditional? */
-+
-+ if ((tokens = __vx_tokens_avail(sched_pc)) > 0)
-+ __vx_consume_token(sched_pc);
-+
-+ /* for tokens > 0, one token was consumed */
-+ if (tokens < 2)
-+ slice = 0;
-+ }
-+ vxm_need_resched(p, slice, cpu);
-+ return (slice == 0);
++ return;
+}
+
-+
-+#define vx_set_rq_time(rq, time) do { \
-+ rq->norm_time = time; \
-+} while (0)
-+
-+
-+static inline
-+void vx_try_unhold(struct rq *rq, int cpu)
++static inline void cfs_rq_runtime_lock(struct cfs_rq *cfs_rq)
+{
-+ struct vx_info *vxi = NULL;
-+ struct list_head *l, *n;
-+ int maxidle = HZ;
-+ int minskip = 0;
-+
-+ /* nothing to do? what about pause? */
-+ if (list_empty(&rq->hold_queue))
-+ return;
-+
-+ list_for_each_safe(l, n, &rq->hold_queue) {
-+ int ret, delta_min[2];
-+ struct _vx_sched_pc *sched_pc;
-+ struct task_struct *p;
-+
-+ p = list_entry(l, struct task_struct, hq);
-+ /* don't bother with same context */
-+ if (vxi == p->vx_info)
-+ continue;
-+
-+ vxi = p->vx_info;
-+ /* ignore paused contexts */
-+ if (vx_info_flags(vxi, VXF_SCHED_PAUSE, 0))
-+ continue;
-+
-+ sched_pc = &vx_per_cpu(vxi, sched_pc, cpu);
-+
-+ /* recalc tokens */
-+ vxm_sched_info(sched_pc, vxi, cpu);
-+ ret = vx_tokens_recalc(sched_pc,
-+ &rq->norm_time, &rq->idle_time, delta_min);
-+ vxm_tokens_recalc(sched_pc, rq, vxi, cpu);
-+
-+ if (ret > 0) {
-+ /* we found a runable context */
-+ vx_unhold_task(p, rq);
-+ break;
-+ }
-+ vx_save_max_idle(ret, &maxidle, delta_min[0]);
-+ vx_save_min_skip(ret, &minskip, delta_min[1]);
-+ }
-+ vx_set_rq_max_idle(rq, maxidle);
-+ vx_set_rq_min_skip(rq, minskip);
-+ vxm_rq_max_min(rq, cpu);
++ return;
+}
+
-+
-+static inline
-+int vx_schedule(struct task_struct *next, struct rq *rq, int cpu)
++static inline void cfs_rq_runtime_unlock(struct cfs_rq *cfs_rq)
+{
-+ struct vx_info *vxi = next->vx_info;
-+ struct _vx_sched_pc *sched_pc;
-+ int delta_min[2];
-+ int flags, ret;
-+
-+ if (!vxi)
-+ return 1;
-+
-+ flags = vxi->vx_flags;
-+
-+ if (unlikely(vs_check_flags(flags, VXF_SCHED_PAUSE, 0)))
-+ goto put_on_hold;
-+ if (!vs_check_flags(flags, VXF_SCHED_HARD | VXF_SCHED_PRIO, 0))
-+ return 1;
-+
-+ sched_pc = &vx_per_cpu(vxi, sched_pc, cpu);
-+#ifdef CONFIG_SMP
-+ /* update scheduler params */
-+ if (cpu_isset(cpu, vxi->sched.update)) {
-+ vx_update_sched_param(&vxi->sched, sched_pc);
-+ vxm_update_sched(sched_pc, vxi, cpu);
-+ cpu_clear(cpu, vxi->sched.update);
-+ }
-+#endif
-+ vxm_sched_info(sched_pc, vxi, cpu);
-+ ret = vx_tokens_recalc(sched_pc,
-+ &rq->norm_time, &rq->idle_time, delta_min);
-+ vxm_tokens_recalc(sched_pc, rq, vxi, cpu);
-+
-+ if (!vs_check_flags(flags, VXF_SCHED_HARD, 0))
-+ return 1;
-+
-+ if (unlikely(ret < 0)) {
-+ vx_save_max_idle(ret, &rq->idle_tokens, delta_min[0]);
-+ vx_save_min_skip(ret, &rq->idle_skip, delta_min[1]);
-+ vxm_rq_max_min(rq, cpu);
-+ put_on_hold:
-+ vx_hold_task(next, rq);
-+ return 0;
-+ }
-+ return 1;
++ return;
+}
+
++#endif /* CONFIG_CFS_HARD_LIMITS */
++#else /* !CONFIG_FAIR_GROUP_SCHED */
+
-+#else /* CONFIG_VSERVER_HARDCPU */
-+
-+static inline
-+void vx_hold_task(struct task_struct *p, struct rq *rq)
++static inline void cfs_rq_runtime_lock(struct cfs_rq *cfs_rq)
+{
+ return;
+}
+
-+static inline
-+void vx_unhold_task(struct task_struct *p, struct rq *rq)
++static inline void cfs_rq_runtime_unlock(struct cfs_rq *cfs_rq)
+{
+ return;
+}
+
-+unsigned long nr_onhold(void)
++static inline int cfs_rq_throttled(struct cfs_rq *cfs_rq)
+{
+ return 0;
+}
+
++#endif /* CONFIG_FAIR_GROUP_SCHED */
+
-+static inline
-+int vx_need_resched(struct task_struct *p, int slice, int cpu)
+ 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)
+ {
+- loads[0] = (avenrun[0] + offset) << shift;
+- loads[1] = (avenrun[1] + offset) << shift;
+- loads[2] = (avenrun[2] + offset) << shift;
++ if (vx_flags(VXF_VIRT_LOAD, 0)) {
++ struct vx_info *vxi = current_vx_info();
++
++ loads[0] = (vxi->cvirt.load[0] + offset) << shift;
++ loads[1] = (vxi->cvirt.load[1] + offset) << shift;
++ loads[2] = (vxi->cvirt.load[2] + offset) << shift;
++ } else {
++ loads[0] = (avenrun[0] + offset) << shift;
++ loads[1] = (avenrun[1] + offset) << shift;
++ loads[2] = (avenrun[2] + offset) << shift;
++ }
+ }
+
+ static unsigned long
+@@ -5245,16 +5452,19 @@ void account_user_time(struct task_struc
+ cputime_t cputime_scaled)
+ {
+ struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
++ struct vx_info *vxi = p->vx_info; /* p is _always_ current */
+ cputime64_t tmp;
++ int nice = (TASK_NICE(p) > 0);
+
+ /* Add user time to process. */
+ p->utime = cputime_add(p->utime, cputime);
+ p->utimescaled = cputime_add(p->utimescaled, cputime_scaled);
++ vx_account_user(vxi, cputime, nice);
+ account_group_user_time(p, cputime);
+
+ /* Add user time to cpustat. */
+ tmp = cputime_to_cputime64(cputime);
+- if (TASK_NICE(p) > 0)
++ if (nice)
+ cpustat->nice = cputime64_add(cpustat->nice, tmp);
+ else
+ cpustat->user = cputime64_add(cpustat->user, tmp);
+@@ -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;
++ struct vx_info *vxi = p->vx_info; /* p is _always_ current */
+ cputime64_t tmp;
+
+ if ((p->flags & PF_VCPU) && (irq_count() - hardirq_offset == 0)) {
+@@ -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);
++ vx_account_system(vxi, cputime, 0 /* do we have idle time? */);
+ account_group_system_time(p, cputime);
+
+ /* Add system time to cpustat. */
+@@ -6393,7 +6605,7 @@ SYSCALL_DEFINE1(nice, int, increment)
+ nice = 19;
+
+ if (increment < 0 && !can_nice(current, nice))
+- return -EPERM;
++ return vx_flags(VXF_IGNEG_NICE, 0) ? 0 : -EPERM;
+
+ retval = security_task_setnice(current, nice);
+ if (retval)
+@@ -9470,6 +9682,32 @@ static int update_sched_domains(struct n
+ }
+ #endif
+
++#ifdef CONFIG_SMP
++static void disable_runtime(struct rq *rq)
+{
-+ return (slice == 0);
-+}
-+
-+
-+#define vx_set_rq_time(rq, time)
++ unsigned long flags;
+
-+static inline
-+void vx_try_unhold(struct rq *rq, int cpu)
-+{
-+ return;
++ spin_lock_irqsave(&rq->lock, flags);
++#if defined(CONFIG_FAIR_GROUP_SCHED) && defined(CONFIG_CFS_HARD_LIMITS)
++ disable_runtime_cfs(rq);
++#endif
++ disable_runtime_rt(rq);
++ spin_unlock_irqrestore(&rq->lock, flags);
+}
+
-+static inline
-+int vx_schedule(struct task_struct *next, struct rq *rq, int cpu)
++static void enable_runtime(struct rq *rq)
+{
-+ struct vx_info *vxi = next->vx_info;
-+ struct _vx_sched_pc *sched_pc;
-+ int delta_min[2];
-+ int ret;
-+
-+ if (!vx_info_flags(vxi, VXF_SCHED_PRIO, 0))
-+ return 1;
++ unsigned long flags;
+
-+ sched_pc = &vx_per_cpu(vxi, sched_pc, cpu);
-+ vxm_sched_info(sched_pc, vxi, cpu);
-+ ret = vx_tokens_recalc(sched_pc,
-+ &rq->norm_time, &rq->idle_time, delta_min);
-+ vxm_tokens_recalc(sched_pc, rq, vxi, cpu);
-+ return 1;
++ spin_lock_irqsave(&rq->lock, flags);
++#if defined(CONFIG_FAIR_GROUP_SCHED) && defined(CONFIG_CFS_HARD_LIMITS)
++ enable_runtime_cfs(rq);
++#endif
++ enable_runtime_rt(rq);
++ spin_unlock_irqrestore(&rq->lock, flags);
+}
++#endif
+
-+#endif /* CONFIG_VSERVER_HARDCPU */
+ static int update_runtime(struct notifier_block *nfb,
+ unsigned long action, void *hcpu)
+ {
+@@ -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);
++ init_cfs_hard_limits(cfs_rq, tg);
+ cfs_rq->tg = tg;
+ if (add)
+ list_add(&cfs_rq->leaf_cfs_rq_list, &rq->leaf_cfs_rq_list);
+@@ -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
+
-diff -NurpP --minimal linux-2.6.29.1/kernel/sched_mon.h linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/sched_mon.h
---- linux-2.6.29.1/kernel/sched_mon.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/sched_mon.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,200 @@
+ #ifdef CONFIG_CGROUP_SCHED
+ list_add(&init_task_group.list, &task_groups);
+ INIT_LIST_HEAD(&init_task_group.children);
+@@ -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_cfs_hard_limits(&rq->cfs, &init_task_group);
+ init_task_group.shares = init_task_group_load;
+ INIT_LIST_HEAD(&rq->leaf_cfs_rq_list);
+ #ifdef CONFIG_CGROUP_SCHED
+@@ -9992,6 +10236,7 @@ static void free_fair_sched_group(struct
+ {
+ int i;
+
++ destroy_cfs_bandwidth(tg);
+ for_each_possible_cpu(i) {
+ if (tg->cfs_rq)
+ kfree(tg->cfs_rq[i]);
+@@ -10018,6 +10263,7 @@ int alloc_fair_sched_group(struct task_g
+ if (!tg->se)
+ goto err;
+
++ init_cfs_bandwidth(tg);
+ tg->shares = NICE_0_LOAD;
+
+ for_each_possible_cpu(i) {
+@@ -10734,6 +10980,100 @@ static u64 cpu_shares_read_u64(struct cg
+
+ return (u64) tg->shares;
+ }
+
-+#include <linux/vserver/monitor.h>
++#ifdef CONFIG_CFS_HARD_LIMITS
+
-+#ifdef CONFIG_VSERVER_MONITOR
++static int tg_set_cfs_bandwidth(struct task_group *tg,
++ u64 cfs_period, u64 cfs_runtime)
++{
++ int i;
+
-+#ifdef CONFIG_VSERVER_HARDCPU
-+#define HARDCPU(x) (x)
-+#else
-+#define HARDCPU(x) (0)
-+#endif
++ spin_lock_irq(&tg->cfs_bandwidth.cfs_runtime_lock);
++ tg->cfs_bandwidth.cfs_period = ns_to_ktime(cfs_period);
++ tg->cfs_bandwidth.cfs_runtime = cfs_runtime;
+
-+#ifdef CONFIG_VSERVER_IDLETIME
-+#define IDLETIME(x) (x)
-+#else
-+#define IDLETIME(x) (0)
-+#endif
++ for_each_possible_cpu(i) {
++ struct cfs_rq *cfs_rq = tg->cfs_rq[i];
+
-+struct _vx_mon_entry *vxm_advance(int cpu);
++ cfs_rq_runtime_lock(cfs_rq);
++ cfs_rq->cfs_runtime = cfs_runtime;
++ cfs_rq_runtime_unlock(cfs_rq);
++ }
+
++ start_cfs_bandwidth(tg);
++ spin_unlock_irq(&tg->cfs_bandwidth.cfs_runtime_lock);
++ return 0;
++}
+
-+static inline
-+void __vxm_basic(struct _vx_mon_entry *entry, xid_t xid, int type)
++int tg_set_cfs_runtime(struct task_group *tg, long cfs_runtime_us)
+{
-+ entry->type = type;
-+ entry->xid = xid;
++ u64 cfs_runtime, cfs_period;
++
++ cfs_period = ktime_to_ns(tg->cfs_bandwidth.cfs_period);
++ cfs_runtime = (u64)cfs_runtime_us * NSEC_PER_USEC;
++ if (cfs_runtime_us < 0)
++ cfs_runtime = RUNTIME_INF;
++
++ return tg_set_cfs_bandwidth(tg, cfs_period, cfs_runtime);
+}
+
-+static inline
-+void __vxm_sync(int cpu)
++long tg_get_cfs_runtime(struct task_group *tg)
+{
-+ struct _vx_mon_entry *entry = vxm_advance(cpu);
++ u64 cfs_runtime_us;
++
++ if (tg->cfs_bandwidth.cfs_runtime == RUNTIME_INF)
++ return -1;
+
-+ __vxm_basic(entry, 0, VXM_SYNC);
-+ entry->ev.sec = xtime.tv_sec;
-+ entry->ev.nsec = xtime.tv_nsec;
++ cfs_runtime_us = tg->cfs_bandwidth.cfs_runtime;
++ do_div(cfs_runtime_us, NSEC_PER_USEC);
++ return cfs_runtime_us;
+}
+
-+static inline
-+void __vxm_task(struct task_struct *p, int type)
++int tg_set_cfs_period(struct task_group *tg, long cfs_period_us)
+{
-+ struct _vx_mon_entry *entry = vxm_advance(task_cpu(p));
++ u64 cfs_runtime, cfs_period;
+
-+ __vxm_basic(entry, p->xid, type);
-+ entry->ev.tsk.pid = p->pid;
-+ entry->ev.tsk.state = p->state;
++ cfs_period = (u64)cfs_period_us * NSEC_PER_USEC;
++ cfs_runtime = tg->cfs_bandwidth.cfs_runtime;
++
++ if (cfs_period == 0)
++ return -EINVAL;
++
++ return tg_set_cfs_bandwidth(tg, cfs_period, cfs_runtime);
+}
+
-+static inline
-+void __vxm_sched(struct _vx_sched_pc *s, struct vx_info *vxi, int cpu)
++long tg_get_cfs_period(struct task_group *tg)
+{
-+ struct _vx_mon_entry *entry = vxm_advance(cpu);
++ u64 cfs_period_us;
+
-+ __vxm_basic(entry, vxi->vx_id, (VXM_SCHED | s->flags));
-+ entry->sd.tokens = s->tokens;
-+ entry->sd.norm_time = s->norm_time;
-+ entry->sd.idle_time = s->idle_time;
++ cfs_period_us = ktime_to_ns(tg->cfs_bandwidth.cfs_period);
++ do_div(cfs_period_us, NSEC_PER_USEC);
++ return cfs_period_us;
+}
+
-+static inline
-+void __vxm_rqinfo1(struct rq *q, int cpu)
++static s64 cpu_cfs_runtime_read_s64(struct cgroup *cgrp, struct cftype *cft)
+{
-+ struct _vx_mon_entry *entry = vxm_advance(cpu);
++ return tg_get_cfs_runtime(cgroup_tg(cgrp));
++}
+
-+ entry->type = VXM_RQINFO_1;
-+ entry->xid = ((unsigned long)q >> 16) & 0xffff;
-+ entry->q1.running = q->nr_running;
-+ entry->q1.onhold = HARDCPU(q->nr_onhold);
-+ entry->q1.iowait = atomic_read(&q->nr_iowait);
-+ entry->q1.uintr = q->nr_uninterruptible;
-+ entry->q1.idle_tokens = IDLETIME(q->idle_tokens);
++static int cpu_cfs_runtime_write_s64(struct cgroup *cgrp, struct cftype *cftype,
++ s64 cfs_runtime_us)
++{
++ return tg_set_cfs_runtime(cgroup_tg(cgrp), cfs_runtime_us);
+}
+
-+static inline
-+void __vxm_rqinfo2(struct rq *q, int cpu)
++static u64 cpu_cfs_period_read_u64(struct cgroup *cgrp, struct cftype *cft)
+{
-+ struct _vx_mon_entry *entry = vxm_advance(cpu);
++ return tg_get_cfs_period(cgroup_tg(cgrp));
++}
+
-+ entry->type = VXM_RQINFO_2;
-+ entry->xid = (unsigned long)q & 0xffff;
-+ entry->q2.norm_time = q->norm_time;
-+ entry->q2.idle_time = q->idle_time;
-+ entry->q2.idle_skip = IDLETIME(q->idle_skip);
++static int cpu_cfs_period_write_u64(struct cgroup *cgrp, struct cftype *cftype,
++ u64 cfs_period_us)
++{
++ return tg_set_cfs_period(cgroup_tg(cgrp), cfs_period_us);
+}
+
-+static inline
-+void __vxm_update(struct _vx_sched_pc *s, struct vx_info *vxi, int cpu)
++#endif /* CONFIG_CFS_HARD_LIMITS */
+ #endif /* CONFIG_FAIR_GROUP_SCHED */
+
+ #ifdef CONFIG_RT_GROUP_SCHED
+@@ -10767,6 +11107,18 @@ static struct cftype cpu_files[] = {
+ .read_u64 = cpu_shares_read_u64,
+ .write_u64 = cpu_shares_write_u64,
+ },
++#ifdef CONFIG_CFS_HARD_LIMITS
++ {
++ .name = "cfs_runtime_us",
++ .read_s64 = cpu_cfs_runtime_read_s64,
++ .write_s64 = cpu_cfs_runtime_write_s64,
++ },
++ {
++ .name = "cfs_period_us",
++ .read_u64 = cpu_cfs_period_read_u64,
++ .write_u64 = cpu_cfs_period_write_u64,
++ },
++#endif /* CONFIG_CFS_HARD_LIMITS */
+ #endif
+ #ifdef CONFIG_RT_GROUP_SCHED
+ {
+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);
+ P(se->wait_count);
++#ifdef CONFIG_CFS_HARD_LIMITS
++ PN(se->throttle_max);
++ PN(se->throttle_sum);
++ P(se->throttle_count);
++#endif
+ #endif
+ P(se->load.weight);
+ #undef PN
+@@ -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
++#ifdef CONFIG_CFS_HARD_LIMITS
++ spin_lock_irqsave(&rq->lock, flags);
++ SEQ_printf(m, " .%-30s: %d\n", "cfs_throttled",
++ cfs_rq->cfs_throttled);
++ SEQ_printf(m, " .%-30s: %Ld.%06ld\n", "cfs_time",
++ SPLIT_NS(cfs_rq->cfs_time));
++ SEQ_printf(m, " .%-30s: %Ld.%06ld\n", "cfs_runtime",
++ SPLIT_NS(cfs_rq->cfs_runtime));
++ spin_unlock_irqrestore(&rq->lock, flags);
++#endif /* CONFIG_CFS_HARD_LIMITS */
+ print_cfs_group_stats(m, cpu, cfs_rq->tg);
+ #endif
+ }
+@@ -309,7 +324,7 @@ static int sched_debug_show(struct seq_f
+ u64 now = ktime_to_ns(ktime_get());
+ int cpu;
+
+- SEQ_printf(m, "Sched Debug Version: v0.09, %s %.*s\n",
++ SEQ_printf(m, "Sched Debug Version: v0.10, %s %.*s\n",
+ init_utsname()->release,
+ (int)strcspn(init_utsname()->version, " "),
+ init_utsname()->version);
+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
+ }
+ }
+
+-#else /* !CONFIG_FAIR_GROUP_SCHED */
++#ifdef CONFIG_CFS_HARD_LIMITS
++
++static inline void update_stats_throttle_start(struct cfs_rq *cfs_rq,
++ struct sched_entity *se)
+{
-+ struct _vx_mon_entry *entry = vxm_advance(cpu);
++ schedstat_set(se->throttle_start, rq_of(cfs_rq)->clock);
++}
+
-+ __vxm_basic(entry, vxi->vx_id, VXM_UPDATE);
-+ entry->ev.tokens = s->tokens;
++static inline void update_stats_throttle_end(struct cfs_rq *cfs_rq,
++ struct sched_entity *se)
++{
++ schedstat_set(se->throttle_max, max(se->throttle_max,
++ rq_of(cfs_rq)->clock - se->throttle_start));
++ schedstat_set(se->throttle_count, se->throttle_count + 1);
++ schedstat_set(se->throttle_sum, se->throttle_sum +
++ rq_of(cfs_rq)->clock - se->throttle_start);
++ schedstat_set(se->throttle_start, 0);
+}
+
+static inline
-+void __vxm_update1(struct _vx_sched_pc *s, struct vx_info *vxi, int cpu)
++struct cfs_rq *sched_cfs_period_cfs_rq(struct cfs_bandwidth *cfs_b, int cpu)
+{
-+ struct _vx_mon_entry *entry = vxm_advance(cpu);
++ return container_of(cfs_b, struct task_group,
++ cfs_bandwidth)->cfs_rq[cpu];
++}
+
-+ __vxm_basic(entry, vxi->vx_id, VXM_UPDATE_1);
-+ entry->u1.tokens_max = s->tokens_max;
-+ entry->u1.fill_rate = s->fill_rate[0];
-+ entry->u1.interval = s->interval[0];
++static inline int cfs_rq_throttled(struct cfs_rq *cfs_rq)
++{
++ return cfs_rq->cfs_throttled;
+}
+
-+static inline
-+void __vxm_update2(struct _vx_sched_pc *s, struct vx_info *vxi, int cpu)
++#ifdef CONFIG_SMP
++/*
++ * Ensure this RQ takes back all the runtime it lend to its neighbours.
++ */
++static void disable_runtime_cfs(struct rq *rq)
+{
-+ struct _vx_mon_entry *entry = vxm_advance(cpu);
++ struct root_domain *rd = rq->rd;
++ struct cfs_rq *cfs_rq;
+
-+ __vxm_basic(entry, vxi->vx_id, VXM_UPDATE_2);
-+ entry->u2.tokens_min = s->tokens_min;
-+ entry->u2.fill_rate = s->fill_rate[1];
-+ entry->u2.interval = s->interval[1];
-+}
++ if (unlikely(!scheduler_running))
++ return;
++
++ for_each_leaf_cfs_rq(rq, cfs_rq) {
++ struct cfs_bandwidth *cfs_b = &cfs_rq->tg->cfs_bandwidth;
++ s64 want;
++ int i;
++
++ spin_lock(&cfs_b->cfs_runtime_lock);
++ spin_lock(&cfs_rq->cfs_runtime_lock);
++
++ /*
++ * Either we're all are infinity and nobody needs to borrow,
++ * or we're already disabled and this have nothing to do, or
++ * we have exactly the right amount of runtime to take out.
++ */
++ if (cfs_rq->cfs_runtime == RUNTIME_INF ||
++ cfs_rq->cfs_runtime == cfs_b->cfs_runtime)
++ goto balanced;
++ spin_unlock(&cfs_rq->cfs_runtime_lock);
++
++ /*
++ * Calculate the difference between what we started out with
++ * and what we current have, that's the amount of runtime
++ * we lend and now have to reclaim.
++ */
++ want = cfs_b->cfs_runtime - cfs_rq->cfs_runtime;
++
++ /*
++ * Greedy reclaim, take back as much as possible.
++ */
++ for_each_cpu(i, rd->span) {
++ struct cfs_rq *iter = sched_cfs_period_cfs_rq(cfs_b, i);
++ s64 diff;
++
++ /*
++ * Can't reclaim from ourselves or disabled runqueues.
++ */
++ if (iter == cfs_rq || iter->cfs_runtime == RUNTIME_INF)
++ continue;
+
++ spin_lock(&iter->cfs_runtime_lock);
++ if (want > 0) {
++ diff = min_t(s64, iter->cfs_runtime, want);
++ iter->cfs_runtime -= diff;
++ want -= diff;
++ } else {
++ iter->cfs_runtime -= want;
++ want -= want;
++ }
+
-+#define vxm_activate_task(p,q) __vxm_task(p, VXM_ACTIVATE)
-+#define vxm_activate_idle(p,q) __vxm_task(p, VXM_IDLE)
-+#define vxm_deactivate_task(p,q) __vxm_task(p, VXM_DEACTIVATE)
-+#define vxm_hold_task(p,q) __vxm_task(p, VXM_HOLD)
-+#define vxm_unhold_task(p,q) __vxm_task(p, VXM_UNHOLD)
++ spin_unlock(&iter->cfs_runtime_lock);
++ if (!want)
++ break;
++ }
+
-+static inline
-+void vxm_migrate_task(struct task_struct *p, struct rq *rq, int dest)
++ spin_lock(&cfs_rq->cfs_runtime_lock);
++ /*
++ * We cannot be left wanting - that would mean some
++ * runtime leaked out of the system.
++ */
++ BUG_ON(want);
++balanced:
++ /*
++ * Disable all the borrow logic by pretending we have infinite
++ * runtime - in which case borrowing doesn't make sense.
++ */
++ cfs_rq->cfs_runtime = RUNTIME_INF;
++ spin_unlock(&cfs_rq->cfs_runtime_lock);
++ spin_unlock(&cfs_b->cfs_runtime_lock);
++ }
++}
++
++static void enable_runtime_cfs(struct rq *rq)
+{
-+ __vxm_task(p, VXM_MIGRATE);
-+ __vxm_rqinfo1(rq, task_cpu(p));
-+ __vxm_rqinfo2(rq, task_cpu(p));
++ struct cfs_rq *cfs_rq;
++
++ if (unlikely(!scheduler_running))
++ return;
++
++ /*
++ * Reset each runqueue's bandwidth settings
++ */
++ for_each_leaf_cfs_rq(rq, cfs_rq) {
++ struct cfs_bandwidth *cfs_b = &cfs_rq->tg->cfs_bandwidth;
++
++ spin_lock(&cfs_b->cfs_runtime_lock);
++ spin_lock(&cfs_rq->cfs_runtime_lock);
++ cfs_rq->cfs_runtime = cfs_b->cfs_runtime;
++ cfs_rq->cfs_time = 0;
++ cfs_rq->cfs_throttled = 0;
++ spin_unlock(&cfs_rq->cfs_runtime_lock);
++ spin_unlock(&cfs_b->cfs_runtime_lock);
++ }
+}
+
-+static inline
-+void vxm_idle_skip(struct rq *rq, int cpu)
++/*
++ * Ran out of runtime, check if we can borrow some from others
++ * instead of getting throttled right away.
++ */
++static void do_cfs_balance_runtime(struct cfs_rq *cfs_rq)
+{
-+ __vxm_rqinfo1(rq, cpu);
-+ __vxm_rqinfo2(rq, cpu);
++ struct cfs_bandwidth *cfs_b = &cfs_rq->tg->cfs_bandwidth;
++ const struct cpumask *span = sched_bw_period_mask();
++ int i, weight;
++ u64 cfs_period;
++
++ weight = cpumask_weight(span);
++ spin_lock(&cfs_b->cfs_runtime_lock);
++ cfs_period = ktime_to_ns(cfs_b->cfs_period);
++
++ for_each_cpu(i, span) {
++ struct cfs_rq *borrow_cfs_rq =
++ sched_cfs_period_cfs_rq(cfs_b, i);
++ s64 diff;
++
++ if (borrow_cfs_rq == cfs_rq)
++ continue;
++
++ cfs_rq_runtime_lock(borrow_cfs_rq);
++ if (borrow_cfs_rq->cfs_runtime == RUNTIME_INF) {
++ cfs_rq_runtime_unlock(borrow_cfs_rq);
++ continue;
++ }
++
++ diff = borrow_cfs_rq->cfs_runtime - borrow_cfs_rq->cfs_time;
++ if (diff > 0) {
++ diff = div_u64((u64)diff, weight);
++ if (cfs_rq->cfs_runtime + diff > cfs_period)
++ diff = cfs_period - cfs_rq->cfs_runtime;
++ borrow_cfs_rq->cfs_runtime -= diff;
++ cfs_rq->cfs_runtime += diff;
++ if (cfs_rq->cfs_runtime == cfs_period) {
++ cfs_rq_runtime_unlock(borrow_cfs_rq);
++ break;
++ }
++ }
++ cfs_rq_runtime_unlock(borrow_cfs_rq);
++ }
++ spin_unlock(&cfs_b->cfs_runtime_lock);
+}
+
-+static inline
-+void vxm_need_resched(struct task_struct *p, int slice, int cpu)
++/*
++ * Called with rq->runtime_lock held.
++ */
++static void cfs_balance_runtime(struct cfs_rq *cfs_rq)
+{
-+ if (slice)
-+ return;
++ cfs_rq_runtime_unlock(cfs_rq);
++ do_cfs_balance_runtime(cfs_rq);
++ cfs_rq_runtime_lock(cfs_rq);
++}
++
++#else /* !CONFIG_SMP */
+
-+ __vxm_task(p, VXM_RESCHED);
++static void cfs_balance_runtime(struct cfs_rq *cfs_rq)
++{
++ return;
+}
++#endif /* CONFIG_SMP */
+
-+static inline
-+void vxm_sync(unsigned long now, int cpu)
++/*
++ * Check if group entity exceeded its runtime. If so, mark the cfs_rq as
++ * throttled mark the current task for reschedling.
++ */
++static void sched_cfs_runtime_exceeded(struct sched_entity *se,
++ struct task_struct *tsk_curr, unsigned long delta_exec)
+{
-+ if (!CONFIG_VSERVER_MONITOR_SYNC ||
-+ (now % CONFIG_VSERVER_MONITOR_SYNC))
++ struct cfs_rq *cfs_rq;
++
++ cfs_rq = group_cfs_rq(se);
++
++ if (cfs_rq->cfs_runtime == RUNTIME_INF)
++ return;
++
++ cfs_rq->cfs_time += delta_exec;
++
++ if (cfs_rq_throttled(cfs_rq))
+ return;
+
-+ __vxm_sync(cpu);
++ if (cfs_rq->cfs_time > cfs_rq->cfs_runtime)
++ cfs_balance_runtime(cfs_rq);
++
++ if (cfs_rq->cfs_time > cfs_rq->cfs_runtime) {
++ cfs_rq->cfs_throttled = 1;
++ update_stats_throttle_start(cfs_rq, se);
++ resched_task(tsk_curr);
++ }
++}
++
++static inline void update_curr_group(struct sched_entity *curr,
++ unsigned long delta_exec, struct task_struct *tsk_curr)
++{
++ sched_cfs_runtime_exceeded(curr, tsk_curr, delta_exec);
+}
+
-+#define vxm_sched_info(s,v,c) __vxm_sched(s,v,c)
++static void enqueue_entity_locked(struct cfs_rq *cfs_rq,
++ struct sched_entity *se, int flags);
+
-+static inline
-+void vxm_tokens_recalc(struct _vx_sched_pc *s, struct rq *rq,
-+ struct vx_info *vxi, int cpu)
++static void enqueue_throttled_entity(struct rq *rq, struct sched_entity *se)
+{
-+ __vxm_sched(s, vxi, cpu);
-+ __vxm_rqinfo2(rq, cpu);
++ for_each_sched_entity(se) {
++ struct cfs_rq *gcfs_rq = group_cfs_rq(se);
++
++ if (se->on_rq || cfs_rq_throttled(gcfs_rq) ||
++ !gcfs_rq->nr_running)
++ break;
++ enqueue_entity_locked(cfs_rq_of(se), se, 0);
++ }
+}
+
-+static inline
-+void vxm_update_sched(struct _vx_sched_pc *s, struct vx_info *vxi, int cpu)
++/*
++ * Refresh runtimes of all cfs_rqs in this group, i,e.,
++ * refresh runtimes of the representative cfs_rq of this
++ * tg on all cpus. Enqueue any throttled entity back.
++ */
++void do_sched_cfs_period_timer(struct cfs_bandwidth *cfs_b)
+{
-+ __vxm_sched(s, vxi, cpu);
-+ __vxm_update(s, vxi, cpu);
-+ __vxm_update1(s, vxi, cpu);
-+ __vxm_update2(s, vxi, cpu);
++ int i;
++ const struct cpumask *span = sched_bw_period_mask();
++ unsigned long flags;
++
++ for_each_cpu(i, span) {
++ struct rq *rq = cpu_rq(i);
++ struct cfs_rq *cfs_rq = sched_cfs_period_cfs_rq(cfs_b, i);
++ struct sched_entity *se = cfs_rq->tg->se[i];
++
++ spin_lock_irqsave(&rq->lock, flags);
++ cfs_rq_runtime_lock(cfs_rq);
++ cfs_rq->cfs_time = 0;
++ if (cfs_rq_throttled(cfs_rq)) {
++ update_rq_clock(rq);
++ update_stats_throttle_end(cfs_rq, se);
++ cfs_rq->cfs_throttled = 0;
++ enqueue_throttled_entity(rq, se);
++ }
++ cfs_rq_runtime_unlock(cfs_rq);
++ spin_unlock_irqrestore(&rq->lock, flags);
++ }
+}
+
-+static inline
-+void vxm_rq_max_min(struct rq *rq, int cpu)
++#else
++
++static inline void update_curr_group(struct sched_entity *curr,
++ unsigned long delta_exec, struct task_struct *tsk_curr)
+{
-+ __vxm_rqinfo1(rq, cpu);
-+ __vxm_rqinfo2(rq, cpu);
++ return;
+}
+
-+#else /* CONFIG_VSERVER_MONITOR */
++static inline int cfs_rq_throttled(struct cfs_rq *cfs_rq)
++{
++ return 0;
++}
+
-+#define vxm_activate_task(t,q) do { } while (0)
-+#define vxm_activate_idle(t,q) do { } while (0)
-+#define vxm_deactivate_task(t,q) do { } while (0)
-+#define vxm_hold_task(t,q) do { } while (0)
-+#define vxm_unhold_task(t,q) do { } while (0)
-+#define vxm_migrate_task(t,q,d) do { } while (0)
-+#define vxm_idle_skip(q,c) do { } while (0)
-+#define vxm_need_resched(t,s,c) do { } while (0)
-+#define vxm_sync(s,c) do { } while (0)
-+#define vxm_sched_info(s,v,c) do { } while (0)
-+#define vxm_tokens_recalc(s,q,v,c) do { } while (0)
-+#define vxm_update_sched(s,v,c) do { } while (0)
-+#define vxm_rq_max_min(q,c) do { } while (0)
++#endif /* CONFIG_CFS_HARD_LIMITS */
+
-+#endif /* CONFIG_VSERVER_MONITOR */
++#else /* CONFIG_FAIR_GROUP_SCHED */
+
-diff -NurpP --minimal linux-2.6.29.1/kernel/signal.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/signal.c
---- linux-2.6.29.1/kernel/signal.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/signal.c 2009-03-24 14:48:36.000000000 +0100
-@@ -27,6 +27,8 @@
- #include <linux/freezer.h>
- #include <linux/pid_namespace.h>
- #include <linux/nsproxy.h>
-+#include <linux/vs_context.h>
-+#include <linux/vs_pid.h>
- #include <trace/sched.h>
++static inline void update_curr_group(struct sched_entity *curr,
++ unsigned long delta_exec, struct task_struct *tsk_curr)
++{
++ return;
++}
- #include <asm/param.h>
-@@ -584,6 +586,14 @@ static int check_kill_permission(int sig
- if (!valid_signal(sig))
- return -EINVAL;
+ static inline struct task_struct *task_of(struct sched_entity *se)
+ {
+@@ -254,7 +555,6 @@ find_matching_se(struct sched_entity **s
-+ if ((info != SEND_SIG_NOINFO) &&
-+ (is_si_special(info) || !SI_FROMUSER(info)))
-+ goto skip;
+ #endif /* CONFIG_FAIR_GROUP_SCHED */
+
+-
+ /**************************************************************
+ * Scheduling class tree data structure manipulation methods:
+ */
+@@ -493,14 +793,25 @@ __update_curr(struct cfs_rq *cfs_rq, str
+ update_min_vruntime(cfs_rq);
+ }
+
+-static void update_curr(struct cfs_rq *cfs_rq)
++static void update_curr_task(struct sched_entity *curr,
++ unsigned long delta_exec)
++{
++ struct task_struct *curtask = task_of(curr);
+
-+ vxdprintk(VXD_CBIT(misc, 7),
-+ "check_kill_permission(%d,%p,%p[#%u,%u])",
-+ sig, info, t, vx_task_xid(t), t->pid);
++ trace_sched_stat_runtime(curtask, delta_exec, curr->vruntime);
++ cpuacct_charge(curtask, delta_exec);
++ account_group_exec_runtime(curtask, delta_exec);
++}
+
- if (info != SEND_SIG_NOINFO && (is_si_special(info) || SI_FROMKERNEL(info)))
- return 0;
++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_task;
++ struct rq *rq = rq_of(cfs_rq);
++ u64 now = rq->clock_task;
+ unsigned long delta_exec;
+
+ if (unlikely(!curr))
+- return;
++ return 1;
-@@ -611,6 +621,18 @@ static int check_kill_permission(int sig
- }
+ /*
+ * Get the amount of time the current task was running
+@@ -509,17 +820,29 @@ static void update_curr(struct cfs_rq *c
+ */
+ delta_exec = (unsigned long)(now - curr->exec_start);
+ if (!delta_exec)
+- return;
++ return 1;
+
+ __update_curr(cfs_rq, curr, delta_exec);
+ curr->exec_start = now;
++ *delta = delta_exec;
++ return 0;
++}
+
+- if (entity_is_task(curr)) {
+- struct task_struct *curtask = task_of(curr);
++static void update_curr(struct cfs_rq *cfs_rq)
++{
++ struct sched_entity *curr = cfs_rq->curr;
++ struct rq *rq = rq_of(cfs_rq);
++ unsigned long delta_exec;
+
+- trace_sched_stat_runtime(curtask, delta_exec, curr->vruntime);
+- cpuacct_charge(curtask, delta_exec);
+- account_group_exec_runtime(curtask, delta_exec);
++ if (update_curr_common(cfs_rq, &delta_exec))
++ return ;
++
++ if (entity_is_task(curr))
++ update_curr_task(curr, delta_exec);
++ else {
++ cfs_rq_runtime_lock(group_cfs_rq(curr));
++ update_curr_group(curr, delta_exec, rq->curr);
++ cfs_rq_runtime_unlock(group_cfs_rq(curr));
}
+ }
-+ error = -EPERM;
-+ if (t->pid == 1 && current->xid)
-+ return error;
+@@ -748,6 +1071,25 @@ place_entity(struct cfs_rq *cfs_rq, stru
+ #define ENQUEUE_MIGRATE 2
+
+ static void
++enqueue_entity_common(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
++{
++ account_entity_enqueue(cfs_rq, se);
+
-+ error = -ESRCH;
-+ if (!vx_check(vx_task_xid(t), VS_WATCH_P | VS_IDENT)) {
-+ vxdprintk(current->xid || VXD_CBIT(misc, 7),
-+ "signal %d[%p] xid mismatch %p[#%u,%u] xid=#%u",
-+ sig, info, t, vx_task_xid(t), t->pid, current->xid);
-+ return error;
++ if (flags & ENQUEUE_WAKEUP) {
++ place_entity(cfs_rq, se, 0);
++ enqueue_sleeper(cfs_rq, se);
+ }
-+skip:
- return security_task_kill(t, info, sig, 0);
++
++ 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 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 flags)
++{
++ /*
++ * Update run-time statistics of the 'current'.
++ */
++ // update_curr_locked(cfs_rq);
++ enqueue_entity_common(cfs_rq, se, flags);
}
-@@ -1076,7 +1098,7 @@ int kill_pid_info(int sig, struct siginf
- rcu_read_lock();
- retry:
- p = pid_task(pid, PIDTYPE_PID);
-- if (p) {
-+ if (p && vx_check(vx_task_xid(p), VS_ADMIN | VS_IDENT)) {
- error = group_send_sig_info(sig, info, p);
- if (unlikely(error == -ESRCH))
- /*
-@@ -1115,7 +1137,7 @@ int kill_pid_info_as_uid(int sig, struct
+ static void __clear_buddies(struct cfs_rq *cfs_rq, struct sched_entity *se)
+@@ -815,6 +1157,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st
- read_lock(&tasklist_lock);
- p = pid_task(pid, PIDTYPE_PID);
-- if (!p) {
-+ if (!p || !vx_check(vx_task_xid(p), VS_IDENT)) {
- ret = -ESRCH;
- goto out_unlock;
- }
-@@ -1169,8 +1191,10 @@ static int kill_something_info(int sig,
- struct task_struct * p;
+ if (se != cfs_rq->curr)
+ __dequeue_entity(cfs_rq, se);
++ if (entity_is_task(se))
++ vx_deactivate_task(task_of(se));
+ account_entity_dequeue(cfs_rq, se);
+ update_min_vruntime(cfs_rq);
- for_each_process(p) {
-- if (task_pid_vnr(p) > 1 &&
-- !same_thread_group(p, current)) {
-+ if (vx_check(vx_task_xid(p), VS_ADMIN|VS_IDENT) &&
-+ task_pid_vnr(p) > 1 &&
-+ !same_thread_group(p, current) &&
-+ !vx_current_initpid(p->pid)) {
- int err = group_send_sig_info(sig, info, p);
- ++count;
- if (err != -EPERM)
-@@ -1849,6 +1873,11 @@ relock:
- !signal_group_exit(signal))
- continue;
+@@ -919,6 +1263,32 @@ static struct sched_entity *pick_next_en
+ return se;
+ }
-+ /* virtual init is protected against user signals */
-+ if ((info->si_code == SI_USER) &&
-+ vx_current_initpid(current->pid))
-+ continue;
++/*
++ * Called from put_prev_entity()
++ * If a group entity (@se) is found to be throttled, it will not be put back
++ * on @cfs_rq, which is equivalent to dequeing it.
++ */
++static int dequeue_throttled_entity(struct cfs_rq *cfs_rq,
++ struct sched_entity *se)
++{
++ struct cfs_rq *gcfs_rq = group_cfs_rq(se);
+
- if (sig_kernel_stop(signr)) {
- /*
- * The default action is to stop all threads in
-diff -NurpP --minimal linux-2.6.29.1/kernel/softirq.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/softirq.c
---- linux-2.6.29.1/kernel/softirq.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/softirq.c 2009-03-24 14:48:36.000000000 +0100
-@@ -23,6 +23,7 @@
- #include <linux/rcupdate.h>
- #include <linux/smp.h>
- #include <linux/tick.h>
-+#include <linux/vs_context.h>
++ if (entity_is_task(se))
++ return 0;
++
++ cfs_rq_runtime_lock(gcfs_rq);
++ if (!cfs_rq_throttled(gcfs_rq) && gcfs_rq->nr_running) {
++ cfs_rq_runtime_unlock(gcfs_rq);
++ return 0;
++ }
++
++ __clear_buddies(cfs_rq, se);
++ account_entity_dequeue(cfs_rq, se);
++ cfs_rq->curr = NULL;
++ cfs_rq_runtime_unlock(gcfs_rq);
++ return 1;
++}
++
+ static void put_prev_entity(struct cfs_rq *cfs_rq, struct sched_entity *prev)
+ {
+ /*
+@@ -930,6 +1300,8 @@ static void put_prev_entity(struct cfs_r
- #include <asm/irq.h>
- /*
-diff -NurpP --minimal linux-2.6.29.1/kernel/sys.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/sys.c
---- linux-2.6.29.1/kernel/sys.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/sys.c 2009-03-24 14:48:36.000000000 +0100
-@@ -39,6 +39,7 @@
- #include <linux/syscalls.h>
- #include <linux/kprobes.h>
- #include <linux/user_namespace.h>
-+#include <linux/vs_pid.h>
+ check_spread(cfs_rq, prev);
+ if (prev->on_rq) {
++ if (dequeue_throttled_entity(cfs_rq, prev))
++ return;
+ update_stats_wait_start(cfs_rq, prev);
+ /* Put 'current' back into the tree. */
+ __enqueue_entity(cfs_rq, prev);
+@@ -1026,10 +1398,28 @@ static inline void hrtick_update(struct
+ }
+ #endif
- #include <asm/uaccess.h>
- #include <asm/io.h>
-@@ -128,7 +129,10 @@ static int set_one_prio(struct task_stru
- goto out;
- }
- if (niceval < task_nice(p) && !can_nice(p, niceval)) {
-- error = -EACCES;
++static int enqueue_group_entity(struct cfs_rq *cfs_rq, struct sched_entity *se,
++ int flags)
++{
++ struct cfs_rq *gcfs_rq = group_cfs_rq(se);
++ int ret = 0;
++
++ cfs_rq_runtime_lock(gcfs_rq);
++ if (cfs_rq_throttled(gcfs_rq)) {
++ ret = 1;
++ goto out;
++ }
++ enqueue_entity_locked(cfs_rq, se, flags);
++out:
++ cfs_rq_runtime_unlock(gcfs_rq);
++ return ret;
++}
++
+ /*
+ * The enqueue_task method is called before nr_running is
+ * increased. Here we update the fair scheduling stats and
+ * 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, 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, flags);
++ if (entity_is_task(se))
++ enqueue_entity(cfs_rq, se, flags);
++ else
++ if (enqueue_group_entity(cfs_rq, se, flags))
++ break;
+ flags = ENQUEUE_WAKEUP;
+ }
+-
+ hrtick_update(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;
++
++ /*
++ * If this cfs_rq is throttled, then it is already
++ * dequeued.
++ */
++ cfs_rq_runtime_lock(cfs_rq);
++ if (cfs_rq_throttled(cfs_rq)) {
++ cfs_rq_runtime_unlock(cfs_rq);
++ break;
++ }
++ cfs_rq_runtime_unlock(cfs_rq);
+ sleep = 1;
+ }
+
+@@ -1896,9 +2301,10 @@ load_balance_fair(struct rq *this_rq, in
+ u64 rem_load, moved_load;
+
+ /*
+- * empty group
++ * empty group or throttled group
+ */
+- if (!busiest_cfs_rq->task_weight)
++ if (!busiest_cfs_rq->task_weight ||
++ cfs_rq_throttled(busiest_cfs_rq))
+ continue;
+
+ rem_load = (u64)rem_load_move * busiest_weight;
+@@ -1947,6 +2353,12 @@ move_one_task_fair(struct rq *this_rq, i
+
+ for_each_leaf_cfs_rq(busiest, busy_cfs_rq) {
+ /*
++ * Don't move task from a throttled cfs_rq
++ */
++ if (cfs_rq_throttled(busy_cfs_rq))
++ continue;
++
++ /*
+ * pass busy_cfs_rq argument into
+ * load_balance_[start|next]_fair iterators
+ */
+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;
+ }
+
+-#ifdef CONFIG_SMP
+-static inline const struct cpumask *sched_rt_period_mask(void)
+-{
+- return cpu_rq(smp_processor_id())->rd->span;
+-}
+-#else
+-static inline const struct cpumask *sched_rt_period_mask(void)
+-{
+- return cpu_online_mask;
+-}
+-#endif
+-
+ static inline
+ struct rt_rq *sched_rt_period_rt_rq(struct rt_bandwidth *rt_b, int cpu)
+ {
+@@ -296,11 +284,6 @@ static inline int rt_rq_throttled(struct
+ return rt_rq->rt_throttled;
+ }
+
+-static inline const struct cpumask *sched_rt_period_mask(void)
+-{
+- return cpu_online_mask;
+-}
+-
+ static inline
+ struct rt_rq *sched_rt_period_rt_rq(struct rt_bandwidth *rt_b, int cpu)
+ {
+@@ -373,7 +356,7 @@ next:
+ /*
+ * Ensure this RQ takes back all the runtime it lend to its neighbours.
+ */
+-static void __disable_runtime(struct rq *rq)
++static void disable_runtime_rt(struct rq *rq)
+ {
+ struct root_domain *rd = rq->rd;
+ struct rt_rq *rt_rq;
+@@ -450,16 +433,7 @@ balanced:
+ }
+ }
+
+-static void disable_runtime(struct rq *rq)
+-{
+- unsigned long flags;
+-
+- spin_lock_irqsave(&rq->lock, flags);
+- __disable_runtime(rq);
+- spin_unlock_irqrestore(&rq->lock, flags);
+-}
+-
+-static void __enable_runtime(struct rq *rq)
++static void enable_runtime_rt(struct rq *rq)
+ {
+ struct rt_rq *rt_rq;
+
+@@ -482,15 +456,6 @@ static void __enable_runtime(struct rq *
+ }
+ }
+
+-static void enable_runtime(struct rq *rq)
+-{
+- unsigned long flags;
+-
+- spin_lock_irqsave(&rq->lock, flags);
+- __enable_runtime(rq);
+- spin_unlock_irqrestore(&rq->lock, flags);
+-}
+-
+ static int balance_runtime(struct rt_rq *rt_rq)
+ {
+ int more = 0;
+@@ -518,7 +483,7 @@ static int do_sched_rt_period_timer(stru
+ if (!rt_bandwidth_enabled() || rt_b->rt_runtime == RUNTIME_INF)
+ return 1;
+
+- span = sched_rt_period_mask();
++ span = sched_bw_period_mask();
+ for_each_cpu(i, span) {
+ int enqueue = 0;
+ struct rt_rq *rt_rq = sched_rt_period_rt_rq(rt_b, i);
+@@ -1571,7 +1536,7 @@ static void rq_online_rt(struct rq *rq)
+ if (rq->rt.overloaded)
+ rt_set_overload(rq);
+
+- __enable_runtime(rq);
++ enable_runtime_rt(rq);
+
+ cpupri_set(&rq->rd->cpupri, rq->cpu, rq->rt.highest_prio.curr);
+ }
+@@ -1582,7 +1547,7 @@ static void rq_offline_rt(struct rq *rq)
+ if (rq->rt.overloaded)
+ rt_clear_overload(rq);
+
+- __disable_runtime(rq);
++ disable_runtime_rt(rq);
+
+ cpupri_set(&rq->rd->cpupri, rq->cpu, CPUPRI_INVALID);
+ }
+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>
+ #include <linux/nsproxy.h>
++#include <linux/vs_context.h>
++#include <linux/vs_pid.h>
+ #include <trace/events/sched.h>
+
+ #include <asm/param.h>
+@@ -598,6 +600,14 @@ static int check_kill_permission(int sig
+ if (!valid_signal(sig))
+ return -EINVAL;
+
++ if ((info != SEND_SIG_NOINFO) &&
++ (is_si_special(info) || !SI_FROMUSER(info)))
++ goto skip;
++
++ vxdprintk(VXD_CBIT(misc, 7),
++ "check_kill_permission(%d,%p,%p[#%u,%u])",
++ sig, info, t, vx_task_xid(t), t->pid);
++
+ if (info != SEND_SIG_NOINFO && (is_si_special(info) || SI_FROMKERNEL(info)))
+ return 0;
+
+@@ -627,6 +637,20 @@ static int check_kill_permission(int sig
+ }
+ }
+
++ error = -EPERM;
++ if (t->pid == 1 && current->xid)
++ return error;
++
++ error = -ESRCH;
++ /* FIXME: we shouldn't return ESRCH ever, to avoid
++ loops, maybe ENOENT or EACCES? */
++ if (!vx_check(vx_task_xid(t), VS_WATCH_P | VS_IDENT)) {
++ vxdprintk(current->xid || VXD_CBIT(misc, 7),
++ "signal %d[%p] xid mismatch %p[#%u,%u] xid=#%u",
++ sig, info, t, vx_task_xid(t), t->pid, current->xid);
++ return error;
++ }
++skip:
+ return security_task_kill(t, info, sig, 0);
+ }
+
+@@ -1115,7 +1139,7 @@ int kill_pid_info(int sig, struct siginf
+ rcu_read_lock();
+ retry:
+ p = pid_task(pid, PIDTYPE_PID);
+- if (p) {
++ if (p && vx_check(vx_task_xid(p), VS_IDENT)) {
+ error = group_send_sig_info(sig, info, p);
+ if (unlikely(error == -ESRCH))
+ /*
+@@ -1154,7 +1178,7 @@ int kill_pid_info_as_uid(int sig, struct
+
+ read_lock(&tasklist_lock);
+ p = pid_task(pid, PIDTYPE_PID);
+- if (!p) {
++ if (!p || !vx_check(vx_task_xid(p), VS_IDENT)) {
+ ret = -ESRCH;
+ goto out_unlock;
+ }
+@@ -1208,8 +1232,10 @@ static int kill_something_info(int sig,
+ struct task_struct * p;
+
+ for_each_process(p) {
+- if (task_pid_vnr(p) > 1 &&
+- !same_thread_group(p, current)) {
++ if (vx_check(vx_task_xid(p), VS_ADMIN|VS_IDENT) &&
++ task_pid_vnr(p) > 1 &&
++ !same_thread_group(p, current) &&
++ !vx_current_initpid(p->pid)) {
+ int err = group_send_sig_info(sig, info, p);
+ ++count;
+ if (err != -EPERM)
+@@ -1874,6 +1900,11 @@ relock:
+ !sig_kernel_only(signr))
+ continue;
+
++ /* virtual init is protected against user signals */
++ if ((info->si_code == SI_USER) &&
++ vx_current_initpid(current->pid))
++ continue;
++
+ if (sig_kernel_stop(signr)) {
+ /*
+ * The default action is to stop all threads in
+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>
+ #include <linux/tick.h>
++#include <linux/vs_context.h>
+
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/irq.h>
+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>
+ #include <linux/user_namespace.h>
++#include <linux/vs_pid.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/io.h>
+@@ -130,7 +131,10 @@ static int set_one_prio(struct task_stru
+ goto out;
+ }
+ if (niceval < task_nice(p) && !can_nice(p, niceval)) {
+- error = -EACCES;
+ if (vx_flags(VXF_IGNEG_NICE, 0))
+ error = 0;
+ else
goto out;
}
no_nice = security_task_setnice(p, niceval);
-@@ -177,6 +181,8 @@ SYSCALL_DEFINE3(setpriority, int, which,
+@@ -179,6 +183,8 @@ SYSCALL_DEFINE3(setpriority, int, which,
else
pgrp = task_pgrp(current);
do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
error = set_one_prio(p, niceval, error);
} while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
break;
-@@ -238,6 +244,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
+@@ -240,6 +246,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
else
pgrp = task_pgrp(current);
do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
niceval = 20 - task_nice(p);
if (niceval > retval)
retval = niceval;
-@@ -347,6 +355,9 @@ void kernel_power_off(void)
+@@ -349,6 +357,9 @@ void kernel_power_off(void)
machine_power_off();
}
EXPORT_SYMBOL_GPL(kernel_power_off);
/*
* Reboot system call: for obvious reasons only root may call it,
* and even root needs to set up some magic numbers in the registers
-@@ -378,6 +389,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
+@@ -381,6 +392,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)
cmd = LINUX_REBOOT_CMD_HALT;
lock_kernel();
switch (cmd) {
case LINUX_REBOOT_CMD_RESTART:
-@@ -1420,7 +1434,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;
-@@ -1469,7 +1483,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;
-@@ -1538,7 +1552,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.29.1/kernel/sysctl.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/sysctl.c
---- linux-2.6.29.1/kernel/sysctl.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/sysctl.c 2009-03-24 14:48:36.000000000 +0100
-@@ -114,6 +114,7 @@ static int ngroups_max = NGROUPS_MAX;
- #ifdef CONFIG_MODULES
+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;
#endif
+extern char vshelper_path[];
#ifdef CONFIG_CHR_DEV_SG
extern int sg_big_buff;
#endif
-@@ -545,6 +546,15 @@ static struct ctl_table kern_table[] = {
+@@ -593,6 +594,15 @@ static struct ctl_table kern_table[] = {
.strategy = &sysctl_string,
},
#endif
#ifdef CONFIG_CHR_DEV_SG
{
.ctl_name = KERN_SG_BIG_BUFF,
-diff -NurpP --minimal linux-2.6.29.1/kernel/sysctl_check.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/sysctl_check.c
---- linux-2.6.29.1/kernel/sysctl_check.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/sysctl_check.c 2009-03-24 14:48:36.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" },
-@@ -1216,6 +1217,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 },
-@@ -1232,6 +1249,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 },
-+ { CTL_VSERVER, "vserver", trans_vserver_table },
- {}
- };
-
-diff -NurpP --minimal linux-2.6.29.1/kernel/time.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/time.c
---- linux-2.6.29.1/kernel/time.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/time.c 2009-03-24 14:48:36.000000000 +0100
-@@ -63,6 +63,7 @@ EXPORT_SYMBOL(sys_tz);
- SYSCALL_DEFINE1(time, time_t __user *, tloc)
- {
- time_t i = get_seconds();
-+/* FIXME: do_gettimeofday(&tv) -> vx_gettimeofday(&tv) */
-
- if (tloc) {
- if (put_user(i,tloc))
-@@ -93,7 +94,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
- if (err)
- return err;
-
-- do_settimeofday(&tv);
-+ vx_settimeofday(&tv);
- return 0;
- }
-
-@@ -104,7 +105,7 @@ SYSCALL_DEFINE2(gettimeofday, struct tim
- {
- if (likely(tv != NULL)) {
- struct timeval ktv;
-- do_gettimeofday(&ktv);
-+ vx_gettimeofday(&ktv);
- if (copy_to_user(tv, &ktv, sizeof(ktv)))
- return -EFAULT;
- }
-@@ -179,7 +180,7 @@ int do_sys_settimeofday(struct timespec
- /* SMP safe, again the code in arch/foo/time.c should
- * globally block out interrupts when it runs.
- */
-- return do_settimeofday(tv);
-+ return vx_settimeofday(tv);
- }
- return 0;
- }
-@@ -311,7 +312,7 @@ void getnstimeofday(struct timespec *tv)
- {
- struct timeval x;
-
-- do_gettimeofday(&x);
-+ vx_gettimeofday(&x);
- tv->tv_sec = x.tv_sec;
- tv->tv_nsec = x.tv_usec * NSEC_PER_USEC;
- }
-diff -NurpP --minimal linux-2.6.29.1/kernel/timer.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/timer.c
---- linux-2.6.29.1/kernel/timer.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/timer.c 2009-03-24 17:41:02.000000000 +0100
-@@ -37,6 +37,10 @@
- #include <linux/delay.h>
- #include <linux/tick.h>
- #include <linux/kallsyms.h>
-+#include <linux/vs_base.h>
-+#include <linux/vs_cvirt.h>
-+#include <linux/vs_pid.h>
-+#include <linux/vserver/sched.h>
-
- #include <asm/uaccess.h>
- #include <asm/unistd.h>
-@@ -1018,6 +1022,25 @@ unsigned long get_next_timer_interrupt(u
- }
- #endif
-
-+static inline
-+void __vx_consume_token(struct _vx_sched_pc *sched_pc)
-+{
-+ sched_pc->tokens--;
-+}
+ static const struct trans_ctl_table trans_root_table[] = {
+ { CTL_KERN, "kernel", trans_kern_table },
+ { CTL_VM, "vm", trans_vm_table },
+@@ -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 },
++ { CTL_VSERVER, "vserver", trans_vserver_table },
+ {}
+ };
+
+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)
+ {
+ time_t i = get_seconds();
++/* FIXME: do_gettimeofday(&tv) -> vx_gettimeofday(&tv) */
+
+ if (tloc) {
+ if (put_user(i,tloc))
+@@ -93,7 +94,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
+ if (err)
+ return err;
+
+- do_settimeofday(&tv);
++ vx_settimeofday(&tv);
+ return 0;
+ }
+
+@@ -104,7 +105,7 @@ SYSCALL_DEFINE2(gettimeofday, struct tim
+ {
+ if (likely(tv != NULL)) {
+ struct timeval ktv;
+- do_gettimeofday(&ktv);
++ vx_gettimeofday(&ktv);
+ if (copy_to_user(tv, &ktv, sizeof(ktv)))
+ return -EFAULT;
+ }
+@@ -179,7 +180,7 @@ int do_sys_settimeofday(struct timespec
+ /* SMP safe, again the code in arch/foo/time.c should
+ * globally block out interrupts when it runs.
+ */
+- return do_settimeofday(tv);
++ return vx_settimeofday(tv);
+ }
+ return 0;
+ }
+@@ -311,7 +312,7 @@ void getnstimeofday(struct timespec *tv)
+ {
+ struct timeval x;
+
+- do_gettimeofday(&x);
++ vx_gettimeofday(&x);
+ tv->tv_sec = x.tv_sec;
+ tv->tv_nsec = x.tv_usec * NSEC_PER_USEC;
+ }
+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 <linux/sched.h>
++#include <linux/vs_base.h>
++#include <linux/vs_cvirt.h>
++#include <linux/vs_pid.h>
++#include <linux/vserver/sched.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+@@ -1261,12 +1265,6 @@ SYSCALL_DEFINE1(alarm, unsigned int, sec
+
+ #endif
+
+-#ifndef __alpha__
+-
+-/*
+- * The Alpha uses getxpid, getxuid, and getxgid instead. Maybe this
+- * should be moved into arch/i386 instead?
+- */
+
+ /**
+ * sys_getpid - return the thread group id of the current process
+@@ -1295,10 +1293,23 @@ SYSCALL_DEFINE0(getppid)
+ rcu_read_lock();
+ pid = task_tgid_vnr(current->real_parent);
+ rcu_read_unlock();
++ return vx_map_pid(pid);
++}
+
+- return pid;
++#ifdef __alpha__
++
++/*
++ * The Alpha uses getxpid, getxuid, and getxgid instead.
++ */
++
++asmlinkage long do_getxpid(long *ppid)
++{
++ *ppid = sys_getppid();
++ return sys_getpid();
+ }
+
++#else /* _alpha_ */
++
+ SYSCALL_DEFINE0(getuid)
+ {
+ /* Only we change this so SMP safe */
+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>
+ #include <linux/cred.h>
++#include <linux/vserver/global.h>
+
+ /*
+ * Create a new user namespace, deriving the creator from the user in the
+@@ -30,6 +31,7 @@ int create_user_ns(struct cred *new)
+ return -ENOMEM;
+
+ kref_init(&ns->kref);
++ atomic_inc(&vs_global_user_ns);
+
+ for (n = 0; n < UIDHASH_SZ; ++n)
+ INIT_HLIST_HEAD(ns->uidhash_table + n);
+@@ -78,6 +80,8 @@ void free_user_ns(struct kref *kref)
+ struct user_namespace *ns =
+ container_of(kref, struct user_namespace, kref);
+
++ /* FIXME: maybe move into destroyer? */
++ atomic_dec(&vs_global_user_ns);
+ INIT_WORK(&ns->destroyer, free_user_ns_work);
+ schedule_work(&ns->destroyer);
+ }
+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>
+ #include <linux/slab.h>
++#include <linux/vserver/global.h>
+
+ static struct uts_namespace *create_uts_ns(void)
+ {
+ struct uts_namespace *uts_ns;
+
+ uts_ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL);
+- if (uts_ns)
++ if (uts_ns) {
+ kref_init(&uts_ns->kref);
++ atomic_inc(&vs_global_uts_ns);
++ }
+ return uts_ns;
+ }
+
+@@ -71,5 +74,6 @@ void free_uts_ns(struct kref *kref)
+ struct uts_namespace *ns;
+
+ ns = container_of(kref, struct uts_namespace, kref);
++ atomic_dec(&vs_global_uts_ns);
+ kfree(ns);
+ }
+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
+
-+static inline
-+void vx_hard_tick(struct task_struct *p, int cpu)
-+{
-+ struct vx_info *vxi = p->vx_info;
+
-+ if (vx_info_flags(vxi, VXF_SCHED_HARD|VXF_SCHED_PRIO, 0)) {
-+ struct _vx_sched_pc *sched_pc =
-+ &vx_per_cpu(vxi, sched_pc, cpu);
++config VSERVER
++ bool
++ default y
++ select NAMESPACES
++ select UTS_NS
++ select IPC_NS
++ select USER_NS
++ select SYSVIPC
+
-+ __vx_consume_token(sched_pc);
-+ }
-+}
++config VSERVER_SECURITY
++ bool
++ depends on SECURITY
++ default y
++ select SECURITY_CAPABILITIES
+
- /*
- * Called from the timer interrupt handler to charge one tick to the current
- * process. user_tick is 1 if the tick is user time, 0 for system.
-@@ -1034,6 +1057,7 @@ void update_process_times(int user_tick)
- rcu_check_callbacks(cpu, user_tick);
- printk_tick();
- scheduler_tick();
-+ vx_hard_tick(p, cpu);
- run_posix_cpu_timers(p);
- }
-
-@@ -1136,12 +1160,6 @@ SYSCALL_DEFINE1(alarm, unsigned int, sec
-
- #endif
-
--#ifndef __alpha__
--
--/*
-- * The Alpha uses getxpid, getxuid, and getxgid instead. Maybe this
-- * should be moved into arch/i386 instead?
-- */
-
- /**
- * sys_getpid - return the thread group id of the current process
-@@ -1170,10 +1188,23 @@ SYSCALL_DEFINE0(getppid)
- rcu_read_lock();
- pid = task_tgid_vnr(current->real_parent);
- rcu_read_unlock();
-+ return vx_map_pid(pid);
-+}
-
-- return pid;
-+#ifdef __alpha__
+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.
++#
+
-+/*
-+ * The Alpha uses getxpid, getxuid, and getxgid instead.
-+ */
+
-+asmlinkage long do_getxpid(long *ppid)
-+{
-+ *ppid = sys_getppid();
-+ return sys_getpid();
- }
-
-+#else /* _alpha_ */
++obj-y += vserver.o
+
- SYSCALL_DEFINE0(getuid)
- {
- /* Only we change this so SMP safe */
-@@ -1344,6 +1375,8 @@ int do_sysinfo(struct sysinfo *info)
- tp.tv_nsec = tp.tv_nsec - NSEC_PER_SEC;
- tp.tv_sec++;
- }
-+ if (vx_flags(VXF_VIRT_UPTIME, 0))
-+ vx_vsi_uptime(&tp, NULL);
- info->uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0);
-
- info->loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
-diff -NurpP --minimal linux-2.6.29.1/kernel/user.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/user.c
---- linux-2.6.29.1/kernel/user.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/user.c 2009-03-24 17:47:32.000000000 +0100
-@@ -249,10 +249,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)
-@@ -280,7 +280,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);
- }
-
- /* work function to remove sysfs directory for a user and free up
-@@ -342,7 +342,8 @@ static void free_user(struct user_struct
- #else /* CONFIG_USER_SCHED && CONFIG_SYSFS */
-
- 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) { }
-
-@@ -439,7 +440,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.29.1/kernel/user_namespace.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/user_namespace.c
---- linux-2.6.29.1/kernel/user_namespace.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/user_namespace.c 2009-03-24 18:05:19.000000000 +0100
-@@ -10,6 +10,7 @@
- #include <linux/slab.h>
- #include <linux/user_namespace.h>
- #include <linux/cred.h>
-+#include <linux/vserver/global.h>
-
- /*
- * Create a new user namespace, deriving the creator from the user in the
-@@ -30,6 +31,7 @@ int create_user_ns(struct cred *new)
- return -ENOMEM;
-
- kref_init(&ns->kref);
-+ atomic_inc(&vs_global_user_ns);
-
- for (n = 0; n < UIDHASH_SZ; ++n)
- INIT_HLIST_HEAD(ns->uidhash_table + n);
-@@ -78,6 +80,8 @@ void free_user_ns(struct kref *kref)
- struct user_namespace *ns =
- container_of(kref, struct user_namespace, kref);
-
-+ /* FIXME: maybe move into destroyer? */
-+ atomic_dec(&vs_global_user_ns);
- INIT_WORK(&ns->destroyer, free_user_ns_work);
- schedule_work(&ns->destroyer);
- }
-diff -NurpP --minimal linux-2.6.29.1/kernel/utsname.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/utsname.c
---- linux-2.6.29.1/kernel/utsname.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/utsname.c 2009-02-22 22:54:26.000000000 +0100
-@@ -14,6 +14,7 @@
- #include <linux/utsname.h>
- #include <linux/err.h>
- #include <linux/slab.h>
-+#include <linux/vserver/global.h>
-
- /*
- * Clone a new ns copying an original utsname, setting refcount to 1
-@@ -32,6 +33,7 @@ static struct uts_namespace *clone_uts_n
- memcpy(&ns->name, &old_ns->name, sizeof(ns->name));
- up_read(&uts_sem);
- kref_init(&ns->kref);
-+ atomic_inc(&vs_global_uts_ns);
- return ns;
- }
-
-@@ -62,5 +64,6 @@ void free_uts_ns(struct kref *kref)
- struct uts_namespace *ns;
-
- ns = container_of(kref, struct uts_namespace, kref);
-+ atomic_dec(&vs_global_uts_ns);
- kfree(ns);
- }
-diff -NurpP --minimal linux-2.6.29.1/kernel/vserver/cacct.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/cacct.c
---- linux-2.6.29.1/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/cacct.c 2009-02-22 22:54:26.000000000 +0100
++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.29.1/kernel/vserver/cacct_init.h linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/cacct_init.h
---- linux-2.6.29.1/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/cacct_init.h 2009-02-22 22:54:26.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 @@
+
+
+
+ for (i = 0; i < VXA_SOCK_SIZE; i++) {
+ for (j = 0; j < 3; j++) {
-+ atomic_set(&cacct->sock[i][j].count, 0);
-+ atomic_set(&cacct->sock[i][j].total, 0);
++ atomic_long_set(&cacct->sock[i][j].count, 0);
++ atomic_long_set(&cacct->sock[i][j].total, 0);
+ }
+ }
+ for (i = 0; i < 8; i++)
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.29.1/kernel/vserver/cacct_proc.h linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/cacct_proc.h
---- linux-2.6.29.1/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/cacct_proc.h 2009-02-22 22:54:26.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.29.1/kernel/vserver/context.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/context.c
---- linux-2.6.29.1/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/context.c 2009-04-03 21:25:31.000000000 +0200
-@@ -0,0 +1,1018 @@
+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
+ *
+#include <linux/vserver/limit.h>
+#include <linux/vserver/limit_int.h>
+#include <linux/vserver/space.h>
++#include <linux/init_task.h>
++#include <linux/fs_struct.h>
+
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
+static struct vx_info *__alloc_vx_info(xid_t xid)
+{
+ struct vx_info *new = NULL;
-+ int cpu;
++ int cpu, index;
+
+ vxdprintk(VXD_CBIT(xid, 0), "alloc_vx_info(%d)*", xid);
+
+ new->vx_flags = VXF_INIT_SET;
+ cap_set_init_eff(new->vx_bcaps);
+ new->vx_ccaps = 0;
-+ // new->vx_cap_bset = current->cap_bset;
++ new->vx_umask = 0;
+
+ new->reboot_cmd = 0;
+ new->exit_code = 0;
+
++ // preconfig fs entries
++ for (index = 0; index < VX_SPACES; index++) {
++ write_lock(&init_fs.lock);
++ init_fs.users++;
++ write_unlock(&init_fs.lock);
++ new->vx_fs[index] = &init_fs;
++ }
++
+ vxdprintk(VXD_CBIT(xid, 0),
+ "alloc_vx_info(%d) = %p", xid, new);
+ vxh_alloc_vx_info(new);
+
+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);
+{
+ struct nsproxy *nsproxy;
+ struct fs_struct *fs;
-+ int index;
++ int index, kill;
+
+ might_sleep();
+
+ put_nsproxy(nsproxy);
+
+ fs = xchg(&vxi->vx_fs[index], NULL);
-+ if (fs)
-+ put_fs_struct(fs);
++ write_lock(&fs->lock);
++ kill = !--fs->users;
++ write_unlock(&fs->lock);
++ if (kill)
++ free_fs_struct(fs);
+ }
+}
+
+
+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);
+}
+
+ struct vx_info *vxi = NULL;
+
+ if (id < 0) {
-+ vxi = get_vx_info(current->vx_info);
++ vxi = get_vx_info(current_vx_info());
+ } else if (id > 1) {
+ spin_lock(&vx_info_hash_lock);
+ vxi = get_vx_info(__lookup_vx_info(id));
+ vxi, vxi->vx_id, p, p->xid, p->pid, p->tgid);
+
+ vxi->vx_flags &= ~VXF_STATE_INIT;
-+ vxi->vx_initpid = p->tgid;
++ // vxi->vx_initpid = p->tgid;
++ vxi->vx_initpid = p->pid;
+ return 0;
+}
+
+ struct vx_info *vxi = p->vx_info;
+
+ if (vxi) {
-+ if (vxi->vx_initpid == p->tgid)
++ if (vxi->vx_initpid == p->pid)
+ vx_exit_init(vxi, p, code);
+ if (vxi->vx_reaper == p)
+ vx_set_reaper(vxi, init_pid_ns.child_reaper);
+ mask = vs_mask_mask(vc_data.mask, vxi->vx_flags, VXF_ONE_TIME);
+ trigger = (mask & vxi->vx_flags) ^ (mask & vc_data.flagword);
+
-+ if (vxi == current->vx_info) {
++ if (vxi == current_vx_info()) {
+ /* if (trigger & VXF_STATE_SETUP)
+ vx_mask_cap_bset(vxi, current); */
+ if (trigger & VXF_STATE_INIT) {
+}
+
+
++int vc_get_umask(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_umask vc_data;
++
++ vc_data.umask = vxi->vx_umask;
++ vc_data.mask = ~0ULL;
++
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return 0;
++}
++
++int vc_set_umask(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_umask vc_data;
++
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ vxi->vx_umask = vs_mask_flags(vxi->vx_umask,
++ vc_data.umask, vc_data.mask);
++ return 0;
++}
++
++
+int vc_get_badness(struct vx_info *vxi, void __user *data)
+{
+ struct vcmd_badness_v0 vc_data;
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-2.6.29.1/kernel/vserver/cvirt.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/cvirt.c
---- linux-2.6.29.1/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/cvirt.c 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,300 @@
+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
+ *
+
+void vx_vsi_uptime(struct timespec *uptime, struct timespec *idle)
+{
-+ struct vx_info *vxi = current->vx_info;
++ struct vx_info *vxi = current_vx_info();
+
+ set_normalized_timespec(uptime,
+ uptime->tv_sec - vxi->cvirt.bias_uptime.tv_sec,
+{
+ int error = 0;
+ int do_clear = 0;
-+ struct vx_info *vxi = current->vx_info;
++ struct vx_info *vxi = current_vx_info();
+ struct _vx_syslog *log;
+
+ if (!vxi)
+
+void vx_gettimeofday(struct timeval *tv)
+{
++ struct vx_info *vxi;
++
+ do_gettimeofday(tv);
+ if (!vx_flags(VXF_VIRT_TIME, 0))
+ return;
+
-+ tv->tv_sec += current->vx_info->cvirt.bias_tv.tv_sec;
-+ tv->tv_usec += current->vx_info->cvirt.bias_tv.tv_usec;
++ vxi = current_vx_info();
++ tv->tv_sec += vxi->cvirt.bias_tv.tv_sec;
++ tv->tv_usec += vxi->cvirt.bias_tv.tv_usec;
+
+ if (tv->tv_usec >= USEC_PER_SEC) {
+ tv->tv_sec++;
+int vx_settimeofday(struct timespec *ts)
+{
+ struct timeval tv;
++ struct vx_info *vxi;
+
+ if (!vx_flags(VXF_VIRT_TIME, 0))
+ return do_settimeofday(ts);
+
+ do_gettimeofday(&tv);
-+ current->vx_info->cvirt.bias_tv.tv_sec =
-+ ts->tv_sec - tv.tv_sec;
-+ current->vx_info->cvirt.bias_tv.tv_usec =
++ vxi = current_vx_info();
++ vxi->cvirt.bias_tv.tv_sec = ts->tv_sec - tv.tv_sec;
++ vxi->cvirt.bias_tv.tv_usec =
+ (ts->tv_nsec/NSEC_PER_USEC) - tv.tv_usec;
+ return 0;
+}
+
+#endif
+
-diff -NurpP --minimal linux-2.6.29.1/kernel/vserver/cvirt_init.h linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/cvirt_init.h
---- linux-2.6.29.1/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/cvirt_init.h 2009-02-22 22:54:26.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.29.1/kernel/vserver/cvirt_proc.h linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/cvirt_proc.h
---- linux-2.6.29.1/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/cvirt_proc.h 2009-02-22 22:54:26.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.29.1/kernel/vserver/debug.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/debug.c
---- linux-2.6.29.1/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/debug.c 2009-02-22 22:54:26.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.29.1/kernel/vserver/device.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/device.c
---- linux-2.6.29.1/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/device.c 2009-02-22 22:54:26.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.29.1/kernel/vserver/dlimit.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/dlimit.c
---- linux-2.6.29.1/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/dlimit.c 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,522 @@
+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
+ *
+ * Virtual Server: Context Disk Limits
+ *
-+ * Copyright (C) 2004-2007 Herbert Pötzl
++ * Copyright (C) 2004-2009 Herbert Pötzl
+ *
+ * V0.01 initial version
+ * V0.02 compat32 splitup
++ * V0.03 extended interface
+ *
+ */
+
+ goto out_release;
+ if (!(sb = path.dentry->d_inode->i_sb))
+ goto out_release;
++
++ /* sanity checks */
+ if ((reserved != CDLIM_KEEP &&
+ reserved > 100) ||
+ (inodes_used != CDLIM_KEEP &&
+ dli->dl_inodes_used = inodes_used;
+ if (inodes_total != CDLIM_KEEP)
+ dli->dl_inodes_total = inodes_total;
-+ if (space_used != CDLIM_KEEP) {
-+ dli->dl_space_used = space_used;
-+ dli->dl_space_used <<= 10;
-+ }
++ if (space_used != CDLIM_KEEP)
++ dli->dl_space_used = dlimit_space_32to64(
++ space_used, flags, DLIMS_USED);
++
+ if (space_total == CDLIM_INFINITY)
+ dli->dl_space_total = DLIM_INFINITY;
-+ else if (space_total != CDLIM_KEEP) {
-+ dli->dl_space_total = space_total;
-+ dli->dl_space_total <<= 10;
-+ }
++ else if (space_total != CDLIM_KEEP)
++ dli->dl_space_total = dlimit_space_32to64(
++ space_total, flags, DLIMS_TOTAL);
++
+ if (reserved != CDLIM_KEEP)
+ dli->dl_nrlmult = (1 << 10) * (100 - reserved) / 100;
+
+ spin_lock(&dli->dl_lock);
+ *inodes_used = dli->dl_inodes_used;
+ *inodes_total = dli->dl_inodes_total;
-+ *space_used = dli->dl_space_used >> 10;
++
++ *space_used = dlimit_space_64to32(
++ dli->dl_space_used, flags, DLIMS_USED);
++
+ if (dli->dl_space_total == DLIM_INFINITY)
+ *space_total = CDLIM_INFINITY;
+ else
-+ *space_total = dli->dl_space_total >> 10;
++ *space_total = dlimit_space_64to32(
++ dli->dl_space_total, flags, DLIMS_TOTAL);
+
+ *reserved = 100 - ((dli->dl_nrlmult * 100 + 512) >> 10);
+ spin_unlock(&dli->dl_lock);
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-2.6.29.1/kernel/vserver/helper.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/helper.c
---- linux-2.6.29.1/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/helper.c 2009-03-25 00:40:43.000000000 +0100
-@@ -0,0 +1,199 @@
+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
+ *
+ argv[1] = "swsusp";
+ break;
+
++ case LINUX_REBOOT_CMD_OOM:
++ argv[1] = "oom";
++ break;
++
+ default:
+ vxi->vx_state &= ~VXS_HELPER;
+ return 0;
+
+long vs_reboot(unsigned int cmd, void __user *arg)
+{
-+ struct vx_info *vxi = current->vx_info;
++ struct vx_info *vxi = current_vx_info();
+ long ret = 0;
+
+ vxdprintk(VXD_CBIT(misc, 5),
-+ "vs_reboot(%p[#%d],%d)",
++ "vs_reboot(%p[#%d],%u)",
+ vxi, vxi ? vxi->vx_id : 0, cmd);
+
+ ret = vs_reboot_helper(vxi, cmd, arg);
+ return 0;
+}
+
-+
++long vs_oom_action(unsigned int cmd)
++{
++ struct vx_info *vxi = current_vx_info();
++ long ret = 0;
++
++ vxdprintk(VXD_CBIT(misc, 5),
++ "vs_oom_action(%p[#%d],%u)",
++ vxi, vxi ? vxi->vx_id : 0, cmd);
++
++ ret = vs_reboot_helper(vxi, cmd, NULL);
++ if (ret)
++ return ret;
++
++ vxi->reboot_cmd = cmd;
++ if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) {
++ vx_info_kill(vxi, 0, SIGKILL);
++ vx_info_kill(vxi, 1, SIGKILL);
++ }
++ return 0;
++}
++
+/*
+ * argv [0] = vshelper_path;
+ * argv [1] = action: "startup", "shutdown"
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-2.6.29.1/kernel/vserver/history.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/history.c
---- linux-2.6.29.1/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/history.c 2009-02-22 22:54:26.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.29.1/kernel/vserver/inet.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/inet.c
---- linux-2.6.29.1/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/inet.c 2009-02-22 22:54:26.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.29.1/kernel/vserver/init.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/init.c
---- linux-2.6.29.1/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/init.c 2009-02-22 22:54:26.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.29.1/kernel/vserver/inode.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/inode.c
---- linux-2.6.29.1/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/inode.c 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,422 @@
+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
+ *
+ return -ESRCH;
+
+ *flags = IATTR_TAG
-+ | (IS_BARRIER(in) ? IATTR_BARRIER : 0)
++ | (IS_IMMUTABLE(in) ? IATTR_IMMUTABLE : 0)
+ | (IS_IXUNLINK(in) ? IATTR_IXUNLINK : 0)
-+ | (IS_IMMUTABLE(in) ? IATTR_IMMUTABLE : 0);
-+ *mask = IATTR_IXUNLINK | IATTR_IMMUTABLE;
++ | (IS_BARRIER(in) ? IATTR_BARRIER : 0)
++ | (IS_COW(in) ? IATTR_COW : 0);
++ *mask = IATTR_IXUNLINK | IATTR_IMMUTABLE | IATTR_COW;
+
+ if (S_ISDIR(in->i_mode))
+ *mask |= IATTR_BARRIER;
+ entry->vx_flags = iflags;
+ }
+
-+ if (*mask & (IATTR_BARRIER | IATTR_IXUNLINK | IATTR_IMMUTABLE)) {
++ if (*mask & (IATTR_IMMUTABLE | IATTR_IXUNLINK |
++ IATTR_BARRIER | IATTR_COW)) {
++ int iflags = in->i_flags;
++ int vflags = in->i_vflags;
++
+ if (*mask & IATTR_IMMUTABLE) {
+ if (*flags & IATTR_IMMUTABLE)
-+ in->i_flags |= S_IMMUTABLE;
++ iflags |= S_IMMUTABLE;
+ else
-+ in->i_flags &= ~S_IMMUTABLE;
++ iflags &= ~S_IMMUTABLE;
+ }
+ if (*mask & IATTR_IXUNLINK) {
+ if (*flags & IATTR_IXUNLINK)
-+ in->i_flags |= S_IXUNLINK;
++ iflags |= S_IXUNLINK;
+ else
-+ in->i_flags &= ~S_IXUNLINK;
++ iflags &= ~S_IXUNLINK;
+ }
+ if (S_ISDIR(in->i_mode) && (*mask & IATTR_BARRIER)) {
+ if (*flags & IATTR_BARRIER)
-+ in->i_vflags |= V_BARRIER;
++ vflags |= V_BARRIER;
+ else
-+ in->i_vflags &= ~V_BARRIER;
++ vflags &= ~V_BARRIER;
++ }
++ if (S_ISREG(in->i_mode) && (*mask & IATTR_COW)) {
++ if (*flags & IATTR_COW)
++ vflags |= V_COW;
++ else
++ vflags &= ~V_COW;
+ }
+ if (in->i_op && in->i_op->sync_flags) {
-+ error = in->i_op->sync_flags(in);
++ error = in->i_op->sync_flags(in, iflags, vflags);
+ if (error)
+ goto out;
+ }
+ while (*q != '\0' && *q != ',')
+ q++;
+ while (*q)
-+ *p++ = *q++;
-+ while (*p)
-+ *p++ = '\0';
-+ }
-+}
-+
-+int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags,
-+ unsigned long *flags)
-+{
-+ int set = 0;
-+ substring_t args[MAX_OPT_ARGS];
-+ int token, option = 0;
-+ char *s, *p, *opts;
-+
-+ if (!string)
-+ return 0;
-+ s = kstrdup(string, GFP_KERNEL | GFP_ATOMIC);
-+ if (!s)
-+ return 0;
-+
-+ 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.29.1/kernel/vserver/Kconfig linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/Kconfig
---- linux-2.6.29.1/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/Kconfig 2009-02-22 22:54:26.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)
++ *p++ = *q++;
++ while (*p)
++ *p++ = '\0';
++ }
++}
+
-+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.
++int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags,
++ unsigned long *flags)
++{
++ int set = 0;
++ substring_t args[MAX_OPT_ARGS];
++ int token, option = 0;
++ char *s, *p, *opts;
+
-+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.
++ if (!string)
++ return 0;
++ s = kstrdup(string, GFP_KERNEL | GFP_ATOMIC);
++ if (!s)
++ return 0;
+
-+ note: this is not a strict upper limit.
++ opts = s;
++ while ((p = strsep(&opts, ",")) != NULL) {
++ 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.29.1/kernel/vserver/limit.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/limit.c
---- linux-2.6.29.1/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/limit.c 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,319 @@
+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>
+}
+
+
++static inline void vx_reset_hits(struct _vx_limit *limit)
++{
++ int lim;
++
++ for (lim = 0; lim < NUM_LIMITS; lim++) {
++ atomic_set(&__rlim_lhit(limit, lim), 0);
++ }
++}
++
++int vc_reset_hits(struct vx_info *vxi, void __user *data)
++{
++ vx_reset_hits(&vxi->limit);
++ return 0;
++}
++
+static inline void vx_reset_minmax(struct _vx_limit *limit)
+{
+ rlim_t value;
+ }
+}
+
-+
+int vc_reset_minmax(struct vx_info *vxi, void __user *data)
+{
+ vx_reset_minmax(&vxi->limit);
+
+void vx_vsi_meminfo(struct sysinfo *val)
+{
-+ struct vx_info *vxi = current->vx_info;
++#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)
+{
-+ struct vx_info *vxi = current->vx_info;
++#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.29.1/kernel/vserver/limit_init.h linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/limit_init.h
---- linux-2.6.29.1/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/limit_init.h 2009-02-22 22:54:26.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.29.1/kernel/vserver/limit_proc.h linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/limit_proc.h
---- linux-2.6.29.1/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/limit_proc.h 2009-02-22 22:54:26.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.29.1/kernel/vserver/Makefile linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/Makefile
---- linux-2.6.29.1/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/Makefile 2009-02-22 22:54:26.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.29.1/kernel/vserver/monitor.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/monitor.c
---- linux-2.6.29.1/kernel/vserver/monitor.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/monitor.c 2009-02-22 22:54:26.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.29.1/kernel/vserver/network.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/network.c
---- linux-2.6.29.1/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/network.c 2009-02-22 22:54:26.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
+ struct nx_info *nxi = NULL;
+
+ if (id < 0) {
-+ nxi = get_nx_info(current->nx_info);
++ nxi = get_nx_info(current_nx_info());
+ } else if (id > 1) {
+ spin_lock(&nx_info_hash_lock);
+ nxi = get_nx_info(__lookup_nx_info(id));
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-2.6.29.1/kernel/vserver/proc.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/proc.c
---- linux-2.6.29.1/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/proc.c 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,1092 @@
+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
+ *
+ */
+
+#include <linux/proc_fs.h>
++#include <linux/fs_struct.h>
++#include <linux/mount.h>
+#include <asm/unistd.h>
+
+#include <linux/vs_context.h>
+ return sprintf(buffer,
+ "#CTotal:\t%d\n"
+ "#CActive:\t%d\n"
-+ "#NSProxy:\t%d\t%d %d %d %d %d %d\n",
++ "#NSProxy:\t%d\t%d %d %d %d %d %d\n"
++ "#InitTask:\t%d\t%d %d\n",
+ atomic_read(&vx_global_ctotal),
+ atomic_read(&vx_global_cactive),
+ atomic_read(&vs_global_nsproxy),
+ atomic_read(&vs_global_fs),
+ atomic_read(&vs_global_mnt_ns),
+ atomic_read(&vs_global_uts_ns),
-+ atomic_read(&vs_global_ipc_ns),
++ atomic_read(&nr_ipc_ns),
+ atomic_read(&vs_global_user_ns),
-+ atomic_read(&vs_global_pid_ns));
++ atomic_read(&vs_global_pid_ns),
++ atomic_read(&init_task.usage),
++ atomic_read(&init_task.nsproxy->count),
++ init_task.fs->users);
+}
+
+
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-2.6.29.1/kernel/vserver/sched.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/sched.c
---- linux-2.6.29.1/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/sched.c 2009-02-22 22:54:26.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.29.1/kernel/vserver/sched_init.h linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/sched_init.h
---- linux-2.6.29.1/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/sched_init.h 2009-02-22 22:54:26.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.29.1/kernel/vserver/sched_proc.h linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/sched_proc.h
---- linux-2.6.29.1/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/sched_proc.h 2009-02-22 22:54:26.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.29.1/kernel/vserver/signal.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/signal.c
---- linux-2.6.29.1/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/signal.c 2009-02-22 22:54:26.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.29.1/kernel/vserver/space.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/space.c
---- linux-2.6.29.1/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/space.c 2009-04-03 21:25:31.000000000 +0200
-@@ -0,0 +1,387 @@
+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
+ *
+#include <linux/utsname.h>
+#include <linux/nsproxy.h>
+#include <linux/err.h>
++#include <linux/fs_struct.h>
+#include <asm/uaccess.h>
+
+#include <linux/vs_context.h>
+atomic_t vs_global_fs = ATOMIC_INIT(0);
+atomic_t vs_global_mnt_ns = ATOMIC_INIT(0);
+atomic_t vs_global_uts_ns = ATOMIC_INIT(0);
-+atomic_t vs_global_ipc_ns = ATOMIC_INIT(0);
+atomic_t vs_global_user_ns = ATOMIC_INIT(0);
+atomic_t vs_global_pid_ns = ATOMIC_INIT(0);
+
+ return proxy;
+}
+
-+/*
-+ * merge two fs structs into a new one.
-+ * will take a reference on the result.
-+ */
-+
-+static inline
-+struct fs_struct *__vs_merge_fs(struct fs_struct *old,
-+ struct fs_struct *fs, unsigned long mask)
-+{
-+ if (!(mask & CLONE_FS)) {
-+ if (old)
-+ atomic_inc(&old->count);
-+ return old;
-+ }
-+
-+ if (!fs)
-+ return NULL;
-+
-+ return copy_fs_struct(fs);
-+}
-+
+
+int vx_enter_space(struct vx_info *vxi, unsigned long mask, unsigned index)
+{
+ struct nsproxy *proxy, *proxy_cur, *proxy_new;
-+ struct fs_struct *fs, *fs_cur, *fs_new;
-+ int ret;
++ struct fs_struct *fs_cur, *fs = NULL;
++ int ret, kill = 0;
+
+ vxdprintk(VXD_CBIT(space, 8), "vx_enter_space(%p[#%u],0x%08lx,%d)",
+ vxi, vxi->vx_id, mask, index);
+ if ((mask & vxi->vx_nsmask[index]) != mask)
+ return -EINVAL;
+
++ if (mask & CLONE_FS) {
++ fs = copy_fs_struct(vxi->vx_fs[index]);
++ if (!fs)
++ return -ENOMEM;
++ }
+ proxy = vxi->vx_nsproxy[index];
-+ fs = vxi->vx_fs[index];
++
++ vxdprintk(VXD_CBIT(space, 9),
++ "vx_enter_space(%p[#%u],0x%08lx,%d) -> (%p,%p)",
++ vxi, vxi->vx_id, mask, index, proxy, fs);
+
+ task_lock(current);
+ fs_cur = current->fs;
-+ atomic_inc(&fs_cur->count);
++
++ if (mask & CLONE_FS) {
++ write_lock(&fs_cur->lock);
++ current->fs = fs;
++ kill = !--fs_cur->users;
++ write_unlock(&fs_cur->lock);
++ }
++
+ proxy_cur = current->nsproxy;
+ get_nsproxy(proxy_cur);
+ task_unlock(current);
+
-+ fs_new = __vs_merge_fs(fs_cur, fs, mask);
-+ if (IS_ERR(fs_new)) {
-+ ret = PTR_ERR(fs_new);
-+ goto out_put;
-+ }
++ if (kill)
++ free_fs_struct(fs_cur);
+
+ proxy_new = __vs_merge_nsproxy(proxy_cur, proxy, mask);
+ if (IS_ERR(proxy_new)) {
+ ret = PTR_ERR(proxy_new);
-+ goto out_put_fs;
++ goto out_put;
+ }
+
-+ fs_new = xchg(¤t->fs, fs_new);
+ proxy_new = xchg(¤t->nsproxy, proxy_new);
+ ret = 0;
+
+ if (proxy_new)
+ put_nsproxy(proxy_new);
-+out_put_fs:
-+ if (fs_new)
-+ put_fs_struct(fs_new);
+out_put:
+ if (proxy_cur)
+ put_nsproxy(proxy_cur);
-+ if (fs_cur)
-+ put_fs_struct(fs_cur);
+ return ret;
+}
+
+int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index)
+{
+ struct nsproxy *proxy_vxi, *proxy_cur, *proxy_new;
-+ struct fs_struct *fs_vxi, *fs_cur, *fs_new;
-+ int ret;
++ struct fs_struct *fs_vxi, *fs;
++ int ret, kill = 0;
+
+ vxdprintk(VXD_CBIT(space, 8), "vx_set_space(%p[#%u],0x%08lx,%d)",
+ vxi, vxi->vx_id, mask, index);
+ proxy_vxi = vxi->vx_nsproxy[index];
+ fs_vxi = vxi->vx_fs[index];
+
++ if (mask & CLONE_FS) {
++ fs = copy_fs_struct(current->fs);
++ if (!fs)
++ return -ENOMEM;
++ }
++
+ task_lock(current);
-+ fs_cur = current->fs;
-+ atomic_inc(&fs_cur->count);
++
++ if (mask & CLONE_FS) {
++ write_lock(&fs_vxi->lock);
++ vxi->vx_fs[index] = fs;
++ kill = !--fs_vxi->users;
++ write_unlock(&fs_vxi->lock);
++ }
++
+ proxy_cur = current->nsproxy;
+ get_nsproxy(proxy_cur);
+ task_unlock(current);
+
-+ fs_new = __vs_merge_fs(fs_vxi, fs_cur, mask);
-+ if (IS_ERR(fs_new)) {
-+ ret = PTR_ERR(fs_new);
-+ goto out_put;
-+ }
++ if (kill)
++ free_fs_struct(fs_vxi);
+
+ proxy_new = __vs_merge_nsproxy(proxy_vxi, proxy_cur, mask);
+ if (IS_ERR(proxy_new)) {
+ ret = PTR_ERR(proxy_new);
-+ goto out_put_fs;
++ goto out_put;
+ }
+
-+ fs_new = xchg(&vxi->vx_fs[index], fs_new);
+ proxy_new = xchg(&vxi->vx_nsproxy[index], proxy_new);
+ vxi->vx_nsmask[index] |= mask;
+ ret = 0;
+
+ if (proxy_new)
+ put_nsproxy(proxy_new);
-+out_put_fs:
-+ if (fs_new)
-+ put_fs_struct(fs_new);
+out_put:
+ if (proxy_cur)
+ put_nsproxy(proxy_cur);
-+ if (fs_cur)
-+ put_fs_struct(fs_cur);
+ return ret;
+}
+
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.29.1/kernel/vserver/switch.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/switch.c
---- linux-2.6.29.1/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/switch.c 2009-03-24 14:59:18.000000000 +0100
-@@ -0,0 +1,543 @@
+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
+ case VCMD_get_rlimit_mask:
+ return vc_get_rlimit_mask(id, data);
++ case VCMD_reset_hits:
++ return vc_reset_hits(vxi, data);
+ case VCMD_reset_minmax:
+ return vc_reset_minmax(vxi, data);
+
+
+ /* info commands */
+ __VCMD(task_xid, 2, VCA_NONE, 0);
++ __VCMD(reset_hits, 2, VCA_VXI, 0);
+ __VCMD(reset_minmax, 2, VCA_VXI, 0);
+ __VCMD(vx_info, 3, VCA_VXI, VCF_INFO);
+ __VCMD(get_bcaps, 3, VCA_VXI, VCF_INFO);
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-2.6.29.1/kernel/vserver/sysctl.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/sysctl.c
---- linux-2.6.29.1/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/sysctl.c 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,244 @@
+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
+ *
+
+
+static int proc_dodebug(ctl_table *table, int write,
-+ struct file *filp, void __user *buffer, size_t *lenp, loff_t *ppos)
++ void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+ char tmpbuf[20], *p, c;
+ unsigned int value;
+ .proc_handler = &proc_dodebug, \
+ .strategy = &sysctl_intvec, \
+ .extra1 = &zero, \
++ .extra2 = &zero, \
+ }
+
+static ctl_table vserver_debug_table[] = {
+EXPORT_SYMBOL_GPL(vx_debug_space);
+EXPORT_SYMBOL_GPL(vx_debug_misc);
+
-diff -NurpP --minimal linux-2.6.29.1/kernel/vserver/tag.c linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/tag.c
---- linux-2.6.29.1/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/tag.c 2009-02-22 22:54:26.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.29.1/kernel/vserver/vci_config.h linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/vci_config.h
---- linux-2.6.29.1/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/kernel/vserver/vci_config.h 2009-02-22 22:54:26.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 */
+
-+#define VCI_VERSION 0x00020304
++#define VCI_VERSION 0x00020305
+
+
+enum {
+ 0;
+}
+
-diff -NurpP --minimal linux-2.6.29.1/mm/filemap_xip.c linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/filemap_xip.c
---- linux-2.6.29.1/mm/filemap_xip.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/filemap_xip.c 2009-03-24 14:48:36.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)
+ {
+- unsigned long size, i;
++ unsigned long size, vspc, i;
+ char *ptr;
+ unsigned long nr_possible_cpus = num_possible_cpus();
+
++ vspc = PERCPU_PERCTX * CONFIG_VSERVER_CONTEXTS;
++
+ /* Copy section for each CPU (we discard the original) */
+- size = ALIGN(PERCPU_ENOUGH_ROOM, PAGE_SIZE);
++ size = ALIGN(PERCPU_ENOUGH_ROOM + vspc, PAGE_SIZE);
+ ptr = alloc_bootmem_pages(size * nr_possible_cpus);
+
+ for_each_possible_cpu(i) {
+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.29.1/mm/fremap.c linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/fremap.c
---- linux-2.6.29.1/mm/fremap.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/fremap.c 2009-03-24 14:48:36.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.29.1/mm/hugetlb.c linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/hugetlb.c
---- linux-2.6.29.1/mm/hugetlb.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/hugetlb.c 2009-03-24 14:48:36.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.29.1/mm/memory.c linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/memory.c
---- linux-2.6.29.1/mm/memory.c 2009-04-15 22:53:12.000000000 +0200
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/memory.c 2009-04-15 22:58:30.000000000 +0200
-@@ -55,6 +55,7 @@
+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>
#include <linux/elf.h>
+// #include <linux/vs_memory.h>
+ #include <asm/io.h>
#include <asm/pgalloc.h>
- #include <asm/uaccess.h>
-@@ -612,6 +613,9 @@ static int copy_pte_range(struct mm_stru
+@@ -647,6 +648,9 @@ static int copy_pte_range(struct mm_stru
int progress = 0;
int rss[2];
again:
rss[1] = rss[0] = 0;
dst_pte = pte_alloc_map_lock(dst_mm, dst_pmd, addr, &dst_ptl);
-@@ -2435,6 +2439,11 @@ static int do_swap_page(struct mm_struct
- count_vm_event(PGMAJFAULT);
- }
-
-+ if (!vx_rss_avail(mm, 1)) {
-+ ret = VM_FAULT_OOM;
-+ goto out;
-+ }
-+
- mark_page_accessed(page);
+@@ -2680,6 +2684,9 @@ static int do_anonymous_page(struct mm_s
- lock_page(page);
-@@ -2526,6 +2535,8 @@ static int do_anonymous_page(struct mm_s
- /* Allocate our own private page. */
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);
-@@ -2793,6 +2804,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)) {
-@@ -2817,9 +2829,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 (write_access) {
+ if (flags & FAULT_FLAG_WRITE) {
- if (!pte_write(entry))
- return do_wp_page(mm, vma, address,
+ if (!pte_write(entry)) {
entry = pte_mkdirty(entry);
}
entry = pte_mkyoung(entry);
-@@ -2837,7 +2852,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.29.1/mm/mlock.c linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/mlock.c
---- linux-2.6.29.1/mm/mlock.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/mlock.c 2009-03-28 05:08:26.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"
-@@ -415,7 +416,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.
-@@ -492,7 +493,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;
-@@ -505,8 +506,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;
-@@ -514,6 +517,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;
}
-@@ -575,6 +579,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);
-@@ -652,8 +658,10 @@ void *alloc_locked_buffer(size_t size)
- if (!buffer)
+@@ -644,8 +650,10 @@ int account_locked_memory(struct mm_stru
+ if (lim < vm)
goto out;
-- current->mm->total_vm += pgsz;
-- current->mm->locked_vm += pgsz;
-+ // current->mm->total_vm += pgsz;
-+ vx_vmpages_add(current->mm, pgsz);
-+ // current->mm->locked_vm += pgsz;
-+ vx_vmlocked_add(current->mm, pgsz);
+- mm->total_vm += pgsz;
+- mm->locked_vm += pgsz;
++ // mm->total_vm += pgsz;
++ vx_vmpages_add(mm, pgsz);
++ // mm->locked_vm += pgsz;
++ vx_vmlocked_add(mm, pgsz);
+ error = 0;
out:
- up_write(¤t->mm->mmap_sem);
-@@ -666,8 +674,10 @@ void release_locked_buffer(void *buffer,
+@@ -659,8 +667,10 @@ void refund_locked_memory(struct mm_stru
- down_write(¤t->mm->mmap_sem);
+ down_write(&mm->mmap_sem);
-- current->mm->total_vm -= pgsz;
-- current->mm->locked_vm -= pgsz;
-+ // current->mm->total_vm -= pgsz;
-+ vx_vmpages_sub(current->mm, pgsz);
-+ // current->mm->locked_vm -= pgsz;
-+ vx_vmlocked_sub(current->mm, pgsz);
+- mm->total_vm -= pgsz;
+- mm->locked_vm -= pgsz;
++ // mm->total_vm -= pgsz;
++ vx_vmpages_sub(mm, pgsz);
++ // mm->locked_vm -= pgsz;
++ vx_vmlocked_sub(mm, pgsz);
- up_write(¤t->mm->mmap_sem);
+ up_write(&mm->mmap_sem);
}
-diff -NurpP --minimal linux-2.6.29.1/mm/mmap.c linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/mmap.c
---- linux-2.6.29.1/mm/mmap.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/mmap.c 2009-03-24 14:48:36.000000000 +0100
-@@ -1219,7 +1219,8 @@ munmap_back:
- if (correct_wcount)
- atomic_inc(&inode->i_writecount);
+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);
+
- mm->total_vm += len >> PAGE_SHIFT;
+ // mm->total_vm += len >> PAGE_SHIFT;
+ vx_vmpages_add(mm, len >> PAGE_SHIFT);
vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
if (vm_flags & VM_LOCKED) {
/*
-@@ -1228,7 +1229,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;
-@@ -1575,9 +1577,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;
}
-@@ -1752,7 +1754,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);
-@@ -1924,7 +1927,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;
-@@ -2013,6 +2017,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;
}
/*
-@@ -2039,7 +2045,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? */
-@@ -2065,10 +2072,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;
}
-@@ -2111,6 +2121,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.
-@@ -2150,7 +2165,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;
-@@ -2226,6 +2242,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;
}
-@@ -2303,8 +2321,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);
- return 0;
- }
-diff -NurpP --minimal linux-2.6.29.1/mm/mremap.c linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/mremap.c
---- linux-2.6.29.1/mm/mremap.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/mremap.c 2009-03-24 14:48:36.000000000 +0100
-@@ -19,6 +19,7 @@
+ perf_event_mmap(vma);
+
+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 <linux/mmu_notifier.h>
#include <asm/uaccess.h>
#include <asm/cacheflush.h>
-@@ -220,7 +221,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) {
-@@ -238,7 +239,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);
-@@ -349,6 +350,9 @@ unsigned long do_mremap(unsigned long ad
- ret = -EAGAIN;
- if (locked > lock_limit && !capable(CAP_IPC_LOCK))
- goto out;
-+ if (!vx_vmlocked_avail(current->mm,
-+ (new_len - old_len) >> PAGE_SHIFT))
-+ goto out;
- }
- if (!may_expand_vm(mm, (new_len - old_len) >> PAGE_SHIFT)) {
- ret = -ENOMEM;
-@@ -377,10 +381,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.29.1/mm/nommu.c linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/nommu.c
---- linux-2.6.29.1/mm/nommu.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/nommu.c 2009-03-24 18:25:55.000000000 +0100
-@@ -1348,7 +1348,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);
-@@ -1614,7 +1614,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.29.1/mm/oom_kill.c linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/oom_kill.c
---- linux-2.6.29.1/mm/oom_kill.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/oom_kill.c 2009-03-24 14:48:36.000000000 +0100
-@@ -27,6 +27,7 @@
+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>
#include <linux/security.h>
++#include <linux/reboot.h>
+#include <linux/vs_memory.h>
++#include <linux/vs_context.h>
int sysctl_panic_on_oom;
int sysctl_oom_kill_allocating_task;
-@@ -72,6 +73,12 @@ unsigned long badness(struct task_struct
- points = mm->total_vm;
+@@ -186,9 +189,21 @@ unsigned long badness(struct task_struct
+ points >>= -(oom_adj);
+ }
- /*
-+ * add points for context badness
++ /*
++ * add points for context badness and
++ * reduce badness for processes belonging to
++ * a different context
+ */
+
+ points += vx_badness(p, mm);
+
-+ /*
- * After this unlock we can no longer dereference local variable `mm'
- */
- task_unlock(p);
-@@ -162,8 +169,8 @@ unsigned long badness(struct task_struct
- }
-
++ if ((vx_current_xid() > 1) &&
++ vx_current_xid() != vx_task_xid(p))
++ points /= 16;
++
#ifdef DEBUG
- printk(KERN_DEBUG "OOMkill: task %d (%s) got %lu points\n",
- p->pid, p->comm, points);
#endif
return points;
}
-@@ -326,8 +333,8 @@ static void __oom_kill_task(struct task_
+@@ -230,6 +245,7 @@ static struct task_struct *select_bad_pr
+ struct task_struct *p;
+ struct task_struct *chosen = NULL;
+ struct timespec uptime;
++ unsigned xid = vx_current_xid();
+ *ppoints = 0;
+
+ do_posix_clock_monotonic_gettime(&uptime);
+@@ -242,11 +258,14 @@ static struct task_struct *select_bad_pr
+ */
+ if (!p->mm)
+ continue;
+- /* skip the init task */
+- if (is_global_init(p))
++ /* skip the init task, global and per guest */
++ if (task_is_init(p))
+ continue;
+ if (mem && !task_in_mem_cgroup(p, mem))
+ continue;
++ /* skip other guest and host processes if oom in guest */
++ if (xid && vx_task_xid(p) != xid)
++ continue;
+
+ /*
+ * This task already has access to memory reserves and is
+@@ -357,8 +376,8 @@ static void __oom_kill_task(struct task_
}
if (verbose)
- printk(KERN_ERR "Killed process %d (%s)\n",
- task_pid_nr(p), p->comm);
-+ printk(KERN_ERR "Killed process %d:#%u (%s)\n",
-+ task_pid_nr(p), p->xid, p->comm);
++ printk(KERN_ERR "Killed process %s(%d:#%u)\n",
++ p->comm, task_pid_nr(p), p->xid);
/*
* We give our sacrificial lamb high priority and access to
-@@ -410,8 +417,8 @@ static int oom_kill_process(struct task_
+@@ -419,8 +438,8 @@ static int oom_kill_process(struct task_
return 0;
}
- printk(KERN_ERR "%s: kill process %d (%s) score %li or a child\n",
- message, task_pid_nr(p), p->comm, points);
-+ printk(KERN_ERR "%s: kill process %d:#%u (%s) score %li or a child\n",
-+ message, task_pid_nr(p), p->xid, p->comm, points);
++ printk(KERN_ERR "%s: kill process %s(%d:#%u) score %li or a child\n",
++ message, p->comm, task_pid_nr(p), p->xid, points);
/* Try to kill a child first */
list_for_each_entry(c, &p->children, sibling) {
-diff -NurpP --minimal linux-2.6.29.1/mm/page_alloc.c linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/page_alloc.c
---- linux-2.6.29.1/mm/page_alloc.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/page_alloc.c 2009-03-24 14:48:36.000000000 +0100
-@@ -46,6 +46,8 @@
- #include <linux/page-isolation.h>
+@@ -521,6 +540,8 @@ void clear_zonelist_oom(struct zonelist
+ spin_unlock(&zone_scan_lock);
+ }
+
++long vs_oom_action(unsigned int);
++
+ /*
+ * Must be called with tasklist_lock held for read.
+ */
+@@ -546,7 +567,11 @@ retry:
+ /* Found nothing?!?! Either we hang forever, or we panic. */
+ if (!p) {
+ read_unlock(&tasklist_lock);
+- panic("Out of memory and no killable processes...\n");
++ /* avoid panic for guest OOM */
++ if (current->xid)
++ vs_oom_action(LINUX_REBOOT_CMD_OOM);
++ else
++ panic("Out of memory and no killable processes...\n");
+ }
+
+ if (oom_kill_process(p, gfp_mask, order, points, NULL,
+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 <linux/kmemleak.h>
+#include <linux/vs_base.h>
+#include <linux/vs_limit.h>
+ #include <trace/events/kmem.h>
#include <asm/tlbflush.h>
- #include <asm/div64.h>
-@@ -1839,6 +1841,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);
-@@ -1859,6 +1864,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.29.1/mm/rmap.c linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/rmap.c
---- linux-2.6.29.1/mm/rmap.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/rmap.c 2009-03-24 18:26:27.000000000 +0100
-@@ -50,6 +50,7 @@
+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 <linux/migrate.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.29.1/mm/shmem.c linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/shmem.c
---- linux-2.6.29.1/mm/shmem.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/shmem.c 2009-03-24 14:48:36.000000000 +0100
-@@ -1757,7 +1757,7 @@ static int shmem_statfs(struct dentry *d
+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);
buf->f_bsize = PAGE_CACHE_SIZE;
buf->f_namelen = NAME_MAX;
spin_lock(&sbinfo->stat_lock);
-@@ -2326,7 +2326,7 @@ static int shmem_fill_super(struct super
+@@ -2346,7 +2346,7 @@ int shmem_fill_super(struct super_block
sb->s_maxbytes = SHMEM_MAX_BYTES;
sb->s_blocksize = PAGE_CACHE_SIZE;
sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
#ifdef CONFIG_TMPFS_POSIX_ACL
-diff -NurpP --minimal linux-2.6.29.1/mm/slab.c linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/slab.c
---- linux-2.6.29.1/mm/slab.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/slab.c 2009-03-24 14:48:36.000000000 +0100
-@@ -509,6 +509,8 @@ struct kmem_cache {
+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
/*
-@@ -3275,6 +3277,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);
-@@ -3347,6 +3350,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:
+ vx_slab_alloc(cachep, flags);
local_irq_restore(save_flags);
ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
-
-@@ -3518,6 +3522,7 @@ static inline void __cache_free(struct k
-
+ kmemleak_alloc_recursive(ptr, obj_size(cachep), 1, cachep->flags,
+@@ -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));
+ vx_slab_free(cachep);
- /*
- * Skip calling cache_free_alien() when the platform is not numa.
-diff -NurpP --minimal linux-2.6.29.1/mm/slab_vs.h linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/slab_vs.h
---- linux-2.6.29.1/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/slab_vs.h 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,27 @@
+ kmemcheck_slab_free(cachep, objp, obj_size(cachep));
+
+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>
+
+void vx_slab_alloc(struct kmem_cache *cachep, gfp_t flags)
+{
+ int what = gfp_zone(cachep->gfpflags);
++ struct vx_info *vxi = current_vx_info();
+
-+ if (!current->vx_info)
++ if (!vxi)
+ return;
+
-+ atomic_add(cachep->buffer_size, ¤t->vx_info->cacct.slab[what]);
++ atomic_add(cachep->buffer_size, &vxi->cacct.slab[what]);
+}
+
+static inline
+void vx_slab_free(struct kmem_cache *cachep)
+{
+ int what = gfp_zone(cachep->gfpflags);
++ struct vx_info *vxi = current_vx_info();
+
-+ if (!current->vx_info)
++ if (!vxi)
+ return;
+
-+ atomic_sub(cachep->buffer_size, ¤t->vx_info->cacct.slab[what]);
++ atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-2.6.29.1/mm/swapfile.c linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/swapfile.c
---- linux-2.6.29.1/mm/swapfile.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/mm/swapfile.c 2009-03-24 18:27:15.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;
-@@ -1935,6 +1937,8 @@ void si_swapinfo(struct sysinfo *val)
+@@ -1682,6 +1684,8 @@ static void *swap_next(struct seq_file *
+ if (v == SEQ_START_TOKEN)
+ ptr = swap_info;
+ else {
++ if (vx_flags(VXF_VIRT_MEM, 0))
++ return NULL;
+ ptr = v;
+ ptr++;
+ }
+@@ -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");
++ if (vx_flags(VXF_VIRT_MEM, 0)) {
++ struct sysinfo si;
++
++ vx_vsi_swapinfo(&si);
++ if (si.totalswap < (1 << 10))
++ return 0;
++ seq_printf(swap, "%s\t\t\t\t\t%s\t%lu\t%lu\t%d\n",
++ "hdv0", "partition", si.totalswap >> 10,
++ (si.totalswap - si.freeswap) >> 10, -1);
++ }
+ return 0;
+ }
+
+@@ -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.29.1/net/core/dev.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/core/dev.c
---- linux-2.6.29.1/net/core/dev.c 2009-04-15 22:53:12.000000000 +0200
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/core/dev.c 2009-04-15 22:58:30.000000000 +0200
+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>
#include <linux/random.h>
+#include <linux/vs_inet.h>
+ #include <trace/events/napi.h>
#include "net-sysfs.h"
+@@ -591,7 +592,8 @@ struct net_device *__dev_get_by_name(str
+ hlist_for_each(p, dev_name_hash(net, name)) {
+ struct net_device *dev
+ = hlist_entry(p, struct net_device, name_hlist);
+- if (!strncmp(dev->name, name, IFNAMSIZ))
++ if (!strncmp(dev->name, name, IFNAMSIZ) &&
++ nx_dev_visible(current_nx_info(), dev))
+ return dev;
+ }
+ return NULL;
+@@ -642,7 +644,8 @@ struct net_device *__dev_get_by_index(st
+ hlist_for_each(p, dev_index_hash(net, ifindex)) {
+ struct net_device *dev
+ = hlist_entry(p, struct net_device, index_hlist);
+- if (dev->ifindex == ifindex)
++ if ((dev->ifindex == ifindex) &&
++ nx_dev_visible(current_nx_info(), dev))
+ return dev;
+ }
+ return NULL;
+@@ -695,10 +698,12 @@ struct net_device *dev_getbyhwaddr(struc
+
+ ASSERT_RTNL();
+
+- for_each_netdev(net, dev)
++ for_each_netdev(net, dev) {
+ if (dev->type == type &&
+- !memcmp(dev->dev_addr, ha, dev->addr_len))
++ !memcmp(dev->dev_addr, ha, dev->addr_len) &&
++ nx_dev_visible(current_nx_info(), dev))
+ return dev;
++ }
+
+ return NULL;
+ }
+@@ -709,9 +714,11 @@ struct net_device *__dev_getfirstbyhwtyp
+ struct net_device *dev;
+
+ ASSERT_RTNL();
+- for_each_netdev(net, dev)
+- if (dev->type == type)
++ for_each_netdev(net, dev) {
++ if ((dev->type == type) &&
++ nx_dev_visible(current_nx_info(), dev))
+ return dev;
++ }
+
+ return NULL;
+ }
+@@ -830,6 +837,8 @@ static int __dev_alloc_name(struct net *
+ continue;
+ if (i < 0 || i >= max_netdevices)
+ continue;
++ if (!nx_dev_visible(current_nx_info(), d))
++ continue;
-@@ -2853,6 +2854,8 @@ static int dev_ifconf(struct net *net, c
+ /* avoid cases where sscanf is not exact inverse of printf */
+ snprintf(buf, IFNAMSIZ, name, i);
+@@ -3003,6 +3012,8 @@ static int dev_ifconf(struct net *net, c
total = 0;
for_each_netdev(net, dev) {
-+ if (!nx_dev_visible(current->nx_info, dev))
++ if (!nx_dev_visible(current_nx_info(), dev))
+ continue;
for (i = 0; i < NPROTO; i++) {
if (gifconf_list[i]) {
int done;
-@@ -2921,6 +2924,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);
-+ if (!nx_dev_visible(current->nx_info, dev))
++ if (!nx_dev_visible(current_nx_info(), dev))
+ return;
+
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,
-@@ -4862,6 +4868,15 @@ 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
-
-+#ifdef CONFIG_SYSFS
-+ /* Don't allow real devices to be moved when sysfs
-+ * is enabled.
-+ */
-+ err = -EINVAL;
-+ if (dev->dev.parent)
-+ goto out;
-+#endif
-+
+-
/* Ensure the device has been registrered */
err = -EINVAL;
if (dev->reg_state != NETREG_REGISTERED)
-@@ -4921,6 +4936,8 @@ int dev_change_net_namespace(struct net_
-
- netdev_unregister_kobject(dev);
-
-+ netdev_unregister_kobject(dev);
-+
- /* Actually switch the network namespace */
- dev_net_set(dev, net);
-
-diff -NurpP --minimal linux-2.6.29.1/net/core/net-sysfs.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/core/net-sysfs.c
---- linux-2.6.29.1/net/core/net-sysfs.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/core/net-sysfs.c 2009-03-24 18:30:01.000000000 +0100
-@@ -512,6 +512,9 @@ int netdev_register_kobject(struct net_d
- if (dev_net(net) != &init_net)
- return 0;
-
-+ if (dev_net(net) != &init_net)
-+ return 0;
-+
- return device_add(dev);
- }
-
-diff -NurpP --minimal linux-2.6.29.1/net/core/rtnetlink.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/core/rtnetlink.c
---- linux-2.6.29.1/net/core/rtnetlink.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/core/rtnetlink.c 2009-03-24 14:48:36.000000000 +0100
-@@ -690,6 +690,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
+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;
for_each_netdev(net, dev) {
if (idx < s_idx)
goto cont;
if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
-@@ -1235,6 +1237,9 @@ void rtmsg_ifinfo(int type, struct net_d
+@@ -1222,6 +1224,9 @@ void rtmsg_ifinfo(int type, struct net_d
struct sk_buff *skb;
int err = -ENOBUFS;
-+ if (!nx_dev_visible(current->nx_info, dev))
++ if (!nx_dev_visible(current_nx_info(), dev))
+ return;
+
skb = nlmsg_new(if_nlmsg_size(dev), GFP_KERNEL);
if (skb == NULL)
goto errout;
-diff -NurpP --minimal linux-2.6.29.1/net/core/sock.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/core/sock.c
---- linux-2.6.29.1/net/core/sock.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/core/sock.c 2009-03-24 14:48:36.000000000 +0100
-@@ -124,6 +124,10 @@
+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>
#include <linux/filter.h>
#ifdef CONFIG_INET
#include <net/tcp.h>
-@@ -900,6 +904,8 @@ static struct sock *sk_prot_alloc(struct
+@@ -984,6 +988,8 @@ static struct sock *sk_prot_alloc(struct
if (!try_module_get(prot->owner))
goto out_free_sec;
}
return sk;
-@@ -976,6 +982,11 @@ void sk_free(struct sock *sk)
+@@ -1063,6 +1069,11 @@ static void __sk_free(struct sock *sk)
__func__, atomic_read(&sk->sk_omem_alloc));
put_net(sock_net(sk));
sk_prot_free(sk->sk_prot_creator, sk);
}
-@@ -1011,6 +1022,8 @@ struct sock *sk_clone(const struct sock
+@@ -1110,6 +1121,8 @@ struct sock *sk_clone(const struct sock
/* SANITY */
get_net(sock_net(newsk));
sk_node_init(&newsk->sk_node);
sock_lock_init(newsk);
bh_lock_sock(newsk);
-@@ -1057,6 +1070,12 @@ struct sock *sk_clone(const struct sock
- newsk->sk_priority = 0;
+@@ -1164,6 +1177,12 @@ struct sock *sk_clone(const struct sock
+ smp_wmb();
atomic_set(&newsk->sk_refcnt, 2);
+ set_vx_info(&newsk->sk_vx_info, sk->sk_vx_info);
/*
* Increment the counter in the same struct proto as the master
* sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
-@@ -1744,6 +1763,11 @@ 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);
-+ set_vx_info(&sk->sk_vx_info, current->vx_info);
++ set_vx_info(&sk->sk_vx_info, current_vx_info());
+ sk->sk_xid = vx_current_xid();
+ vx_sock_inc(sk);
-+ set_nx_info(&sk->sk_nx_info, current->nx_info);
++ set_nx_info(&sk->sk_nx_info, current_nx_info());
+ sk->sk_nid = nx_current_nid();
- atomic_set(&sk->sk_refcnt, 1);
- atomic_set(&sk->sk_drops, 0);
- }
-diff -NurpP --minimal linux-2.6.29.1/net/ipv4/af_inet.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/af_inet.c
---- linux-2.6.29.1/net/ipv4/af_inet.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/af_inet.c 2009-03-24 14:48:37.000000000 +0100
++
+ /*
+ * 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.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>
#endif
+#include <linux/vs_limit.h>
- extern void ip_mc_drop_socket(struct sock *sk);
+ /* The inetsw table contains everything that inet_create needs to
@@ -325,9 +326,12 @@ lookup_protocol:
}
err = -EAFNOSUPPORT;
if (!inet_netns_ok(net, protocol))
goto out_rcu_unlock;
-@@ -445,6 +449,7 @@ int inet_bind(struct socket *sock, struc
+@@ -447,6 +451,7 @@ int inet_bind(struct socket *sock, struc
struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;
struct sock *sk = sock->sk;
struct inet_sock *inet = inet_sk(sk);
unsigned short snum;
int chk_addr_ret;
int err;
-@@ -458,7 +463,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
-@@ -470,7 +479,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)
-@@ -495,7 +504,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 */
-@@ -688,11 +697,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.29.1/net/ipv4/devinet.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/devinet.c
---- linux-2.6.29.1/net/ipv4/devinet.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/devinet.c 2009-03-24 14:48:37.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;
}
*colon = ':';
if ((in_dev = __in_dev_get_rtnl(dev)) != NULL) {
-+ struct nx_info *nxi = current->nx_info;
++ struct nx_info *nxi = current_nx_info();
+
if (tryaddrmatch) {
/* Matthias Andree */
goto out;
for (; ifa; ifa = ifa->ifa_next) {
-+ if (!nx_v4_ifa_visible(current->nx_info, ifa))
++ if (!nx_v4_ifa_visible(current_nx_info(), ifa))
+ continue;
if (!buf) {
done += sizeof(ifr);
continue;
-@@ -1156,6 +1166,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];
-@@ -1170,6 +1181,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.29.1/net/ipv4/fib_hash.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/fib_hash.c
---- linux-2.6.29.1/net/ipv4/fib_hash.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/fib_hash.c 2009-03-24 14:48:37.000000000 +0100
-@@ -1022,7 +1022,7 @@ static int fib_seq_show(struct seq_file
+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);
flags = fib_flag_trans(fa->fa_type, mask, fi);
- if (fi)
-+ if (fi && nx_dev_visible(current->nx_info, fi->fib_dev))
++ if (fi && nx_dev_visible(current_nx_info(), fi->fib_dev))
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.29.1/net/ipv4/inet_connection_sock.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/inet_connection_sock.c
---- linux-2.6.29.1/net/ipv4/inet_connection_sock.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/inet_connection_sock.c 2009-03-24 14:48:37.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.29.1/net/ipv4/inet_diag.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/inet_diag.c
---- linux-2.6.29.1/net/ipv4/inet_diag.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/inet_diag.c 2009-03-24 14:48:37.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>
#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
if (r->idiag_family == AF_INET6) {
-@@ -206,8 +208,8 @@ static int inet_twsk_diag_fill(struct in
+@@ -204,8 +206,8 @@ static int inet_twsk_diag_fill(struct in
r->id.idiag_cookie[1] = (u32)(((unsigned long)tw >> 31) >> 1);
r->id.idiag_sport = tw->tw_sport;
r->id.idiag_dport = tw->tw_dport;
r->idiag_state = tw->tw_substate;
r->idiag_timer = 3;
r->idiag_expires = DIV_ROUND_UP(tmo * 1000, HZ);
-@@ -264,6 +266,7 @@ static int inet_diag_get_exact(struct sk
+@@ -262,6 +264,7 @@ static int inet_diag_get_exact(struct sk
err = -EINVAL;
if (req->idiag_family == AF_INET) {
sk = inet_lookup(&init_net, hashinfo, req->id.idiag_dst[0],
req->id.idiag_dport, req->id.idiag_src[0],
req->id.idiag_sport, req->id.idiag_if);
-@@ -506,6 +509,7 @@ static int inet_csk_diag_dump(struct soc
+@@ -504,6 +507,7 @@ static int inet_csk_diag_dump(struct soc
} else
#endif
{
r->idiag_expires = jiffies_to_msecs(tmo);
r->idiag_rqueue = 0;
r->idiag_wqueue = 0;
-@@ -659,6 +664,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) ?
-@@ -729,6 +735,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;
-@@ -795,6 +803,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)))
-@@ -819,6 +829,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.29.1/net/ipv4/inet_hashtables.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/inet_hashtables.c
---- linux-2.6.29.1/net/ipv4/inet_hashtables.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/inet_hashtables.c 2009-03-24 19:35:10.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>
/*
-@@ -142,7 +143,6 @@ 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;
++ } else {
++ /* block non nx_info ips */
++ if (!v4_addr_in_nx_info(sk->sk_nx_info,
++ daddr, NXA_MASK_BIND))
++ return -1;
+ }
+ if (sk->sk_bound_dev_if) {
+ if (sk->sk_bound_dev_if != dif)
+@@ -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,
-@@ -165,6 +165,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.29.1/net/ipv4/netfilter/nf_nat_helper.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/netfilter/nf_nat_helper.c
---- linux-2.6.29.1/net/ipv4/netfilter/nf_nat_helper.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/netfilter/nf_nat_helper.c 2009-02-22 22:54:26.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.29.1/net/ipv4/netfilter.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/netfilter.c
---- linux-2.6.29.1/net/ipv4/netfilter.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/netfilter.c 2009-03-24 14:48:37.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.29.1/net/ipv4/raw.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/raw.c
---- linux-2.6.29.1/net/ipv4/raw.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/raw.c 2009-03-24 14:48:37.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->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
goto found; /* gotcha */
}
-@@ -372,6 +372,12 @@ static int raw_send_hdrinc(struct sock *
+@@ -383,6 +383,12 @@ static int raw_send_hdrinc(struct sock *
icmp_out_count(net, ((struct icmphdr *)
skb_transport_header(skb))->type);
err = NF_HOOK(PF_INET, NF_INET_LOCAL_OUT, skb, NULL, rt->u.dst.dev,
dst_output);
if (err > 0)
-@@ -383,6 +389,7 @@ out:
-
- error_fault:
- err = -EFAULT;
-+error_free:
- kfree_skb(skb);
- error:
- IP_INC_STATS(net, IPSTATS_MIB_OUTDISCARDS);
-@@ -550,6 +557,13 @@ static int raw_sendmsg(struct kiocb *ioc
+@@ -563,6 +569,13 @@ static int raw_sendmsg(struct kiocb *ioc
}
security_sk_classify_flow(sk, &fl);
err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 1);
}
if (err)
-@@ -619,17 +633,19 @@ static int raw_bind(struct sock *sk, str
+@@ -635,17 +648,19 @@ static int raw_bind(struct sock *sk, str
{
struct inet_sock *inet = inet_sk(sk);
struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->saddr = 0; /* Use device */
sk_dst_reset(sk);
-@@ -681,7 +697,8 @@ static int raw_recvmsg(struct kiocb *ioc
+@@ -697,7 +712,8 @@ static int raw_recvmsg(struct kiocb *ioc
/* Copy the address. */
if (sin) {
sin->sin_family = AF_INET;
sin->sin_port = 0;
memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
}
-@@ -858,7 +875,8 @@ static struct sock *raw_get_first(struct
+@@ -875,7 +891,8 @@ static struct sock *raw_get_first(struct
struct hlist_node *node;
sk_for_each(sk, node, &state->h->ht[state->bucket])
goto found;
}
sk = NULL;
-@@ -874,7 +892,8 @@ static struct sock *raw_get_next(struct
+@@ -891,7 +908,8 @@ static struct sock *raw_get_next(struct
sk = sk_next(sk);
try_again:
;
if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
sk = sk_head(&state->h->ht[state->bucket]);
-@@ -933,7 +952,10 @@ static void raw_sock_seq_show(struct seq
+@@ -950,7 +968,10 @@ static void raw_sock_seq_show(struct seq
seq_printf(seq, "%4d: %08X:%04X %08X:%04X"
" %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d\n",
+ nx_map_sock_lback(current_nx_info(), src), srcp,
+ nx_map_sock_lback(current_nx_info(), dest), destp,
+ sp->sk_state,
- atomic_read(&sp->sk_wmem_alloc),
- atomic_read(&sp->sk_rmem_alloc),
+ 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.29.1/net/ipv4/tcp.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/tcp.c
---- linux-2.6.29.1/net/ipv4/tcp.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/tcp.c 2009-03-24 14:48:37.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.29.1/net/ipv4/tcp_ipv4.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/tcp_ipv4.c
---- linux-2.6.29.1/net/ipv4/tcp_ipv4.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/tcp_ipv4.c 2009-03-24 19:51:34.000000000 +0100
-@@ -1894,6 +1894,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;
-@@ -1918,6 +1924,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;
-@@ -1981,6 +1991,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;
-@@ -1991,6 +2006,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;
-@@ -2019,7 +2039,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) {
-@@ -2042,6 +2064,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;
}
-@@ -2193,9 +2220,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. */
-@@ -2238,7 +2265,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),
-@@ -2274,7 +2304,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.29.1/net/ipv4/tcp_minisocks.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/tcp_minisocks.c
---- linux-2.6.29.1/net/ipv4/tcp_minisocks.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/tcp_minisocks.c 2009-03-24 14:48:37.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>
#ifdef CONFIG_SYSCTL
#define SYNC_INIT 0 /* let the user enable it */
#else
-@@ -293,6 +297,11 @@ void tcp_time_wait(struct sock *sk, int
+@@ -294,6 +298,11 @@ void tcp_time_wait(struct sock *sk, int
tcptw->tw_ts_recent = tp->rx_opt.ts_recent;
tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp;
#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.29.1/net/ipv4/udp.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/udp.c
---- linux-2.6.29.1/net/ipv4/udp.c 2009-04-15 22:53:12.000000000 +0200
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv4/udp.c 2009-04-15 22:58:30.000000000 +0200
-@@ -222,14 +222,7 @@ fail:
- return error;
+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);
-static int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
-{
- struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2);
-
-- return ( !ipv6_only_sock(sk2) &&
-- (!inet1->rcv_saddr || !inet2->rcv_saddr ||
-- inet1->rcv_saddr == inet2->rcv_saddr ));
+- return (!ipv6_only_sock(sk2) &&
+- (!inet1->rcv_saddr || !inet2->rcv_saddr ||
+- inet1->rcv_saddr == inet2->rcv_saddr));
-}
+extern int ipv4_rcv_saddr_equal(const struct sock *, const struct sock *);
int udp_v4_get_port(struct sock *sk, unsigned short snum)
{
-@@ -251,6 +244,11 @@ static inline int compute_score(struct s
+@@ -253,6 +246,11 @@ static inline int compute_score(struct s
if (inet->rcv_saddr != daddr)
return -1;
score += 2;
}
if (inet->daddr) {
if (inet->daddr != saddr)
-@@ -271,6 +269,7 @@ static inline int compute_score(struct s
+@@ -273,6 +271,7 @@ static inline int compute_score(struct s
return score;
}
/* UDP is nearly always wildcards out the wazoo, it makes no sense to try
* harder than this. -DaveM
*/
-@@ -292,6 +291,11 @@ begin:
+@@ -294,6 +293,11 @@ begin:
sk_nulls_for_each_rcu(sk, node, &hslot->head) {
score = compute_score(sk, net, saddr, hnum, sport,
daddr, dport, dif);
if (score > badness) {
result = sk;
badness = score;
-@@ -305,6 +309,7 @@ begin:
+@@ -307,6 +311,7 @@ begin:
if (get_nulls_value(node) != hash)
goto begin;
if (result) {
if (unlikely(!atomic_inc_not_zero(&result->sk_refcnt)))
result = NULL;
-@@ -314,6 +319,7 @@ begin:
+@@ -316,6 +321,7 @@ begin:
goto begin;
}
}
rcu_read_unlock();
return result;
}
-@@ -356,7 +362,7 @@ static inline struct sock *udp_v4_mcast_
+@@ -358,7 +364,7 @@ static inline struct sock *udp_v4_mcast_
s->sk_hash != hnum ||
(inet->daddr && inet->daddr != rmt_addr) ||
(inet->dport != rmt_port && inet->dport) ||
ipv6_only_sock(s) ||
(s->sk_bound_dev_if && s->sk_bound_dev_if != dif))
continue;
-@@ -694,8 +700,13 @@ int udp_sendmsg(struct kiocb *iocb, stru
+@@ -707,8 +713,13 @@ int udp_sendmsg(struct kiocb *iocb, stru
{ .sport = inet->sport,
.dport = dport } } };
struct net *net = sock_net(sk);
err = ip_route_output_flow(net, &rt, &fl, sk, 1);
if (err) {
if (err == -ENETUNREACH)
-@@ -940,7 +951,8 @@ try_again:
- {
+@@ -988,7 +999,8 @@ try_again:
+ if (sin) {
sin->sin_family = AF_INET;
sin->sin_port = udp_hdr(skb)->source;
- sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
}
if (inet->cmsg_flags)
-@@ -1594,6 +1606,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;
}
-@@ -1611,7 +1625,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)
-@@ -1716,7 +1732,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",
+ nx_map_sock_lback(current_nx_info(), src), srcp,
+ nx_map_sock_lback(current_nx_info(), dest), destp,
+ sp->sk_state,
- atomic_read(&sp->sk_wmem_alloc),
- atomic_read(&sp->sk_rmem_alloc),
+ 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.29.1/net/ipv6/addrconf.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/addrconf.c
---- linux-2.6.29.1/net/ipv6/addrconf.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/addrconf.c 2009-03-24 20:39:23.000000000 +0100
-@@ -85,6 +85,8 @@
+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>
#include <linux/seq_file.h>
/* Set to 3 to get tracing... */
#define ACONF_DEBUG 2
-@@ -1111,7 +1113,7 @@ out:
+@@ -1119,7 +1121,7 @@ out:
int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
const struct in6_addr *daddr, unsigned int prefs,
{
struct ipv6_saddr_score scores[2],
*score = &scores[0], *hiscore = &scores[1];
-@@ -1184,6 +1186,8 @@ int ipv6_dev_get_saddr(struct net *net,
+@@ -1192,6 +1194,8 @@ int ipv6_dev_get_saddr(struct net *net,
dev->name);
continue;
}
score->rule = -1;
bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
-@@ -1367,35 +1371,46 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str
- return ifp;
- }
-
-+extern int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2);
-+
- int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
- {
- const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
- const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
-- __be32 sk_rcv_saddr = inet_sk(sk)->rcv_saddr;
- __be32 sk2_rcv_saddr = inet_rcv_saddr(sk2);
- int sk_ipv6only = ipv6_only_sock(sk);
- int sk2_ipv6only = inet_v6_ipv6only(sk2);
- int addr_type = ipv6_addr_type(sk_rcv_saddr6);
- int addr_type2 = sk2_rcv_saddr6 ? ipv6_addr_type(sk2_rcv_saddr6) : IPV6_ADDR_MAPPED;
-
-- if (!sk2_rcv_saddr && !sk_ipv6only)
-+ /* FIXME: needs handling for v4 ANY */
-+ if (!sk2_rcv_saddr && !sk_ipv6only && !sk2->sk_nx_info)
- return 1;
-
- if (addr_type2 == IPV6_ADDR_ANY &&
-- !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED))
-+ !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED) &&
-+ v6_addr_in_nx_info(sk2->sk_nx_info, sk_rcv_saddr6, -1))
- return 1;
-
- if (addr_type == IPV6_ADDR_ANY &&
-- !(sk_ipv6only && addr_type2 == IPV6_ADDR_MAPPED))
-+ !(sk_ipv6only && addr_type2 == IPV6_ADDR_MAPPED) &&
-+ (sk2_rcv_saddr6 && v6_addr_in_nx_info(sk->sk_nx_info, sk2_rcv_saddr6, -1)))
-+ return 1;
-+
-+ if (addr_type == IPV6_ADDR_ANY &&
-+ addr_type2 == IPV6_ADDR_ANY &&
-+ nx_v6_addr_conflict(sk->sk_nx_info, sk2->sk_nx_info))
- return 1;
-
- if (sk2_rcv_saddr6 &&
-+ addr_type != IPV6_ADDR_ANY &&
-+ addr_type != IPV6_ADDR_ANY &&
- ipv6_addr_equal(sk_rcv_saddr6, sk2_rcv_saddr6))
- return 1;
-
- if (addr_type == IPV6_ADDR_MAPPED &&
- !sk2_ipv6only &&
-- (!sk2_rcv_saddr || !sk_rcv_saddr || sk_rcv_saddr == sk2_rcv_saddr))
-+ ipv4_rcv_saddr_equal(sk, sk2))
- return 1;
-
- return 0;
-@@ -2993,7 +3008,10 @@ static void if6_seq_stop(struct seq_file
+@@ -3000,7 +3004,10 @@ static void if6_seq_stop(struct seq_file
static int if6_seq_show(struct seq_file *seq, void *v)
{
struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
&ifp->addr,
ifp->idev->dev->ifindex,
ifp->prefix_len,
-@@ -3487,6 +3505,12 @@ static int inet6_dump_addr(struct sk_buf
+@@ -3497,6 +3504,12 @@ static int inet6_dump_addr(struct sk_buf
struct ifmcaddr6 *ifmca;
struct ifacaddr6 *ifaca;
struct net *net = sock_net(skb->sk);
s_idx = cb->args[0];
s_ip_idx = ip_idx = cb->args[1];
-@@ -3508,6 +3532,8 @@ static int inet6_dump_addr(struct sk_buf
+@@ -3518,6 +3531,8 @@ static int inet6_dump_addr(struct sk_buf
ifa = ifa->if_next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
err = inet6_fill_ifaddr(skb, ifa,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq,
-@@ -3521,6 +3547,8 @@ static int inet6_dump_addr(struct sk_buf
+@@ -3531,6 +3546,8 @@ static int inet6_dump_addr(struct sk_buf
ifmca = ifmca->next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
err = inet6_fill_ifmcaddr(skb, ifmca,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq,
-@@ -3534,6 +3562,8 @@ static int inet6_dump_addr(struct sk_buf
+@@ -3544,6 +3561,8 @@ static int inet6_dump_addr(struct sk_buf
ifaca = ifaca->aca_next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
err = inet6_fill_ifacaddr(skb, ifaca,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq,
-@@ -3819,12 +3849,19 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -3830,12 +3849,19 @@ static int inet6_dump_ifinfo(struct sk_b
int s_idx = cb->args[0];
struct net_device *dev;
struct inet6_dev *idev;
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.29.1/net/ipv6/af_inet6.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/af_inet6.c
---- linux-2.6.29.1/net/ipv6/af_inet6.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/af_inet6.c 2009-03-24 14:48:37.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>
#include <net/ip.h>
#include <net/ipv6.h>
-@@ -49,6 +51,7 @@
- #include <net/tcp.h>
- #include <net/ipip.h>
- #include <net/protocol.h>
-+#include <net/route.h>
- #include <net/inet_common.h>
- #include <net/route.h>
- #include <net/transp_v6.h>
-@@ -146,9 +149,12 @@ lookup_protocol:
+@@ -158,9 +160,12 @@ lookup_protocol:
}
err = -EPERM;
sock->ops = answer->ops;
answer_prot = answer->prot;
answer_no_check = answer->no_check;
-@@ -247,6 +253,7 @@ int inet6_bind(struct socket *sock, stru
+@@ -259,6 +264,7 @@ int inet6_bind(struct socket *sock, stru
struct inet_sock *inet = inet_sk(sk);
struct ipv6_pinfo *np = inet6_sk(sk);
struct net *net = sock_net(sk);
__be32 v4addr = 0;
unsigned short snum;
int addr_type = 0;
-@@ -258,6 +265,11 @@ int inet6_bind(struct socket *sock, stru
+@@ -270,6 +276,11 @@ int inet6_bind(struct socket *sock, stru
if (addr_len < SIN6_LEN_RFC2133)
return -EINVAL;
addr_type = ipv6_addr_type(&addr->sin6_addr);
if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM)
return -EINVAL;
-@@ -281,6 +293,10 @@ int inet6_bind(struct socket *sock, stru
+@@ -301,6 +312,7 @@ int inet6_bind(struct socket *sock, stru
+ /* Reproduce AF_INET checks to make the bindings consitant */
+ v4addr = addr->sin6_addr.s6_addr32[3];
+ chk_addr_ret = inet_addr_type(net, v4addr);
++
+ if (!sysctl_ip_nonlocal_bind &&
+ !(inet->freebind || inet->transparent) &&
+ v4addr != htonl(INADDR_ANY) &&
+@@ -310,6 +322,10 @@ int inet6_bind(struct socket *sock, stru
err = -EADDRNOTAVAIL;
goto out;
}
} else {
if (addr_type != IPV6_ADDR_ANY) {
struct net_device *dev = NULL;
-@@ -306,6 +322,11 @@ int inet6_bind(struct socket *sock, stru
+@@ -335,6 +351,11 @@ int inet6_bind(struct socket *sock, stru
}
}
/* ipv4 addr of the socket is invalid. Only the
* unspecified and mapped address have a v4 equivalent.
*/
-@@ -324,6 +345,8 @@ int inet6_bind(struct socket *sock, stru
+@@ -353,6 +374,8 @@ int inet6_bind(struct socket *sock, stru
}
}
inet->rcv_saddr = v4addr;
inet->saddr = v4addr;
-@@ -416,9 +439,11 @@ int inet6_getname(struct socket *sock, s
+@@ -448,9 +471,11 @@ int inet6_getname(struct socket *sock, s
return -ENOTCONN;
sin->sin6_port = inet->dport;
ipv6_addr_copy(&sin->sin6_addr, &np->daddr);
if (ipv6_addr_any(&np->rcv_saddr))
ipv6_addr_copy(&sin->sin6_addr, &np->saddr);
else
-diff -NurpP --minimal linux-2.6.29.1/net/ipv6/fib6_rules.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/fib6_rules.c
---- linux-2.6.29.1/net/ipv6/fib6_rules.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/fib6_rules.c 2009-02-22 22:54:26.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.29.1/net/ipv6/inet6_hashtables.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/inet6_hashtables.c
---- linux-2.6.29.1/net/ipv6/inet6_hashtables.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/inet6_hashtables.c 2009-03-24 20:50:24.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.29.1/net/ipv6/ip6_output.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/ip6_output.c
---- linux-2.6.29.1/net/ipv6/ip6_output.c 2009-03-24 14:22:47.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/ip6_output.c 2009-03-24 14:48:37.000000000 +0100
-@@ -951,7 +951,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.29.1/net/ipv6/Kconfig linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/Kconfig
---- linux-2.6.29.1/net/ipv6/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/Kconfig 2009-02-22 22:54:26.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.29.1/net/ipv6/ndisc.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/ndisc.c
---- linux-2.6.29.1/net/ipv6/ndisc.c 2009-03-24 14:22:47.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/ndisc.c 2009-03-24 14:48:37.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.29.1/net/ipv6/raw.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/raw.c
---- linux-2.6.29.1/net/ipv6/raw.c 2009-03-24 14:22:47.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/raw.c 2009-03-24 14:48:37.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.29.1/net/ipv6/route.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/route.c
---- linux-2.6.29.1/net/ipv6/route.c 2009-03-24 14:22:47.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/route.c 2009-03-24 14:48:37.000000000 +0100
-@@ -2254,7 +2254,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.29.1/net/ipv6/tcp_ipv6.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/tcp_ipv6.c
---- linux-2.6.29.1/net/ipv6/tcp_ipv6.c 2009-03-24 14:22:47.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/tcp_ipv6.c 2009-03-24 14:48:37.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.29.1/net/ipv6/udp.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/udp.c
---- linux-2.6.29.1/net/ipv6/udp.c 2009-03-24 14:22:47.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/udp.c 2009-03-24 20:56:49.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>
+#include <linux/vs_inet6.h>
#include "udp_impl.h"
+ int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
+@@ -61,24 +62,49 @@ int ipv6_rcv_saddr_equal(const struct so
+ int addr_type2 = sk2_rcv_saddr6 ? ipv6_addr_type(sk2_rcv_saddr6) : IPV6_ADDR_MAPPED;
+
+ /* if both are mapped, treat as IPv4 */
+- if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED)
+- return (!sk2_ipv6only &&
++ if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) {
++ if (!sk2_ipv6only &&
+ (!sk_rcv_saddr || !sk2_rcv_saddr ||
+- sk_rcv_saddr == sk2_rcv_saddr));
++ sk_rcv_saddr == sk2_rcv_saddr))
++ goto vs_v4;
++ else
++ return 0;
++ }
+
+ if (addr_type2 == IPV6_ADDR_ANY &&
+ !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED))
+- return 1;
++ goto vs;
+
+ if (addr_type == IPV6_ADDR_ANY &&
+ !(sk_ipv6only && addr_type2 == IPV6_ADDR_MAPPED))
+- return 1;
++ goto vs;
+
+ if (sk2_rcv_saddr6 &&
+ ipv6_addr_equal(sk_rcv_saddr6, sk2_rcv_saddr6))
+- return 1;
++ goto vs;
+
+ return 0;
++
++vs_v4:
++ if (!sk_rcv_saddr && !sk2_rcv_saddr)
++ return nx_v4_addr_conflict(sk->sk_nx_info, sk2->sk_nx_info);
++ if (!sk2_rcv_saddr)
++ return v4_addr_in_nx_info(sk->sk_nx_info, sk2_rcv_saddr, -1);
++ if (!sk_rcv_saddr)
++ return v4_addr_in_nx_info(sk2->sk_nx_info, sk_rcv_saddr, -1);
++ return 1;
++vs:
++ if (addr_type2 == IPV6_ADDR_ANY && addr_type == IPV6_ADDR_ANY)
++ return nx_v6_addr_conflict(sk->sk_nx_info, sk2->sk_nx_info);
++ else if (addr_type2 == IPV6_ADDR_ANY)
++ return v6_addr_in_nx_info(sk2->sk_nx_info, sk_rcv_saddr6, -1);
++ else if (addr_type == IPV6_ADDR_ANY) {
++ if (addr_type2 == IPV6_ADDR_MAPPED)
++ return nx_v4_addr_conflict(sk->sk_nx_info, sk2->sk_nx_info);
++ else
++ return v6_addr_in_nx_info(sk->sk_nx_info, sk2_rcv_saddr6, -1);
++ }
++ return 1;
+ }
+
int udp_v6_get_port(struct sock *sk, unsigned short snum)
-@@ -77,6 +78,10 @@ static inline int compute_score(struct s
+@@ -109,6 +135,10 @@ static inline int compute_score(struct s
if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
return -1;
score++;
}
if (!ipv6_addr_any(&np->daddr)) {
if (!ipv6_addr_equal(&np->daddr, saddr))
-diff -NurpP --minimal linux-2.6.29.1/net/ipv6/xfrm6_policy.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/xfrm6_policy.c
---- linux-2.6.29.1/net/ipv6/xfrm6_policy.c 2009-03-24 14:22:47.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/ipv6/xfrm6_policy.c 2009-03-24 14:48:37.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.29.1/net/netlink/af_netlink.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/netlink/af_netlink.c
---- linux-2.6.29.1/net/netlink/af_netlink.c 2009-03-24 14:22:47.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/netlink/af_netlink.c 2009-03-24 14:48:37.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>
-@@ -1776,6 +1779,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;
-@@ -1810,7 +1815,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;
-@@ -1822,7 +1828,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.29.1/net/sctp/ipv6.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/sctp/ipv6.c
---- linux-2.6.29.1/net/sctp/ipv6.c 2009-03-24 14:22:48.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/sctp/ipv6.c 2009-03-24 20:58:14.000000000 +0100
-@@ -317,7 +317,8 @@ static void sctp_v6_get_saddr(struct sct
+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,
inet6_sk(&sk->inet.sk)->srcprefs,
SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: %pI6\n",
&saddr->v6.sin6_addr);
return;
-diff -NurpP --minimal linux-2.6.29.1/net/socket.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/socket.c
---- linux-2.6.29.1/net/socket.c 2009-03-24 14:22:48.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/socket.c 2009-03-24 14:48:37.000000000 +0100
-@@ -95,6 +95,10 @@
+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>
#include <linux/netfilter.h>
static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
-@@ -549,7 +553,7 @@ static inline int __sock_sendmsg(struct
+@@ -559,7 +563,7 @@ static inline int __sock_sendmsg(struct
struct msghdr *msg, size_t size)
{
struct sock_iocb *si = kiocb_to_siocb(iocb);
si->sock = sock;
si->scm = NULL;
-@@ -560,7 +564,22 @@ static inline int __sock_sendmsg(struct
+@@ -570,7 +574,22 @@ static inline int __sock_sendmsg(struct
if (err)
return err;
}
int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
-@@ -629,7 +648,7 @@ EXPORT_SYMBOL_GPL(__sock_recv_timestamp)
+@@ -671,7 +690,7 @@ EXPORT_SYMBOL_GPL(__sock_recv_timestamp)
static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
struct msghdr *msg, size_t size, int flags)
{
struct sock_iocb *si = kiocb_to_siocb(iocb);
si->sock = sock;
-@@ -642,7 +661,18 @@ static inline int __sock_recvmsg(struct
+@@ -684,7 +703,18 @@ static inline int __sock_recvmsg(struct
if (err)
return err;
}
int sock_recvmsg(struct socket *sock, struct msghdr *msg,
-@@ -1106,6 +1136,13 @@ static int __sock_create(struct net *net
+@@ -1155,6 +1185,13 @@ static int __sock_create(struct net *net
if (type < 0 || type >= SOCK_MAX)
return -EINVAL;
/* Compatibility.
This uglymoron is moved from INET layer to here to avoid
-@@ -1238,6 +1275,7 @@ SYSCALL_DEFINE3(socket, int, family, int
+@@ -1287,6 +1324,7 @@ SYSCALL_DEFINE3(socket, int, family, int
if (retval < 0)
goto out;
retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
if (retval < 0)
goto out_release;
-@@ -1279,10 +1317,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
+@@ -1328,10 +1366,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
err = sock_create(family, type, protocol, &sock1);
if (err < 0)
goto out;
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-2.6.29.1/net/sunrpc/auth.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/sunrpc/auth.c
---- linux-2.6.29.1/net/sunrpc/auth.c 2009-03-24 14:22:48.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/sunrpc/auth.c 2009-03-24 21:00:49.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.29.1/net/sunrpc/auth_unix.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/sunrpc/auth_unix.c
---- linux-2.6.29.1/net/sunrpc/auth_unix.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/sunrpc/auth_unix.c 2009-02-22 22:54:26.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.29.1/net/sunrpc/clnt.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/sunrpc/clnt.c
---- linux-2.6.29.1/net/sunrpc/clnt.c 2009-03-24 14:22:48.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/sunrpc/clnt.c 2009-03-24 14:48:37.000000000 +0100
-@@ -32,6 +32,7 @@
+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>
#include <linux/in6.h>
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/rpc_pipe_fs.h>
-@@ -335,6 +336,9 @@ struct rpc_clnt *rpc_create(struct rpc_c
+@@ -358,6 +359,9 @@ struct rpc_clnt *rpc_create(struct rpc_c
if (!(args->flags & RPC_CLNT_CREATE_QUIET))
clnt->cl_chatty = 1;
return clnt;
}
EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-2.6.29.1/net/unix/af_unix.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/unix/af_unix.c
---- linux-2.6.29.1/net/unix/af_unix.c 2009-03-24 14:22:48.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/unix/af_unix.c 2009-03-24 14:48:37.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;
-@@ -2110,6 +2114,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;
-@@ -2134,7 +2140,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.29.1/net/x25/af_x25.c linux-2.6.29.1-vs2.3.0.36.9-pre5/net/x25/af_x25.c
---- linux-2.6.29.1/net/x25/af_x25.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/net/x25/af_x25.c 2009-02-22 22:54:26.000000000 +0100
-@@ -506,7 +506,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.29.1/scripts/checksyscalls.sh linux-2.6.29.1-vs2.3.0.36.9-pre5/scripts/checksyscalls.sh
---- linux-2.6.29.1/scripts/checksyscalls.sh 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/scripts/checksyscalls.sh 2009-02-22 22:54:26.000000000 +0100
-@@ -108,7 +108,6 @@ cat << EOF
+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
#define __IGNORE_putpmsg
EOF
}
-diff -NurpP --minimal linux-2.6.29.1/security/commoncap.c linux-2.6.29.1-vs2.3.0.36.9-pre5/security/commoncap.c
---- linux-2.6.29.1/security/commoncap.c 2009-03-24 14:23:21.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/security/commoncap.c 2009-03-25 00:34:48.000000000 +0100
-@@ -27,10 +27,11 @@
+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>
#include <linux/securebits.h>
+#include <linux/vs_context.h>
+ /*
+ * If a non-root user executes a setuid-root binary in
+@@ -52,7 +53,7 @@ static void warn_setuid_and_fcaps_mixed(
+
int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
{
- NETLINK_CB(skb).eff_cap = current_cap();
return 0;
}
-@@ -40,6 +41,7 @@ int cap_netlink_recv(struct sk_buff *skb
+@@ -62,6 +63,7 @@ int cap_netlink_recv(struct sk_buff *skb
return -EPERM;
return 0;
}
EXPORT_SYMBOL(cap_netlink_recv);
/**
-@@ -60,7 +62,22 @@ EXPORT_SYMBOL(cap_netlink_recv);
+@@ -82,7 +84,22 @@ EXPORT_SYMBOL(cap_netlink_recv);
int cap_capable(struct task_struct *tsk, const struct cred *cred, int cap,
int audit)
{
}
/**
-@@ -586,7 +603,7 @@ int cap_inode_setxattr(struct dentry *de
+@@ -618,7 +635,7 @@ int cap_inode_setxattr(struct dentry *de
+
+ 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) &&
return -EPERM;
return 0;
}
-@@ -931,7 +948,8 @@ error:
+@@ -962,7 +979,8 @@ error:
*/
int cap_syslog(int type)
{
return -EPERM;
return 0;
}
-@@ -953,3 +971,4 @@ int cap_vm_enough_memory(struct mm_struc
- cap_sys_admin = 1;
- return __vm_enough_memory(mm, pages, cap_sys_admin);
- }
-+
-diff -NurpP --minimal linux-2.6.29.1/security/selinux/hooks.c linux-2.6.29.1-vs2.3.0.36.9-pre5/security/selinux/hooks.c
---- linux-2.6.29.1/security/selinux/hooks.c 2009-03-24 14:23:21.000000000 +0100
-+++ linux-2.6.29.1-vs2.3.0.36.9-pre5/security/selinux/hooks.c 2009-03-24 14:48:37.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.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_CAPABILITY2, CAPABILITY2__MAC_ADMIN, "mac_admin")
++ S_(SECCLASS_CAPABILITY2, CAPABILITY2__CONTEXT, "context")
+ 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
projects / packages / kernel.git / blobdiff