[kernel] r8274 - in dists/trunk/linux-2.6/debian/patches: debian features/all/vserver series
Bastian Blank
waldi at alioth.debian.org
Tue Feb 6 13:27:48 UTC 2007
Author: waldi
Date: Tue Feb 6 14:27:47 2007
New Revision: 8274
Added:
dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.2.0-pre1.patch
- copied, changed from r8229, dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc9.patch
Removed:
dists/trunk/linux-2.6/debian/patches/debian/vserver-version.patch
dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc9.patch
Modified:
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
Log:
* Add vserver patch 2.2.0-pre1.
* Remove old version code.
* debian/patches/debian/vserver-version.patch,
debian/patches/features/all/vserver/vs2.0.2.2-rc9.patch: Remove.
* debian/patches/features/all/vserver/vs2.2.0-pre1.patch: Add.
* debian/patches/series/1~experimental.1-extra: Update.
Copied: dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.2.0-pre1.patch (from r8229, dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc9.patch)
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc9.patch (original)
+++ dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.2.0-pre1.patch Tue Feb 6 14:27:47 2007
@@ -1,6 +1,163 @@
---- linux-2.6.18.5/arch/alpha/Kconfig 2006-12-04 06:13:47 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/alpha/Kconfig 2006-12-10 19:44:56 +0100
-@@ -632,6 +632,8 @@ source "arch/alpha/oprofile/Kconfig"
+--- linux-2.6.20/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/Documentation/vserver/debug.txt 2007-02-06 03:05:21 +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"
+--- linux-2.6.20/arch/alpha/Kconfig 2007-02-06 02:59:58 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/alpha/Kconfig 2007-02-06 03:05:21 +0100
+@@ -640,6 +640,8 @@ source "arch/alpha/oprofile/Kconfig"
source "arch/alpha/Kconfig.debug"
@@ -9,8 +166,27 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/alpha/kernel/entry.S 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/alpha/kernel/entry.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/alpha/kernel/asm-offsets.c 2007-02-06 03:05:21 +0100
+@@ -36,6 +36,7 @@ void foo(void)
+ DEFINE(PT_PTRACED, PT_PTRACED);
+ DEFINE(CLONE_VM, CLONE_VM);
+ DEFINE(CLONE_UNTRACED, CLONE_UNTRACED);
++ DEFINE(CLONE_KTHREAD, CLONE_KTHREAD);
+ DEFINE(SIGCHLD, SIGCHLD);
+ BLANK();
+
+--- linux-2.6.20/arch/alpha/kernel/entry.S 2006-11-30 21:18:23 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/alpha/kernel/entry.S 2007-02-06 03:05:21 +0100
+@@ -644,7 +644,7 @@ kernel_thread:
+ stq $2, 152($sp) /* HAE */
+
+ /* Shuffle FLAGS to the front; add CLONE_VM. */
+- ldi $1, CLONE_VM|CLONE_UNTRACED
++ ldi $1, CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD;
+ or $18, $1, $16
+ bsr $26, sys_clone
+
@@ -873,24 +873,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
@@ -43,114 +219,32 @@
ret
.end sys_getxpid
---- linux-2.6.18.5/arch/alpha/kernel/osf_sys.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/alpha/kernel/osf_sys.c 2006-09-20 20:11:48 +0200
-@@ -38,6 +38,7 @@
- #include <linux/uio.h>
- #include <linux/vfs.h>
- #include <linux/rcupdate.h>
-+#include <linux/vs_cvirt.h>
-
- #include <asm/fpu.h>
- #include <asm/io.h>
-@@ -399,18 +400,20 @@ asmlinkage int
- osf_utsname(char __user *name)
- {
- int error;
-+ struct new_utsname *ptr;
-
- down_read(&uts_sem);
-+ ptr = vx_new_utsname();
- error = -EFAULT;
-- if (copy_to_user(name + 0, system_utsname.sysname, 32))
-+ if (copy_to_user(name + 0, ptr->sysname, 32))
- goto out;
-- if (copy_to_user(name + 32, system_utsname.nodename, 32))
-+ if (copy_to_user(name + 32, ptr->nodename, 32))
- goto out;
-- if (copy_to_user(name + 64, system_utsname.release, 32))
-+ if (copy_to_user(name + 64, ptr->release, 32))
- goto out;
-- if (copy_to_user(name + 96, system_utsname.version, 32))
-+ if (copy_to_user(name + 96, ptr->version, 32))
- goto out;
-- if (copy_to_user(name + 128, system_utsname.machine, 32))
-+ if (copy_to_user(name + 128, ptr->machine, 32))
- goto out;
-
- error = 0;
-@@ -439,6 +442,7 @@ osf_getdomainname(char __user *name, int
- {
- unsigned len;
- int i;
-+ char *domainname;
-
- if (!access_ok(VERIFY_WRITE, name, namelen))
- return -EFAULT;
-@@ -448,9 +452,10 @@ osf_getdomainname(char __user *name, int
- len = 32;
-
- down_read(&uts_sem);
-+ domainname = vx_new_uts(domainname);
- for (i = 0; i < len; ++i) {
-- __put_user(system_utsname.domainname[i], name + i);
-- if (system_utsname.domainname[i] == '\0')
-+ __put_user(domainname[i], name + i);
-+ if (domainname[i] == '\0')
- break;
- }
- up_read(&uts_sem);
-@@ -607,30 +612,30 @@ osf_sigstack(struct sigstack __user *uss
- asmlinkage long
- osf_sysinfo(int command, char __user *buf, long count)
- {
-- static char * sysinfo_table[] = {
-- system_utsname.sysname,
-- system_utsname.nodename,
-- system_utsname.release,
-- system_utsname.version,
-- system_utsname.machine,
-- "alpha", /* instruction set architecture */
-- "dummy", /* hardware serial number */
-- "dummy", /* hardware manufacturer */
-- "dummy", /* secure RPC domain */
-- };
- unsigned long offset;
- char *res;
- long len, err = -EINVAL;
-
- offset = command-1;
-- if (offset >= ARRAY_SIZE(sysinfo_table)) {
-+ if (offset >= 9) {
- /* Digital UNIX has a few unpublished interfaces here */
- printk("sysinfo(%d)", command);
- goto out;
+--- linux-2.6.20/arch/alpha/kernel/osf_sys.c 2007-02-06 02:59:58 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/alpha/kernel/osf_sys.c 2007-02-06 03:05:21 +0100
+@@ -885,7 +885,7 @@ osf_gettimeofday(struct timeval32 __user
+ {
+ if (tv) {
+ struct timeval ktv;
+- do_gettimeofday(&ktv);
++ vx_gettimeofday(&ktv);
+ if (put_tv32(tv, &ktv))
+ return -EFAULT;
}
+--- linux-2.6.20/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/alpha/kernel/ptrace.c 2007-02-06 03:05:21 +0100
+@@ -15,6 +15,7 @@
+ #include <linux/slab.h>
+ #include <linux/security.h>
+ #include <linux/signal.h>
++#include <linux/vs_base.h>
- down_read(&uts_sem);
-- res = sysinfo_table[offset];
-+ switch (offset)
-+ {
-+ case 0: res = vx_new_uts(sysname); break;
-+ case 1: res = vx_new_uts(nodename); break;
-+ case 2: res = vx_new_uts(release); break;
-+ case 3: res = vx_new_uts(version); break;
-+ case 4: res = vx_new_uts(machine); break;
-+ case 5: res = "alpha"; break;
-+ default:
-+ res = "dummy";
-+ break;
-+ }
- len = strlen(res)+1;
- if (len > count)
- len = count;
---- linux-2.6.18.5/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/alpha/kernel/ptrace.c 2006-09-20 17:01:44 +0200
-@@ -283,6 +283,11 @@ do_sys_ptrace(long request, long pid, lo
+ #include <asm/uaccess.h>
+ #include <asm/pgtable.h>
+@@ -283,6 +284,11 @@ do_sys_ptrace(long request, long pid, lo
goto out_notsk;
}
-+ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT)) {
++ if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT)) {
+ ret = -EPERM;
+ goto out;
+ }
@@ -158,9 +252,44 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out;
---- linux-2.6.18.5/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/alpha/kernel/systbls.S 2006-09-20 17:01:44 +0200
-@@ -447,7 +447,7 @@ sys_call_table:
+--- linux-2.6.20/arch/alpha/kernel/semaphore.c 2004-08-14 12:55:32 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/alpha/kernel/semaphore.c 2007-02-06 03:05:21 +0100
+@@ -68,8 +68,8 @@ __down_failed(struct semaphore *sem)
+ DECLARE_WAITQUEUE(wait, tsk);
+
+ #ifdef CONFIG_DEBUG_SEMAPHORE
+- printk("%s(%d): down failed(%p)\n",
+- tsk->comm, tsk->pid, sem);
++ printk("%s(%d:#%u): down failed(%p)\n",
++ tsk->comm, tsk->pid, tsk->xid, sem);
+ #endif
+
+ tsk->state = TASK_UNINTERRUPTIBLE;
+@@ -97,8 +97,8 @@ __down_failed(struct semaphore *sem)
+ wake_up(&sem->wait);
+
+ #ifdef CONFIG_DEBUG_SEMAPHORE
+- printk("%s(%d): down acquired(%p)\n",
+- tsk->comm, tsk->pid, sem);
++ printk("%s(%d:#%u): down acquired(%p)\n",
++ tsk->comm, tsk->pid, tsk->xid, sem);
+ #endif
+ }
+
+@@ -110,8 +110,8 @@ __down_failed_interruptible(struct semap
+ long ret = 0;
+
+ #ifdef CONFIG_DEBUG_SEMAPHORE
+- printk("%s(%d): down failed(%p)\n",
+- tsk->comm, tsk->pid, sem);
++ printk("%s(%d:#%u): down failed(%p)\n",
++ tsk->comm, tsk->pid, tsk->xid, sem);
+ #endif
+
+ tsk->state = TASK_INTERRUPTIBLE;
+--- linux-2.6.20/arch/alpha/kernel/systbls.S 2006-11-30 21:18:23 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/alpha/kernel/systbls.S 2007-02-06 03:05:21 +0100
+@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
.quad sys_fstat64
@@ -169,8 +298,20 @@
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
---- linux-2.6.18.5/arch/alpha/mm/init.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/alpha/mm/init.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/alpha/kernel/traps.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/alpha/kernel/traps.c 2007-02-06 03:05:21 +0100
+@@ -182,7 +182,8 @@ die_if_kernel(char * str, struct pt_regs
+ #ifdef CONFIG_SMP
+ printk("CPU %d ", hard_smp_processor_id());
+ #endif
+- printk("%s(%d): %s %ld\n", current->comm, current->pid, str, err);
++ printk("%s(%d[#%u]): %s %ld\n", current->comm,
++ current->pid, current->xid, str, err);
+ dik_show_regs(regs, r9_15);
+ dik_show_trace((unsigned long *)(regs+1));
+ dik_show_code((unsigned int *)regs->pc);
+--- linux-2.6.20/arch/alpha/mm/init.c 2006-11-30 21:18:23 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/alpha/mm/init.c 2007-02-06 03:05:21 +0100
@@ -20,6 +20,7 @@
#include <linux/init.h>
#include <linux/bootmem.h> /* max_low_pfn */
@@ -179,9 +320,9 @@
#include <asm/system.h>
#include <asm/uaccess.h>
---- linux-2.6.18.5/arch/arm/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/arm/Kconfig 2006-09-20 17:01:44 +0200
-@@ -907,6 +907,8 @@ source "arch/arm/oprofile/Kconfig"
+--- linux-2.6.20/arch/arm/Kconfig 2007-02-06 02:59:58 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/arm/Kconfig 2007-02-06 03:05:21 +0100
+@@ -970,6 +970,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -190,8 +331,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/arm/kernel/calls.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/arm/kernel/calls.S 2007-02-06 02:59:59 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/arm/kernel/calls.S 2007-02-06 03:05:21 +0100
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -201,34 +342,44 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
---- linux-2.6.18.5/arch/arm/kernel/irq.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/arm/kernel/irq.c 2006-12-10 02:04:47 +0100
-@@ -112,7 +112,8 @@ static struct irq_desc bad_irq_desc = {
- asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs)
- {
- struct irqdesc *desc = irq_desc + irq;
--
-+ struct vx_info_save vxis;
-+
- /*
- * Some hardware gives randomly wrong interrupts. Rather
- * than crashing, do something sensible.
-@@ -121,12 +122,10 @@ asmlinkage void asm_do_IRQ(unsigned int
- desc = &bad_irq_desc;
-
- irq_enter();
--
- desc_handle_irq(irq, desc, regs);
-
- /* AT91 specific workaround */
- irq_finish(irq);
--
- irq_exit();
+--- linux-2.6.20/arch/arm/kernel/process.c 2007-02-06 02:59:59 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/arm/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -246,7 +246,8 @@ void __show_regs(struct pt_regs *regs)
+ void show_regs(struct pt_regs * regs)
+ {
+ printk("\n");
+- printk("Pid: %d, comm: %20s\n", current->pid, current->comm);
++ printk("Pid: %d[#%u], comm: %20s\n",
++ current->pid, current->xid, current->comm);
+ __show_regs(regs);
+ __backtrace();
}
+@@ -408,7 +409,8 @@ pid_t kernel_thread(int (*fn)(void *), v
+ regs.ARM_pc = (unsigned long)kernel_thread_helper;
+ regs.ARM_cpsr = SVC_MODE;
+
+- return do_fork(flags|CLONE_VM|CLONE_UNTRACED, 0, ®s, 0, NULL, NULL);
++ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++ 0, ®s, 0, NULL, NULL);
+ }
+ EXPORT_SYMBOL(kernel_thread);
+
+--- linux-2.6.20/arch/arm/kernel/traps.c 2007-02-06 02:59:59 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/arm/kernel/traps.c 2007-02-06 03:05:21 +0100
+@@ -206,8 +206,8 @@ static void __die(const char *str, int e
+ printk("Internal error: %s: %x [#%d]\n", str, err, ++die_counter);
+ print_modules();
+ __show_regs(regs);
+- printk("Process %s (pid: %d, stack limit = 0x%p)\n",
+- tsk->comm, tsk->pid, thread + 1);
++ printk("Process %s (pid: %d:#%u, stack limit = 0x%p)\n",
++ tsk->comm, tsk->pid, tsk->xid, thread + 1);
---- linux-2.6.18.5/arch/arm26/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/arm26/Kconfig 2006-09-20 17:01:44 +0200
-@@ -234,6 +234,8 @@ source "drivers/usb/Kconfig"
+ if (!user_mode(regs) || in_interrupt()) {
+ dump_mem("Stack: ", regs->ARM_sp,
+--- linux-2.6.20/arch/arm26/Kconfig 2007-02-06 03:00:02 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/arm26/Kconfig 2007-02-06 03:05:21 +0100
+@@ -242,6 +242,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -237,8 +388,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/arm26/kernel/calls.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/arm26/kernel/calls.S 2007-02-06 03:05:21 +0100
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -251,8 +402,20 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
---- linux-2.6.18.5/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/arm26/kernel/traps.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/arm26/kernel/process.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/arm26/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -365,7 +365,8 @@ pid_t kernel_thread(int (*fn)(void *), v
+ regs.ARM_r3 = (unsigned long)do_exit;
+ regs.ARM_pc = (unsigned long)kernel_thread_helper | MODE_SVC26;
+
+- return do_fork(flags|CLONE_VM|CLONE_UNTRACED, 0, ®s, 0, NULL, NULL);
++ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++ 0, ®s, 0, NULL, NULL);
+ }
+ EXPORT_SYMBOL(kernel_thread);
+
+--- linux-2.6.20/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/arm26/kernel/traps.c 2007-02-06 03:05:21 +0100
@@ -185,8 +185,9 @@ NORET_TYPE void die(const char *str, str
printk("Internal error: %s: %x\n", str, err);
printk("CPU: %d\n", smp_processor_id());
@@ -265,9 +428,9 @@
if (!user_mode(regs) || in_interrupt()) {
__dump_stack(tsk, (unsigned long)(regs + 1));
---- linux-2.6.18.5/arch/cris/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/cris/Kconfig 2006-09-20 17:01:44 +0200
-@@ -185,6 +185,8 @@ source "drivers/usb/Kconfig"
+--- linux-2.6.20/arch/cris/Kconfig 2007-02-06 03:00:02 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/cris/Kconfig 2007-02-06 03:05:21 +0100
+@@ -193,6 +193,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -276,8 +439,32 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/cris/kernel/irq.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/cris/kernel/irq.c 2006-11-07 18:59:56 +0100
+--- linux-2.6.20/arch/cris/arch-v10/kernel/process.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/cris/arch-v10/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -103,7 +103,8 @@ int kernel_thread(int (*fn)(void *), voi
+ regs.dccr = 1 << I_DCCR_BITNR;
+
+ /* Ok, create the new process.. */
+- return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL, NULL);
++ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++ 0, ®s, 0, NULL, NULL);
+ }
+
+ /* setup the child's kernel stack with a pt_regs and switch_stack on it.
+--- linux-2.6.20/arch/cris/arch-v32/kernel/process.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/cris/arch-v32/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -120,7 +120,8 @@ kernel_thread(int (*fn)(void *), void *
+ regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
+
+ /* Create the new process. */
+- return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL, NULL);
++ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++ 0, ®s, 0, NULL, NULL);
+ }
+
+ /*
+--- linux-2.6.20/arch/cris/kernel/irq.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/cris/kernel/irq.c 2007-02-06 03:05:21 +0100
@@ -92,6 +92,7 @@ skip:
asmlinkage void do_IRQ(int irq, struct pt_regs * regs)
{
@@ -286,9 +473,29 @@
irq_enter();
sp = rdsp();
if (unlikely((sp & (PAGE_SIZE - 1)) < (PAGE_SIZE/8))) {
---- linux-2.6.18.5/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/h8300/Kconfig 2006-09-20 17:01:44 +0200
-@@ -199,6 +199,8 @@ source "fs/Kconfig"
+--- linux-2.6.20/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/frv/kernel/kernel_thread.S 2007-02-06 03:05:21 +0100
+@@ -13,6 +13,8 @@
+ #include <asm/unistd.h>
+
+ #define CLONE_VM 0x00000100 /* set if VM shared between processes */
++#define CLONE_KTHREAD 0x10000000 /* kernel thread */
++#define CLONE_KT (CLONE_VM | CLONE_KTHREAD) /* kernel thread flags */
+ #define KERN_ERR "<3>"
+
+ .section .rodata
+@@ -37,7 +39,7 @@ kernel_thread:
+
+ # start by forking the current process, but with shared VM
+ setlos.p #__NR_clone,gr7 ; syscall number
+- ori gr10,#CLONE_VM,gr8 ; first syscall arg [clone_flags]
++ ori gr10,#CLONE_KT,gr8 ; first syscall arg [clone_flags]
+ sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
+ setlo #0xe4e4,gr9
+ setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
+--- linux-2.6.20/arch/h8300/Kconfig 2007-02-06 03:00:03 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/h8300/Kconfig 2007-02-06 03:05:21 +0100
+@@ -207,6 +207,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -297,9 +504,20 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/i386/Kconfig 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/i386/Kconfig 2006-09-20 17:01:44 +0200
-@@ -1142,6 +1142,8 @@ endmenu
+--- linux-2.6.20/arch/h8300/kernel/process.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/h8300/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -134,7 +134,7 @@ int kernel_thread(int (*fn)(void *), voi
+
+ fs = get_fs();
+ set_fs (KERNEL_DS);
+- clone_arg = flags | CLONE_VM;
++ clone_arg = flags | CLONE_VM | CLONE_KTHREAD;
+ __asm__("mov.l sp,er3\n\t"
+ "sub.l er2,er2\n\t"
+ "mov.l %2,er1\n\t"
+--- linux-2.6.20/arch/i386/Kconfig 2007-02-06 03:00:03 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/i386/Kconfig 2007-02-06 03:05:21 +0100
+@@ -1214,6 +1214,8 @@ endmenu
source "arch/i386/Kconfig.debug"
@@ -308,9 +526,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/i386/kernel/irq.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/i386/kernel/irq.c 2006-12-10 02:04:47 +0100
-@@ -81,7 +81,6 @@ fastcall unsigned int do_IRQ(struct pt_r
+--- linux-2.6.20/arch/i386/kernel/irq.c 2006-11-30 21:18:26 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/i386/kernel/irq.c 2007-02-06 03:05:21 +0100
+@@ -84,7 +84,6 @@ fastcall unsigned int do_IRQ(struct pt_r
}
}
#endif
@@ -318,57 +536,41 @@
#ifdef CONFIG_4KSTACKS
curctx = (union irq_ctx *) current_thread_info();
---- linux-2.6.18.5/arch/i386/kernel/sys_i386.c 2006-06-18 04:51:53 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/i386/kernel/sys_i386.c 2006-09-20 17:01:44 +0200
-@@ -19,6 +19,7 @@
- #include <linux/mman.h>
- #include <linux/file.h>
- #include <linux/utsname.h>
-+#include <linux/vs_cvirt.h>
-
- #include <asm/uaccess.h>
- #include <asm/ipc.h>
-@@ -210,7 +211,7 @@ asmlinkage int sys_uname(struct old_utsn
- if (!name)
- return -EFAULT;
- down_read(&uts_sem);
-- err=copy_to_user(name, &system_utsname, sizeof (*name));
-+ err=copy_to_user(name, vx_new_utsname(), sizeof (*name));
- up_read(&uts_sem);
- return err?-EFAULT:0;
+@@ -124,7 +123,6 @@ fastcall unsigned int do_IRQ(struct pt_r
+ } else
+ #endif
+ desc->handle_irq(irq, desc);
+-
+ irq_exit();
+ set_irq_regs(old_regs);
+ return 1;
+--- linux-2.6.20/arch/i386/kernel/process.c 2007-02-06 03:00:06 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/i386/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -294,8 +294,10 @@ void show_regs(struct pt_regs * regs)
+ unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
+
+ printk("\n");
+- printk("Pid: %d, comm: %20s\n", current->pid, current->comm);
+- printk("EIP: %04x:[<%08lx>] CPU: %d\n",0xffff & regs->xcs,regs->eip, smp_processor_id());
++ printk("Pid: %d[#%u], comm: %20s\n",
++ current->pid, current->xid, current->comm);
++ printk("EIP: %04x:[<%08lx>] CPU: %d\n",
++ 0xffff & regs->xcs,regs->eip, smp_processor_id());
+ print_symbol("EIP is at %s\n", regs->eip);
+
+ if (user_mode_vm(regs))
+@@ -347,7 +349,8 @@ int kernel_thread(int (*fn)(void *), voi
+ regs.eflags = X86_EFLAGS_IF | X86_EFLAGS_SF | X86_EFLAGS_PF | 0x2;
+
+ /* Ok, create the new process.. */
+- return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL, NULL);
++ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++ 0, ®s, 0, NULL, NULL);
}
-@@ -218,6 +219,7 @@ asmlinkage int sys_uname(struct old_utsn
- asmlinkage int sys_olduname(struct oldold_utsname __user * name)
- {
- int error;
-+ struct new_utsname *ptr;
+ EXPORT_SYMBOL(kernel_thread);
- if (!name)
- return -EFAULT;
-@@ -226,15 +228,16 @@ asmlinkage int sys_olduname(struct oldol
-
- down_read(&uts_sem);
-
-- error = __copy_to_user(&name->sysname,&system_utsname.sysname,__OLD_UTS_LEN);
-+ ptr = vx_new_utsname();
-+ error = __copy_to_user(&name->sysname,ptr->sysname,__OLD_UTS_LEN);
- error |= __put_user(0,name->sysname+__OLD_UTS_LEN);
-- error |= __copy_to_user(&name->nodename,&system_utsname.nodename,__OLD_UTS_LEN);
-+ error |= __copy_to_user(&name->nodename,ptr->nodename,__OLD_UTS_LEN);
- error |= __put_user(0,name->nodename+__OLD_UTS_LEN);
-- error |= __copy_to_user(&name->release,&system_utsname.release,__OLD_UTS_LEN);
-+ error |= __copy_to_user(&name->release,ptr->release,__OLD_UTS_LEN);
- error |= __put_user(0,name->release+__OLD_UTS_LEN);
-- error |= __copy_to_user(&name->version,&system_utsname.version,__OLD_UTS_LEN);
-+ error |= __copy_to_user(&name->version,ptr->version,__OLD_UTS_LEN);
- error |= __put_user(0,name->version+__OLD_UTS_LEN);
-- error |= __copy_to_user(&name->machine,&system_utsname.machine,__OLD_UTS_LEN);
-+ error |= __copy_to_user(&name->machine,ptr->machine,__OLD_UTS_LEN);
- error |= __put_user(0,name->machine+__OLD_UTS_LEN);
-
- up_read(&uts_sem);
---- linux-2.6.18.5/arch/i386/kernel/syscall_table.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/i386/kernel/syscall_table.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/i386/kernel/syscall_table.S 2006-11-30 21:18:26 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/i386/kernel/syscall_table.S 2007-02-06 03:05:21 +0100
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
@@ -378,8 +580,8 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
---- linux-2.6.18.5/arch/i386/kernel/sysenter.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/i386/kernel/sysenter.c 2006-09-20 21:46:26 +0200
+--- linux-2.6.20/arch/i386/kernel/sysenter.c 2007-02-06 03:00:07 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/i386/kernel/sysenter.c 2007-02-06 03:05:21 +0100
@@ -17,6 +17,7 @@
#include <linux/elf.h>
#include <linux/mm.h>
@@ -388,7 +590,7 @@
#include <asm/cpufeature.h>
#include <asm/msr.h>
-@@ -156,7 +157,7 @@ int arch_setup_additional_pages(struct l
+@@ -163,7 +164,7 @@ int arch_setup_additional_pages(struct l
current->mm->context.vdso = (void *)addr;
current_thread_info()->sysenter_return =
(void *)VDSO_SYM(&SYSENTER_RETURN);
@@ -397,17 +599,18 @@
up_fail:
up_write(&mm->mmap_sem);
return ret;
---- linux-2.6.18.5/arch/i386/kernel/traps.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/i386/kernel/traps.c 2006-09-20 20:10:14 +0200
-@@ -53,6 +53,7 @@
- #include <asm/kdebug.h>
+--- linux-2.6.20/arch/i386/kernel/traps.c 2007-02-06 03:00:07 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/i386/kernel/traps.c 2007-02-06 03:05:21 +0100
+@@ -56,6 +56,8 @@
+ #include <asm/stacktrace.h>
#include <linux/module.h>
-+#include <linux/vserver/debug.h>
++#include <linux/vs_context.h>
++#include <linux/vserver/history.h>
#include "mach_traps.h"
-@@ -304,8 +305,8 @@ void show_registers(struct pt_regs *regs
+@@ -315,8 +317,8 @@ void show_registers(struct pt_regs *regs
regs->esi, regs->edi, regs->ebp, esp);
printk(KERN_EMERG "ds: %04x es: %04x ss: %04x\n",
regs->xds & 0xffff, regs->xes & 0xffff, ss);
@@ -418,7 +621,7 @@
current_thread_info(), current, current->thread_info);
/*
* When in-kernel, we also print out the stack and code at the
-@@ -388,6 +389,8 @@ void die(const char * str, struct pt_reg
+@@ -386,6 +388,8 @@ void die(const char * str, struct pt_reg
oops_enter();
@@ -427,7 +630,7 @@
if (die.lock_owner != raw_smp_processor_id()) {
console_verbose();
spin_lock_irqsave(&die.lock, flags);
-@@ -424,9 +427,9 @@ void die(const char * str, struct pt_reg
+@@ -423,9 +427,9 @@ void die(const char * str, struct pt_reg
if (nl)
printk("\n");
if (notify_die(DIE_OOPS, str, regs, err,
@@ -439,9 +642,9 @@
/* Executive summary in case the oops scrolled away */
esp = (unsigned long) (®s->esp);
savesegment(ss, ss);
---- linux-2.6.18.5/arch/ia64/Kconfig 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/ia64/Kconfig 2006-09-20 17:01:44 +0200
-@@ -525,6 +525,8 @@ endmenu
+--- linux-2.6.20/arch/ia64/Kconfig 2007-02-06 03:00:07 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/ia64/Kconfig 2007-02-06 03:05:21 +0100
+@@ -568,6 +568,8 @@ endmenu
source "arch/ia64/Kconfig.debug"
@@ -450,8 +653,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/ia64/ia32/binfmt_elf32.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/ia64/ia32/binfmt_elf32.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/ia64/ia32/binfmt_elf32.c 2007-02-06 03:00:07 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/ia64/ia32/binfmt_elf32.c 2007-02-06 03:05:21 +0100
@@ -238,7 +238,8 @@ ia32_setup_arg_pages (struct linux_binpr
kmem_cache_free(vm_area_cachep, mpnt);
return ret;
@@ -462,8 +665,8 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
---- linux-2.6.18.5/arch/ia64/ia32/ia32_entry.S 2006-06-18 04:51:55 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/ia64/ia32/ia32_entry.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/ia64/ia32/ia32_entry.S 2006-06-18 04:51:55 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/ia64/ia32/ia32_entry.S 2007-02-06 03:05:21 +0100
@@ -483,7 +483,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -473,20 +676,41 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
---- linux-2.6.18.5/arch/ia64/kernel/entry.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/ia64/kernel/entry.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/ia64/ia32/sys_ia32.c 2007-02-06 03:00:07 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/ia64/ia32/sys_ia32.c 2007-02-06 03:05:21 +0100
+@@ -1182,7 +1182,7 @@ sys32_gettimeofday (struct compat_timeva
+ {
+ if (tv) {
+ struct timeval ktv;
+- do_gettimeofday(&ktv);
++ vx_gettimeofday(&ktv);
+ if (put_tv32(tv, &ktv))
+ return -EFAULT;
+ }
+--- linux-2.6.20/arch/ia64/kernel/asm-offsets.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/ia64/kernel/asm-offsets.c 2007-02-06 03:05:21 +0100
+@@ -191,6 +191,7 @@ void foo(void)
+ /* for assembly files which can't include sched.h: */
+ DEFINE(IA64_CLONE_VFORK, CLONE_VFORK);
+ DEFINE(IA64_CLONE_VM, CLONE_VM);
++ DEFINE(IA64_CLONE_KTHREAD, CLONE_KTHREAD);
+
+ BLANK();
+ DEFINE(IA64_CPUINFO_NSEC_PER_CYC_OFFSET,
+--- linux-2.6.20/arch/ia64/kernel/entry.S 2007-02-06 03:00:07 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/ia64/kernel/entry.S 2007-02-06 03:07:01 +0100
@@ -1576,7 +1576,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
- data8 sys_ni_syscall // reserved for kexec_load
+ data8 sys_kexec_load
- data8 sys_ni_syscall // reserved for vserver
+ data8 sys_vserver
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
---- linux-2.6.18.5/arch/ia64/kernel/perfmon.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/ia64/kernel/perfmon.c 2006-10-18 01:19:40 +0200
-@@ -40,6 +40,7 @@
+--- linux-2.6.20/arch/ia64/kernel/perfmon.c 2007-02-06 03:00:07 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/ia64/kernel/perfmon.c 2007-02-06 03:05:21 +0100
+@@ -41,6 +41,7 @@
#include <linux/capability.h>
#include <linux/rcupdate.h>
#include <linux/completion.h>
@@ -494,7 +718,7 @@
#include <asm/errno.h>
#include <asm/intrinsics.h>
-@@ -2354,7 +2355,7 @@ pfm_smpl_buffer_alloc(struct task_struct
+@@ -2356,7 +2357,7 @@ pfm_smpl_buffer_alloc(struct task_struct
*/
insert_vm_struct(mm, vma);
@@ -503,20 +727,76 @@
vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
vma_pages(vma));
up_write(&task->mm->mmap_sem);
---- linux-2.6.18.5/arch/ia64/kernel/ptrace.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/ia64/kernel/ptrace.c 2006-10-18 01:19:40 +0200
-@@ -1442,6 +1442,9 @@ sys_ptrace (long request, pid_t pid, uns
+--- linux-2.6.20/arch/ia64/kernel/process.c 2007-02-06 03:00:07 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/ia64/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -105,7 +105,8 @@ show_regs (struct pt_regs *regs)
+ unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
+
+ print_modules();
+- printk("\nPid: %d, CPU %d, comm: %20s\n", current->pid, smp_processor_id(), current->comm);
++ printk("\nPid: %d[#%u], CPU %d, comm: %20s\n",
++ current->pid, current->xid, smp_processor_id(), current->comm);
+ printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s\n",
+ regs->cr_ipsr, regs->cr_ifs, ip, print_tainted());
+ print_symbol("ip is at %s\n", ip);
+@@ -694,7 +695,8 @@ kernel_thread (int (*fn)(void *), void *
+ regs.sw.ar_fpsr = regs.pt.ar_fpsr = ia64_getreg(_IA64_REG_AR_FPSR);
+ regs.sw.ar_bspstore = (unsigned long) current + IA64_RBS_OFFSET;
+ regs.sw.pr = (1 << PRED_KERNEL_STACK);
+- return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s.pt, 0, NULL, NULL);
++ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++ 0, ®s.pt, 0, NULL, NULL);
+ }
+ EXPORT_SYMBOL(kernel_thread);
+
+--- linux-2.6.20/arch/ia64/kernel/ptrace.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/ia64/kernel/ptrace.c 2007-02-06 03:05:21 +0100
+@@ -17,6 +17,7 @@
+ #include <linux/security.h>
+ #include <linux/audit.h>
+ #include <linux/signal.h>
++#include <linux/vs_base.h>
+
+ #include <asm/pgtable.h>
+ #include <asm/processor.h>
+@@ -1442,6 +1443,9 @@ sys_ptrace (long request, pid_t pid, uns
read_unlock(&tasklist_lock);
if (!child)
goto out;
-+ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT))
+ goto out_tsk;
+
ret = -EPERM;
if (pid == 1) /* no messing around with init! */
goto out_tsk;
---- linux-2.6.18.5/arch/ia64/mm/fault.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/ia64/mm/fault.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/ia64/kernel/traps.c 2007-02-06 03:00:07 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/ia64/kernel/traps.c 2007-02-06 03:09:13 +0100
+@@ -106,8 +106,9 @@ die (const char *str, struct pt_regs *re
+ put_cpu();
+
+ if (++die.lock_owner_depth < 3) {
+- printk("%s[%d]: %s %ld [%d]\n",
+- current->comm, current->pid, str, err, ++die_counter);
++ printk("%s[%d[#%u]]: %s %ld [%d]\n",
++ current->comm, current->pid, current->xid,
++ str, err, ++die_counter);
+ (void) notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV);
+ show_regs(regs);
+ } else
+@@ -359,8 +360,9 @@ handle_fpu_swa (int fp_fault, struct pt_
+ if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) {
+ last.time = current_jiffies + 5 * HZ;
+ printk(KERN_WARNING
+- "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
+- current->comm, current->pid, regs->cr_iip + ia64_psr(regs)->ri, isr);
++ "%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n",
++ current->comm, current->pid, current->xid,
++ regs->cr_iip + ia64_psr(regs)->ri, isr);
+ }
+ }
+ }
+--- linux-2.6.20/arch/ia64/mm/fault.c 2006-11-30 21:18:27 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/ia64/mm/fault.c 2007-02-06 03:05:21 +0100
@@ -10,6 +10,7 @@
#include <linux/smp_lock.h>
#include <linux/interrupt.h>
@@ -525,8 +805,8 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
---- linux-2.6.18.5/arch/ia64/sn/kernel/xpc_main.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/ia64/sn/kernel/xpc_main.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/ia64/sn/kernel/xpc_main.c 2007-02-06 03:00:08 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/ia64/sn/kernel/xpc_main.c 2007-02-06 03:05:21 +0100
@@ -108,6 +108,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] =
0644,
NULL,
@@ -551,28 +831,46 @@
&sysctl_intvec,
NULL,
&xpc_disengage_request_min_timelimit,
---- linux-2.6.18.5/arch/m32r/kernel/sys_m32r.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/m32r/kernel/sys_m32r.c 2006-09-20 17:01:44 +0200
-@@ -20,6 +20,7 @@
- #include <linux/mman.h>
- #include <linux/file.h>
- #include <linux/utsname.h>
-+#include <linux/vs_cvirt.h>
+--- linux-2.6.20/arch/m32r/kernel/irq.c 2006-11-30 21:18:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/m32r/kernel/irq.c 2007-02-06 03:05:21 +0100
+@@ -78,6 +78,7 @@ skip:
+ asmlinkage unsigned int do_IRQ(int irq, struct pt_regs *regs)
+ {
+ struct pt_regs *old_regs;
++
+ old_regs = set_irq_regs(regs);
+ irq_enter();
- #include <asm/uaccess.h>
- #include <asm/cachectl.h>
-@@ -205,7 +206,7 @@ asmlinkage int sys_uname(struct old_utsn
- if (!name)
- return -EFAULT;
- down_read(&uts_sem);
-- err=copy_to_user(name, &system_utsname, sizeof (*name));
-+ err=copy_to_user(name, vx_new_utsname(), sizeof (*name));
- up_read(&uts_sem);
- return err?-EFAULT:0;
- }
---- linux-2.6.18.5/arch/m68k/Kconfig 2006-06-18 04:51:57 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/m68k/Kconfig 2006-09-20 17:01:44 +0200
-@@ -654,6 +654,8 @@ source "fs/Kconfig"
+--- linux-2.6.20/arch/m32r/kernel/process.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/m32r/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -211,8 +211,8 @@ int kernel_thread(int (*fn)(void *), voi
+ regs.psw = M32R_PSW_BIE;
+
+ /* Ok, create the new process. */
+- return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL,
+- NULL);
++ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++ 0, ®s, 0, NULL, NULL);
+ }
+
+ /*
+--- linux-2.6.20/arch/m32r/kernel/traps.c 2006-11-30 21:18:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/m32r/kernel/traps.c 2007-02-06 03:05:21 +0100
+@@ -195,8 +195,9 @@ static void show_registers(struct pt_reg
+ } else {
+ printk("SPI: %08lx\n", sp);
+ }
+- printk("Process %s (pid: %d, process nr: %d, stackpage=%08lx)",
+- current->comm, current->pid, 0xffff & i, 4096+(unsigned long)current);
++ printk("Process %s (pid: %d[#%u], process nr: %d, stackpage=%08lx)",
++ current->comm, current->pid, current->xid,
++ 0xffff & i, 4096+(unsigned long)current);
+
+ /*
+ * When in-kernel, we also print out the stack and code at the
+--- linux-2.6.20/arch/m68k/Kconfig 2007-02-06 03:00:08 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/m68k/Kconfig 2007-02-06 03:05:21 +0100
+@@ -662,6 +662,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -581,20 +879,53 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/m68k/kernel/ptrace.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/m68k/kernel/ptrace.c 2006-09-20 17:01:44 +0200
-@@ -279,6 +279,8 @@ long arch_ptrace(struct task_struct *chi
+--- linux-2.6.20/arch/m68k/kernel/process.c 2006-11-30 21:18:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/m68k/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -159,7 +159,8 @@ int kernel_thread(int (*fn)(void *), voi
+
+ {
+ register long retval __asm__ ("d0");
+- register long clone_arg __asm__ ("d1") = flags | CLONE_VM | CLONE_UNTRACED;
++ register long clone_arg __asm__ ("d1") =
++ flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD;
+
+ retval = __NR_clone;
+ __asm__ __volatile__
+--- linux-2.6.20/arch/m68k/kernel/ptrace.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/m68k/kernel/ptrace.c 2007-02-06 03:05:21 +0100
+@@ -19,6 +19,7 @@
+ #include <linux/ptrace.h>
+ #include <linux/user.h>
+ #include <linux/signal.h>
++#include <linux/vs_base.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/page.h>
+@@ -279,6 +280,8 @@ long arch_ptrace(struct task_struct *chi
ret = ptrace_request(child, request, addr, data);
break;
}
-+ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT))
+ goto out_tsk;
return ret;
out_eio:
---- linux-2.6.18.5/arch/m68knommu/Kconfig 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/m68knommu/Kconfig 2006-09-20 17:01:44 +0200
-@@ -663,6 +663,8 @@ source "fs/Kconfig"
+--- linux-2.6.20/arch/m68k/kernel/traps.c 2006-11-30 21:18:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/m68k/kernel/traps.c 2007-02-06 03:05:21 +0100
+@@ -899,8 +899,8 @@ void show_registers(struct pt_regs *regs
+ printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
+ regs->d4, regs->d5, regs->a0, regs->a1);
+
+- printk("Process %s (pid: %d, task=%p)\n",
+- current->comm, current->pid, current);
++ printk("Process %s (pid: %d[#%u], task=%p)\n",
++ current->comm, current->pid, current->xid, current);
+ addr = (unsigned long)&fp->un;
+ printk("Frame format=%X ", regs->format);
+ switch (regs->format) {
+--- linux-2.6.20/arch/m68knommu/Kconfig 2007-02-06 03:00:08 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/m68knommu/Kconfig 2007-02-06 03:05:21 +0100
+@@ -671,6 +671,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
@@ -603,9 +934,34 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/mips/Kconfig 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/mips/Kconfig 2006-09-20 17:01:44 +0200
-@@ -2057,6 +2057,8 @@ source "arch/mips/oprofile/Kconfig"
+--- linux-2.6.20/arch/m68knommu/kernel/process.c 2007-02-06 03:00:08 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/m68knommu/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -122,7 +122,7 @@ void show_regs(struct pt_regs * regs)
+ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
+ {
+ int retval;
+- long clone_arg = flags | CLONE_VM;
++ long clone_arg = flags | CLONE_VM | CLONE_KTHREAD;
+ mm_segment_t fs;
+
+ fs = get_fs();
+--- linux-2.6.20/arch/m68knommu/kernel/traps.c 2007-02-06 03:00:08 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/m68knommu/kernel/traps.c 2007-02-06 03:05:21 +0100
+@@ -80,8 +80,9 @@ void die_if_kernel(char *str, struct pt_
+ printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
+ fp->d4, fp->d5, fp->a0, fp->a1);
+
+- printk(KERN_EMERG "Process %s (pid: %d, stackpage=%08lx)\n",
+- current->comm, current->pid, PAGE_SIZE+(unsigned long)current);
++ printk(KERN_EMERG "Process %s (pid: %d[#%u], stackpage=%08lx)\n",
++ current->comm, current->pid, current->xid,
++ PAGE_SIZE+(unsigned long)current);
+ show_stack(NULL, (unsigned long *)fp);
+ do_exit(SIGSEGV);
+ }
+--- linux-2.6.20/arch/mips/Kconfig 2007-02-06 03:00:08 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/mips/Kconfig 2007-02-06 03:05:21 +0100
+@@ -2084,6 +2084,8 @@ source "arch/mips/oprofile/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -614,40 +970,52 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/mips/kernel/linux32.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/mips/kernel/linux32.c 2006-09-20 17:01:44 +0200
-@@ -35,6 +35,7 @@
- #include <linux/security.h>
- #include <linux/compat.h>
- #include <linux/vfs.h>
-+#include <linux/vs_cvirt.h>
+--- linux-2.6.20/arch/mips/kernel/linux32.c 2007-02-06 03:00:11 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/mips/kernel/linux32.c 2007-02-06 03:05:21 +0100
+@@ -300,7 +300,7 @@ sys32_gettimeofday(struct compat_timeval
+ {
+ if (tv) {
+ struct timeval ktv;
+- do_gettimeofday(&ktv);
++ vx_gettimeofday(&ktv);
+ if (put_tv32(tv, &ktv))
+ return -EFAULT;
+ }
+--- linux-2.6.20/arch/mips/kernel/process.c 2006-11-30 21:18:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/mips/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -271,7 +271,8 @@ long kernel_thread(int (*fn)(void *), vo
+ #endif
- #include <net/sock.h>
- #include <net/scm.h>
-@@ -1039,7 +1040,7 @@ asmlinkage long sys32_newuname(struct ne
- int ret = 0;
+ /* Ok, create the new process.. */
+- return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL, NULL);
++ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++ 0, ®s, 0, NULL, NULL);
+ }
+
+ /*
+--- linux-2.6.20/arch/mips/kernel/ptrace.c 2006-11-30 21:18:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/mips/kernel/ptrace.c 2007-02-06 03:05:21 +0100
+@@ -26,6 +26,7 @@
+ #include <linux/user.h>
+ #include <linux/security.h>
+ #include <linux/signal.h>
++#include <linux/vs_base.h>
- down_read(&uts_sem);
-- if (copy_to_user(name,&system_utsname,sizeof *name))
-+ if (copy_to_user(name, vx_new_utsname(), sizeof *name))
- ret = -EFAULT;
- up_read(&uts_sem);
-
---- linux-2.6.18.5/arch/mips/kernel/ptrace.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/mips/kernel/ptrace.c 2006-11-06 05:10:07 +0100
-@@ -171,6 +171,9 @@ long arch_ptrace(struct task_struct *chi
+ #include <asm/byteorder.h>
+ #include <asm/cpu.h>
+@@ -172,6 +173,9 @@ long arch_ptrace(struct task_struct *chi
{
int ret;
-+ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT))
+ goto out;
+
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
---- linux-2.6.18.5/arch/mips/kernel/scall32-o32.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/mips/kernel/scall32-o32.S 2006-09-20 17:01:44 +0200
-@@ -630,7 +630,7 @@ einval: li v0, -EINVAL
+--- linux-2.6.20/arch/mips/kernel/scall32-o32.S 2007-02-06 03:00:11 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/mips/kernel/scall32-o32.S 2007-02-06 03:05:21 +0100
+@@ -619,7 +619,7 @@ einval: li v0, -EINVAL
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
sys sys_mq_getsetattr 3
@@ -656,8 +1024,8 @@
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
---- linux-2.6.18.5/arch/mips/kernel/scall64-64.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/mips/kernel/scall64-64.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/mips/kernel/scall64-64.S 2007-02-06 03:00:11 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/mips/kernel/scall64-64.S 2007-02-06 03:05:21 +0100
@@ -434,7 +434,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -667,8 +1035,8 @@
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
---- linux-2.6.18.5/arch/mips/kernel/scall64-n32.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/mips/kernel/scall64-n32.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/mips/kernel/scall64-n32.S 2007-02-06 03:00:11 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/mips/kernel/scall64-n32.S 2007-02-06 03:05:21 +0100
@@ -360,7 +360,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -678,8 +1046,8 @@
PTR sysn32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
---- linux-2.6.18.5/arch/mips/kernel/scall64-o32.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/mips/kernel/scall64-o32.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/mips/kernel/scall64-o32.S 2007-02-06 03:00:11 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/mips/kernel/scall64-o32.S 2007-02-06 03:05:21 +0100
@@ -482,7 +482,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -689,93 +1057,23 @@
PTR sys32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
---- linux-2.6.18.5/arch/mips/kernel/syscall.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/mips/kernel/syscall.c 2006-09-20 17:01:44 +0200
-@@ -28,6 +28,7 @@
- #include <linux/shm.h>
- #include <linux/compiler.h>
- #include <linux/module.h>
-+#include <linux/vs_cvirt.h>
-
- #include <asm/branch.h>
- #include <asm/cachectl.h>
-@@ -231,7 +232,7 @@ out:
- */
- asmlinkage int sys_uname(struct old_utsname __user * name)
- {
-- if (name && !copy_to_user(name, &system_utsname, sizeof (*name)))
-+ if (name && !copy_to_user(name, vx_new_utsname(), sizeof (*name)))
- return 0;
- return -EFAULT;
- }
-@@ -242,21 +243,23 @@ asmlinkage int sys_uname(struct old_utsn
- asmlinkage int sys_olduname(struct oldold_utsname __user * name)
- {
- int error;
-+ struct new_utsname *ptr;
-
- if (!name)
- return -EFAULT;
- if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname)))
- return -EFAULT;
-
-- error = __copy_to_user(&name->sysname,&system_utsname.sysname,__OLD_UTS_LEN);
-+ ptr = vx_new_utsname();
-+ error = __copy_to_user(&name->sysname,ptr->sysname,__OLD_UTS_LEN);
- error -= __put_user(0,name->sysname+__OLD_UTS_LEN);
-- error -= __copy_to_user(&name->nodename,&system_utsname.nodename,__OLD_UTS_LEN);
-+ error -= __copy_to_user(&name->nodename,ptr->nodename,__OLD_UTS_LEN);
- error -= __put_user(0,name->nodename+__OLD_UTS_LEN);
-- error -= __copy_to_user(&name->release,&system_utsname.release,__OLD_UTS_LEN);
-+ error -= __copy_to_user(&name->release,ptr->release,__OLD_UTS_LEN);
- error -= __put_user(0,name->release+__OLD_UTS_LEN);
-- error -= __copy_to_user(&name->version,&system_utsname.version,__OLD_UTS_LEN);
-+ error -= __copy_to_user(&name->version,ptr->version,__OLD_UTS_LEN);
- error -= __put_user(0,name->version+__OLD_UTS_LEN);
-- error -= __copy_to_user(&name->machine,&system_utsname.machine,__OLD_UTS_LEN);
-+ error -= __copy_to_user(&name->machine,ptr->machine,__OLD_UTS_LEN);
- error = __put_user(0,name->machine+__OLD_UTS_LEN);
- error = error ? -EFAULT : 0;
-
---- linux-2.6.18.5/arch/mips/kernel/sysirix.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/mips/kernel/sysirix.c 2006-09-20 20:02:24 +0200
-@@ -32,6 +32,7 @@
- #include <linux/security.h>
- #include <linux/syscalls.h>
- #include <linux/resource.h>
-+#include <linux/vs_cvirt.h>
-
- #include <asm/ptrace.h>
- #include <asm/page.h>
-@@ -884,7 +885,7 @@ asmlinkage int irix_getdomainname(char _
- down_read(&uts_sem);
- if (len > __NEW_UTS_LEN)
- len = __NEW_UTS_LEN;
-- err = copy_to_user(name, system_utsname.domainname, len) ? -EFAULT : 0;
-+ err = copy_to_user(name, vx_new_uts(domainname), len) ? -EFAULT : 0;
- up_read(&uts_sem);
-
- return err;
-@@ -1127,11 +1128,11 @@ struct iuname {
- asmlinkage int irix_uname(struct iuname __user *buf)
+--- linux-2.6.20/arch/mips/kernel/traps.c 2007-02-06 03:00:11 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/mips/kernel/traps.c 2007-02-06 03:05:21 +0100
+@@ -299,8 +299,9 @@ void show_registers(struct pt_regs *regs
{
- down_read(&uts_sem);
-- if (copy_from_user(system_utsname.sysname, buf->sysname, 65)
-- || copy_from_user(system_utsname.nodename, buf->nodename, 65)
-- || copy_from_user(system_utsname.release, buf->release, 65)
-- || copy_from_user(system_utsname.version, buf->version, 65)
-- || copy_from_user(system_utsname.machine, buf->machine, 65)) {
-+ if (copy_from_user(vx_new_uts(sysname), buf->sysname, 65)
-+ || copy_from_user(vx_new_uts(nodename), buf->nodename, 65)
-+ || copy_from_user(vx_new_uts(release), buf->release, 65)
-+ || copy_from_user(vx_new_uts(version), buf->version, 65)
-+ || copy_from_user(vx_new_uts(machine), buf->machine, 65)) {
- return -EFAULT;
- }
- up_read(&uts_sem);
---- linux-2.6.18.5/arch/parisc/Kconfig 2006-09-20 16:58:00 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/parisc/Kconfig 2006-09-20 17:01:44 +0200
-@@ -257,6 +257,8 @@ source "arch/parisc/oprofile/Kconfig"
+ show_regs(regs);
+ print_modules();
+- printk("Process %s (pid: %d, threadinfo=%p, task=%p)\n",
+- current->comm, current->pid, current_thread_info(), current);
++ printk("Process %s (pid: %d:#%u, threadinfo=%p, task=%p)\n",
++ current->comm, current->pid, current->xid,
++ current_thread_info(), current);
+ show_stacktrace(current, regs);
+ show_code((unsigned int *) regs->cp0_epc);
+ printk("\n");
+--- linux-2.6.20/arch/parisc/Kconfig 2007-02-06 03:00:12 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/parisc/Kconfig 2007-02-06 03:05:21 +0100
+@@ -265,6 +265,8 @@ source "arch/parisc/oprofile/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -784,78 +1082,44 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/parisc/hpux/sys_hpux.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/parisc/hpux/sys_hpux.c 2006-09-20 17:01:44 +0200
-@@ -33,6 +33,7 @@
- #include <linux/utsname.h>
- #include <linux/vfs.h>
- #include <linux/vmalloc.h>
-+#include <linux/vs_cvirt.h>
-
- #include <asm/errno.h>
- #include <asm/pgalloc.h>
-@@ -266,15 +267,15 @@ static int hpux_uname(struct hpux_utsnam
+--- linux-2.6.20/arch/parisc/kernel/entry.S 2006-11-30 21:18:30 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/parisc/kernel/entry.S 2007-02-06 03:05:21 +0100
+@@ -761,6 +761,7 @@ fault_vector_11:
+
+ #define CLONE_VM 0x100 /* Must agree with <linux/sched.h> */
+ #define CLONE_UNTRACED 0x00800000
++#define CLONE_KTHREAD 0x10000000
+
+ .export __kernel_thread, code
+ .import do_fork
+--- linux-2.6.20/arch/parisc/kernel/process.c 2006-11-30 21:18:30 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/parisc/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -173,7 +173,7 @@ pid_t kernel_thread(int (*fn)(void *), v
+ * kernel_thread can become a #define.
+ */
- down_read(&uts_sem);
+- return __kernel_thread(fn, arg, flags);
++ return __kernel_thread(fn, arg, flags | CLONE_KTHREAD);
+ }
+ EXPORT_SYMBOL(kernel_thread);
-- error = __copy_to_user(&name->sysname,&system_utsname.sysname,HPUX_UTSLEN-1);
-+ error = __copy_to_user(&name->sysname,vx_new_uts(sysname),HPUX_UTSLEN-1);
- error |= __put_user(0,name->sysname+HPUX_UTSLEN-1);
-- error |= __copy_to_user(&name->nodename,&system_utsname.nodename,HPUX_UTSLEN-1);
-+ error |= __copy_to_user(&name->nodename,vx_new_uts(nodename),HPUX_UTSLEN-1);
- error |= __put_user(0,name->nodename+HPUX_UTSLEN-1);
-- error |= __copy_to_user(&name->release,&system_utsname.release,HPUX_UTSLEN-1);
-+ error |= __copy_to_user(&name->release,vx_new_uts(release),HPUX_UTSLEN-1);
- error |= __put_user(0,name->release+HPUX_UTSLEN-1);
-- error |= __copy_to_user(&name->version,&system_utsname.version,HPUX_UTSLEN-1);
-+ error |= __copy_to_user(&name->version,vx_new_uts(version),HPUX_UTSLEN-1);
- error |= __put_user(0,name->version+HPUX_UTSLEN-1);
-- error |= __copy_to_user(&name->machine,&system_utsname.machine,HPUX_UTSLEN-1);
-+ error |= __copy_to_user(&name->machine,vx_new_uts(machine),HPUX_UTSLEN-1);
- error |= __put_user(0,name->machine+HPUX_UTSLEN-1);
-
- up_read(&uts_sem);
-@@ -373,8 +374,8 @@ int hpux_utssys(char *ubuf, int n, int t
- /* TODO: print a warning about using this? */
- down_write(&uts_sem);
- error = -EFAULT;
-- if (!copy_from_user(system_utsname.sysname, ubuf, len)) {
-- system_utsname.sysname[len] = 0;
-+ if (!copy_from_user(vx_new_uts(sysname), ubuf, len)) {
-+ vx_new_uts(sysname)[len] = 0;
- error = 0;
- }
- up_write(&uts_sem);
-@@ -400,8 +401,8 @@ int hpux_utssys(char *ubuf, int n, int t
- /* TODO: print a warning about this? */
- down_write(&uts_sem);
- error = -EFAULT;
-- if (!copy_from_user(system_utsname.release, ubuf, len)) {
-- system_utsname.release[len] = 0;
-+ if (!copy_from_user(vx_new_uts(release), ubuf, len)) {
-+ vx_new_uts(release)[len] = 0;
- error = 0;
- }
- up_write(&uts_sem);
-@@ -422,13 +423,13 @@ int hpux_getdomainname(char *name, int l
-
- down_read(&uts_sem);
-
-- nlen = strlen(system_utsname.domainname) + 1;
-+ nlen = strlen(vx_new_uts(domainname)) + 1;
-
- if (nlen < len)
- len = nlen;
- if(len > __NEW_UTS_LEN)
- goto done;
-- if(copy_to_user(name, system_utsname.domainname, len))
-+ if(copy_to_user(name, vx_new_uts(domainname), len))
- goto done;
- err = 0;
- done:
---- linux-2.6.18.5/arch/parisc/kernel/sys_parisc32.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/parisc/kernel/sys_parisc32.c 2006-09-20 17:01:44 +0200
-@@ -598,6 +598,7 @@ asmlinkage int sys32_sysinfo(struct sysi
+--- linux-2.6.20/arch/parisc/kernel/sys_parisc32.c 2006-11-30 21:18:31 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/parisc/kernel/sys_parisc32.c 2007-02-06 03:05:21 +0100
+@@ -204,11 +204,11 @@ static inline long get_ts32(struct times
+ asmlinkage int
+ sys32_gettimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)
+ {
+- extern void do_gettimeofday(struct timeval *tv);
++ extern void vx_gettimeofday(struct timeval *tv);
+
+ if (tv) {
+ struct timeval ktv;
+- do_gettimeofday(&ktv);
++ vx_gettimeofday(&ktv);
+ if (put_compat_timeval(tv, &ktv))
+ return -EFAULT;
+ }
+@@ -612,6 +612,7 @@ asmlinkage int sys32_sysinfo(struct sysi
do {
seq = read_seqbegin(&xtime_lock);
@@ -863,8 +1127,8 @@
val.uptime = jiffies / HZ;
val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
---- linux-2.6.18.5/arch/parisc/kernel/syscall_table.S 2006-06-18 04:52:15 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/parisc/kernel/syscall_table.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/parisc/kernel/syscall_table.S 2006-11-30 21:18:31 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/parisc/kernel/syscall_table.S 2007-02-06 03:05:21 +0100
@@ -368,7 +368,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -874,9 +1138,48 @@
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
---- linux-2.6.18.5/arch/powerpc/Kconfig 2006-12-04 06:13:47 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/powerpc/Kconfig 2006-11-06 04:47:17 +0100
-@@ -1078,6 +1078,8 @@ endmenu
+--- linux-2.6.20/arch/parisc/kernel/traps.c 2006-11-30 21:18:31 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/parisc/kernel/traps.c 2007-02-06 03:05:21 +0100
+@@ -210,8 +210,9 @@ void die_if_kernel(char *str, struct pt_
+ if (err == 0)
+ return; /* STFU */
+
+- printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n",
+- current->comm, current->pid, str, err, regs->iaoq[0]);
++ printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n",
++ current->comm, current->pid, current->xid,
++ str, err, regs->iaoq[0]);
+ #ifdef PRINT_USER_FAULTS
+ /* XXX for debugging only */
+ show_regs(regs);
+@@ -242,8 +243,8 @@ void die_if_kernel(char *str, struct pt_
+ if (!console_drivers)
+ pdc_console_restart();
+
+- printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n",
+- current->comm, current->pid, str, err);
++ printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld)\n",
++ current->comm, current->pid, current->xid, str, err);
+ show_regs(regs);
+
+ if (in_interrupt())
+--- linux-2.6.20/arch/parisc/mm/fault.c 2007-02-06 03:00:12 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/parisc/mm/fault.c 2007-02-06 03:05:21 +0100
+@@ -213,8 +213,9 @@ bad_area:
+
+ #ifdef PRINT_USER_FAULTS
+ printk(KERN_DEBUG "\n");
+- printk(KERN_DEBUG "do_page_fault() pid=%d command='%s' type=%lu address=0x%08lx\n",
+- tsk->pid, tsk->comm, code, address);
++ printk(KERN_DEBUG "do_page_fault() pid=%d:#%u "
++ "command='%s' type=%lu address=0x%08lx\n",
++ tsk->pid, tsk->xid, tsk->comm, code, address);
+ if (vma) {
+ printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
+ vma->vm_start, vma->vm_end);
+--- linux-2.6.20/arch/powerpc/Kconfig 2007-02-06 03:00:12 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/powerpc/Kconfig 2007-02-06 03:05:21 +0100
+@@ -1193,6 +1193,8 @@ endmenu
source "arch/powerpc/Kconfig.debug"
@@ -885,19 +1188,51 @@
source "security/Kconfig"
config KEYS_COMPAT
---- linux-2.6.18.5/arch/powerpc/kernel/irq.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/powerpc/kernel/irq.c 2006-12-10 02:04:47 +0100
-@@ -244,6 +244,7 @@ void do_IRQ(struct pt_regs *regs)
-
- #ifdef CONFIG_PPC_ISERIES
- if (get_lppaca()->int_dword.fields.decr_int) {
-+
- get_lppaca()->int_dword.fields.decr_int = 0;
- /* Signal a fake decrementer interrupt */
- timer_interrupt(regs);
---- linux-2.6.18.5/arch/powerpc/kernel/process.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/powerpc/kernel/process.c 2006-09-20 17:01:44 +0200
-@@ -431,8 +431,9 @@ void show_regs(struct pt_regs * regs)
+--- linux-2.6.20/arch/powerpc/kernel/asm-offsets.c 2007-02-06 03:00:12 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/powerpc/kernel/asm-offsets.c 2007-02-06 03:05:21 +0100
+@@ -244,6 +244,7 @@ int main(void)
+
+ DEFINE(CLONE_VM, CLONE_VM);
+ DEFINE(CLONE_UNTRACED, CLONE_UNTRACED);
++ DEFINE(CLONE_KTHREAD, CLONE_KTHREAD);
+
+ #ifndef CONFIG_PPC64
+ DEFINE(MM_PGD, offsetof(struct mm_struct, pgd));
+--- linux-2.6.20/arch/powerpc/kernel/irq.c 2007-02-06 03:00:12 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/powerpc/kernel/irq.c 2007-02-06 03:05:21 +0100
+@@ -53,6 +53,7 @@
+ #include <linux/mutex.h>
+ #include <linux/bootmem.h>
+ #include <linux/pci.h>
++#include <linux/vs_context.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/system.h>
+--- linux-2.6.20/arch/powerpc/kernel/misc_32.S 2006-11-30 21:18:31 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/powerpc/kernel/misc_32.S 2007-02-06 03:05:21 +0100
+@@ -749,7 +749,7 @@ _GLOBAL(kernel_thread)
+ mr r30,r3 /* function */
+ mr r31,r4 /* argument */
+ ori r3,r5,CLONE_VM /* flags */
+- oris r3,r3,CLONE_UNTRACED>>16
++ oris r3,r3,(CLONE_UNTRACED|CLONE_KTHREAD)>>16
+ li r4,0 /* new sp (unused) */
+ li r0,__NR_clone
+ sc
+--- linux-2.6.20/arch/powerpc/kernel/misc_64.S 2006-11-30 21:18:31 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/powerpc/kernel/misc_64.S 2007-02-06 03:05:21 +0100
+@@ -394,7 +394,7 @@ _GLOBAL(kernel_thread)
+ mr r29,r3
+ mr r30,r4
+ ori r3,r5,CLONE_VM /* flags */
+- oris r3,r3,(CLONE_UNTRACED>>16)
++ oris r3,r3,(CLONE_UNTRACED|CLONE_KTHREAD)>>16
+ li r4,0 /* new sp (unused) */
+ li r0,__NR_clone
+ sc
+--- linux-2.6.20/arch/powerpc/kernel/process.c 2006-11-30 21:18:31 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/powerpc/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -425,8 +425,9 @@ void show_regs(struct pt_regs * regs)
trap = TRAP(regs);
if (trap == 0x300 || trap == 0x600)
printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
@@ -909,69 +1244,33 @@
#ifdef CONFIG_SMP
printk(" CPU: %d", smp_processor_id());
---- linux-2.6.18.5/arch/powerpc/kernel/syscalls.c 2006-06-18 04:52:17 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/powerpc/kernel/syscalls.c 2006-09-20 17:01:44 +0200
-@@ -36,6 +36,7 @@
- #include <linux/file.h>
- #include <linux/init.h>
- #include <linux/personality.h>
-+#include <linux/vs_cvirt.h>
-
- #include <asm/uaccess.h>
- #include <asm/ipc.h>
-@@ -260,7 +261,7 @@ long ppc_newuname(struct new_utsname __u
- int err = 0;
-
- down_read(&uts_sem);
-- if (copy_to_user(name, &system_utsname, sizeof(*name)))
-+ if (copy_to_user(name, vx_new_utsname(), sizeof(*name)))
- err = -EFAULT;
- up_read(&uts_sem);
- if (!err)
-@@ -273,7 +274,7 @@ int sys_uname(struct old_utsname __user
- int err = 0;
-
- down_read(&uts_sem);
-- if (copy_to_user(name, &system_utsname, sizeof(*name)))
-+ if (copy_to_user(name, vx_new_utsname(), sizeof(*name)))
- err = -EFAULT;
- up_read(&uts_sem);
- if (!err)
-@@ -284,25 +285,22 @@ int sys_uname(struct old_utsname __user
- int sys_olduname(struct oldold_utsname __user *name)
- {
- int error;
-+ struct new_utsname *ptr;
-
- if (!access_ok(VERIFY_WRITE, name, sizeof(struct oldold_utsname)))
- return -EFAULT;
-
- down_read(&uts_sem);
-- error = __copy_to_user(&name->sysname, &system_utsname.sysname,
-- __OLD_UTS_LEN);
-+ ptr = vx_new_utsname();
-+ error = __copy_to_user(&name->sysname, ptr->sysname, __OLD_UTS_LEN);
- error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
-- error |= __copy_to_user(&name->nodename, &system_utsname.nodename,
-- __OLD_UTS_LEN);
-+ error |= __copy_to_user(&name->nodename, ptr->nodename, __OLD_UTS_LEN);
- error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
-- error |= __copy_to_user(&name->release, &system_utsname.release,
-- __OLD_UTS_LEN);
-+ error |= __copy_to_user(&name->release, ptr->release, __OLD_UTS_LEN);
- error |= __put_user(0, name->release + __OLD_UTS_LEN);
-- error |= __copy_to_user(&name->version, &system_utsname.version,
-- __OLD_UTS_LEN);
-+ error |= __copy_to_user(&name->version, ptr->version, __OLD_UTS_LEN);
- error |= __put_user(0, name->version + __OLD_UTS_LEN);
-- error |= __copy_to_user(&name->machine, &system_utsname.machine,
-- __OLD_UTS_LEN);
-+ error |= __copy_to_user(&name->machine, ptr->machine, __OLD_UTS_LEN);
- error |= override_machine(name->machine);
- up_read(&uts_sem);
+--- linux-2.6.20/arch/powerpc/kernel/sys_ppc32.c 2007-02-06 03:00:13 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/powerpc/kernel/sys_ppc32.c 2007-02-06 03:05:21 +0100
+@@ -276,7 +276,7 @@ asmlinkage long compat_sys_gettimeofday(
+ {
+ if (tv) {
+ struct timeval ktv;
+- do_gettimeofday(&ktv);
++ vx_gettimeofday(&ktv);
+ if (put_tv32(tv, &ktv))
+ return -EFAULT;
+ }
+--- linux-2.6.20/arch/powerpc/kernel/traps.c 2007-02-06 03:00:13 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/powerpc/kernel/traps.c 2007-02-06 03:05:21 +0100
+@@ -844,8 +844,9 @@ void nonrecoverable_exception(struct pt_
+
+ void trace_syscall(struct pt_regs *regs)
+ {
+- printk("Task: %p(%d), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n",
+- current, current->pid, regs->nip, regs->link, regs->gpr[0],
++ printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n",
++ current, current->pid, current->xid,
++ regs->nip, regs->link, regs->gpr[0],
+ regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
+ }
---- linux-2.6.18.5/arch/powerpc/kernel/vdso.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/powerpc/kernel/vdso.c 2006-09-20 19:58:24 +0200
+--- linux-2.6.20/arch/powerpc/kernel/vdso.c 2007-02-06 03:00:13 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/powerpc/kernel/vdso.c 2007-02-06 03:05:21 +0100
@@ -22,6 +22,7 @@
#include <linux/elf.h>
#include <linux/security.h>
@@ -980,7 +1279,7 @@
#include <asm/pgtable.h>
#include <asm/system.h>
-@@ -293,7 +294,7 @@ int arch_setup_additional_pages(struct l
+@@ -302,7 +303,7 @@ int arch_setup_additional_pages(struct l
/* Put vDSO base into mm struct and account for memory usage */
current->mm->context.vdso_base = vdso_base;
@@ -989,9 +1288,9 @@
up_write(&mm->mmap_sem);
return 0;
---- linux-2.6.18.5/arch/ppc/Kconfig 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/ppc/Kconfig 2006-09-20 17:01:44 +0200
-@@ -1418,6 +1418,8 @@ source "arch/powerpc/oprofile/Kconfig"
+--- linux-2.6.20/arch/ppc/Kconfig 2007-02-06 03:00:16 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/ppc/Kconfig 2007-02-06 03:05:21 +0100
+@@ -1445,6 +1445,8 @@ source "arch/powerpc/oprofile/Kconfig"
source "arch/ppc/Kconfig.debug"
@@ -1000,9 +1299,44 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/s390/Kconfig 2006-12-04 06:13:47 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/s390/Kconfig 2006-11-06 04:47:17 +0100
-@@ -495,6 +495,8 @@ source "arch/s390/oprofile/Kconfig"
+--- linux-2.6.20/arch/ppc/kernel/asm-offsets.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/ppc/kernel/asm-offsets.c 2007-02-06 03:05:21 +0100
+@@ -121,6 +121,7 @@ main(void)
+ DEFINE(TRAP, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, trap));
+ DEFINE(CLONE_VM, CLONE_VM);
+ DEFINE(CLONE_UNTRACED, CLONE_UNTRACED);
++ DEFINE(CLONE_KTHREAD, CLONE_KTHREAD);
+ DEFINE(MM_PGD, offsetof(struct mm_struct, pgd));
+
+ /* About the CPU features table */
+--- linux-2.6.20/arch/ppc/kernel/misc.S 2006-11-30 21:18:32 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/ppc/kernel/misc.S 2007-02-06 03:05:21 +0100
+@@ -848,7 +848,7 @@ _GLOBAL(kernel_thread)
+ mr r30,r3 /* function */
+ mr r31,r4 /* argument */
+ ori r3,r5,CLONE_VM /* flags */
+- oris r3,r3,CLONE_UNTRACED>>16
++ oris r3,r3,(CLONE_UNTRACED|CLONE_KTHREAD)>>16
+ li r4,0 /* new sp (unused) */
+ li r0,__NR_clone
+ sc
+--- linux-2.6.20/arch/ppc/kernel/traps.c 2007-02-06 03:00:16 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/ppc/kernel/traps.c 2007-02-06 03:05:21 +0100
+@@ -696,8 +696,9 @@ void nonrecoverable_exception(struct pt_
+
+ void trace_syscall(struct pt_regs *regs)
+ {
+- printk("Task: %p(%d), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n",
+- current, current->pid, regs->nip, regs->link, regs->gpr[0],
++ printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n",
++ current, current->pid, current->xid,
++ regs->nip, regs->link, regs->gpr[0],
+ regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
+ }
+
+--- linux-2.6.20/arch/s390/Kconfig 2007-02-06 03:00:17 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/s390/Kconfig 2007-02-06 03:05:21 +0100
+@@ -522,6 +522,8 @@ endmenu
source "arch/s390/Kconfig.debug"
@@ -1011,8 +1345,19 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/s390/kernel/process.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/s390/kernel/process.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/s390/kernel/compat_linux.c 2006-11-30 21:18:32 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/s390/kernel/compat_linux.c 2007-02-06 03:05:21 +0100
+@@ -600,7 +600,7 @@ asmlinkage long sys32_gettimeofday(struc
+ {
+ if (tv) {
+ struct timeval ktv;
+- do_gettimeofday(&ktv);
++ vx_gettimeofday(&ktv);
+ if (put_tv32(tv, &ktv))
+ return -EFAULT;
+ }
+--- linux-2.6.20/arch/s390/kernel/process.c 2006-11-30 21:18:32 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/s390/kernel/process.c 2007-02-06 03:05:21 +0100
@@ -165,9 +165,9 @@ void show_regs(struct pt_regs *regs)
struct task_struct *tsk = current;
@@ -1026,13 +1371,30 @@
show_registers(regs);
/* Show stack backtrace if pt_regs is from kernel mode */
---- linux-2.6.18.5/arch/s390/kernel/ptrace.c 2006-06-18 04:52:33 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/s390/kernel/ptrace.c 2006-09-20 17:01:44 +0200
-@@ -723,7 +723,13 @@ sys_ptrace(long request, long pid, long
+@@ -198,7 +198,7 @@ int kernel_thread(int (*fn)(void *), voi
+ regs.orig_gpr2 = -1;
+
+ /* Ok, create the new process.. */
+- return do_fork(flags | CLONE_VM | CLONE_UNTRACED,
++ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
+ 0, ®s, 0, NULL, NULL);
+ }
+
+--- linux-2.6.20/arch/s390/kernel/ptrace.c 2006-06-18 04:52:33 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/s390/kernel/ptrace.c 2007-02-06 03:05:21 +0100
+@@ -33,6 +33,7 @@
+ #include <linux/security.h>
+ #include <linux/audit.h>
+ #include <linux/signal.h>
++#include <linux/vs_base.h>
+
+ #include <asm/segment.h>
+ #include <asm/page.h>
+@@ -723,7 +724,13 @@ sys_ptrace(long request, long pid, long
goto out;
}
-+ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT)) {
++ if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT)) {
+ ret = -EPERM;
+ goto out_tsk;
+ }
@@ -1042,18 +1404,8 @@
put_task_struct(child);
out:
unlock_kernel();
---- linux-2.6.18.5/arch/s390/kernel/s390_ext.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/s390/kernel/s390_ext.c 2006-12-10 02:04:47 +0100
-@@ -13,6 +13,7 @@
- #include <linux/errno.h>
- #include <linux/kernel_stat.h>
- #include <linux/interrupt.h>
-+#include <linux/vs_context.h>
-
- #include <asm/lowcore.h>
- #include <asm/s390_ext.h>
---- linux-2.6.18.5/arch/s390/kernel/syscalls.S 2006-06-18 04:52:33 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/s390/kernel/syscalls.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/s390/kernel/syscalls.S 2006-11-30 21:18:32 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/s390/kernel/syscalls.S 2007-02-06 03:05:21 +0100
@@ -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)
@@ -1063,9 +1415,9 @@
SYSCALL(s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
---- linux-2.6.18.5/arch/sh/Kconfig 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sh/Kconfig 2006-09-20 17:01:44 +0200
-@@ -646,6 +646,8 @@ source "arch/sh/oprofile/Kconfig"
+--- linux-2.6.20/arch/sh/Kconfig 2007-02-06 03:00:17 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sh/Kconfig 2007-02-06 03:05:21 +0100
+@@ -709,6 +709,8 @@ source "arch/sh/oprofile/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -1074,77 +1426,95 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/sh/kernel/kgdb_stub.c 2004-08-14 12:54:51 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sh/kernel/kgdb_stub.c 2006-09-20 17:01:44 +0200
-@@ -412,7 +412,7 @@ static struct task_struct *get_thread(in
- if (pid == PID_MAX) pid = 0;
-
- /* First check via PID */
+--- linux-2.6.20/arch/sh/kernel/irq.c 2007-02-06 03:00:17 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sh/kernel/irq.c 2007-02-06 03:09:33 +0100
+@@ -13,6 +13,7 @@
+ #include <linux/seq_file.h>
+ #include <linux/io.h>
+ #include <linux/irq.h>
++#include <linux/vs_context.h>
+ #include <asm/processor.h>
+ #include <asm/uaccess.h>
+ #include <asm/thread_info.h>
+--- linux-2.6.20/arch/sh/kernel/kgdb_stub.c 2006-11-30 21:18:34 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sh/kernel/kgdb_stub.c 2007-02-06 03:05:21 +0100
+@@ -389,7 +389,7 @@ static struct task_struct *get_thread(in
+ if (pid == PID_MAX) pid = 0;
+
+ /* First check via PID */
- thread = find_task_by_pid(pid);
+ thread = find_task_by_real_pid(pid);
if (thread)
return thread;
---- linux-2.6.18.5/arch/sh/kernel/setup.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sh/kernel/setup.c 2006-09-20 17:01:44 +0200
-@@ -21,6 +21,7 @@
- #include <linux/utsname.h>
- #include <linux/cpu.h>
- #include <linux/pfn.h>
-+#include <linux/vs_cvirt.h>
- #include <asm/uaccess.h>
- #include <asm/io.h>
- #include <asm/sections.h>
-@@ -481,7 +482,7 @@ static int show_cpuinfo(struct seq_file
- seq_printf(m, "machine\t\t: %s\n", get_system_type());
-
- seq_printf(m, "processor\t: %d\n", cpu);
-- seq_printf(m, "cpu family\t: %s\n", system_utsname.machine);
-+ seq_printf(m, "cpu family\t: %s\n", vx_new_uts(machine));
- seq_printf(m, "cpu type\t: %s\n", get_cpu_subtype());
-
- show_cpuflags(m);
---- linux-2.6.18.5/arch/sh/kernel/sys_sh.c 2005-08-29 22:24:55 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sh/kernel/sys_sh.c 2006-09-20 17:01:44 +0200
-@@ -21,6 +21,7 @@
- #include <linux/mman.h>
- #include <linux/file.h>
- #include <linux/utsname.h>
-+#include <linux/vs_cvirt.h>
+--- linux-2.6.20/arch/sh/kernel/process.c 2007-02-06 03:00:17 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sh/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -104,7 +104,8 @@ void machine_power_off(void)
+ void show_regs(struct pt_regs * regs)
+ {
+ printk("\n");
+- printk("Pid : %d, Comm: %20s\n", current->pid, current->comm);
++ printk("Pid : %d:#%u, Comm: %20s\n",
++ current->pid, current->xid, current->comm);
+ print_symbol("PC is at %s\n", instruction_pointer(regs));
+ printk("PC : %08lx SP : %08lx SR : %08lx ",
+ regs->pc, regs->regs[15], regs->sr);
+@@ -164,7 +165,8 @@ int kernel_thread(int (*fn)(void *), voi
+ regs.sr = (1 << 30);
+
+ /* Ok, create the new process.. */
+- return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL, NULL);
++ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++ 0, ®s, 0, NULL, NULL);
+ }
- #include <asm/uaccess.h>
- #include <asm/ipc.h>
-@@ -267,7 +268,7 @@ asmlinkage int sys_uname(struct old_utsn
- if (!name)
- return -EFAULT;
- down_read(&uts_sem);
-- err=copy_to_user(name, &system_utsname, sizeof (*name));
-+ err=copy_to_user(name, vx_new_utsname(), sizeof (*name));
- up_read(&uts_sem);
- return err?-EFAULT:0;
+ /*
+--- linux-2.6.20/arch/sh/kernel/vsyscall/vsyscall.c 2007-02-06 03:00:17 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sh/kernel/vsyscall/vsyscall.c 2007-02-06 03:05:21 +0100
+@@ -17,6 +17,7 @@
+ #include <linux/gfp.h>
+ #include <linux/module.h>
+ #include <linux/elf.h>
++#include <linux/vs_memory.h>
+
+ /*
+ * Should the kernel map a VDSO page into processes and pass its
+@@ -120,7 +121,7 @@ int arch_setup_additional_pages(struct l
+
+ current->mm->context.vdso = (void *)addr;
+
+- mm->total_vm++;
++ vx_vmpages_inc(mm);
+ up_fail:
+ up_write(&mm->mmap_sem);
+ return ret;
+--- linux-2.6.20/arch/sh64/kernel/process.c 2006-11-30 21:18:35 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sh64/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -400,8 +400,8 @@ int kernel_thread(int (*fn)(void *), voi
+ regs.pc = (unsigned long)kernel_thread_helper;
+ regs.sr = (1 << 30);
+
+- return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0,
+- ®s, 0, NULL, NULL);
++ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++ 0, ®s, 0, NULL, NULL);
+ }
+
+ /*
+--- linux-2.6.20/arch/sh64/mm/fault.c 2007-02-06 03:00:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sh64/mm/fault.c 2007-02-06 03:05:21 +0100
+@@ -82,7 +82,7 @@ static inline void print_vma(struct vm_a
+
+ static inline void print_task(struct task_struct *tsk)
+ {
+- printk("Task pid %d\n", tsk->pid);
++ printk("Task pid %d:#%u\n", tsk->pid, tsk->xid);
}
---- linux-2.6.18.5/arch/sh64/kernel/sys_sh64.c 2005-06-22 02:37:59 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sh64/kernel/sys_sh64.c 2006-09-20 17:01:44 +0200
-@@ -29,6 +29,7 @@
- #include <linux/file.h>
- #include <linux/utsname.h>
- #include <linux/syscalls.h>
-+#include <linux/vs_cvirt.h>
- #include <asm/uaccess.h>
- #include <asm/ipc.h>
- #include <asm/ptrace.h>
-@@ -279,7 +280,7 @@ asmlinkage int sys_uname(struct old_utsn
- if (!name)
- return -EFAULT;
- down_read(&uts_sem);
-- err=copy_to_user(name, &system_utsname, sizeof (*name));
-+ err=copy_to_user(name, vx_new_utsname(), sizeof (*name));
- up_read(&uts_sem);
- return err?-EFAULT:0;
- }
---- linux-2.6.18.5/arch/sparc/Kconfig 2006-06-18 04:52:33 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sparc/Kconfig 2006-09-20 17:01:44 +0200
-@@ -291,6 +291,8 @@ source "fs/Kconfig"
+
+ static pte_t *lookup_pte(struct mm_struct *mm, unsigned long address)
+--- linux-2.6.20/arch/sparc/Kconfig 2007-02-06 03:00:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sparc/Kconfig 2007-02-06 03:05:21 +0100
+@@ -306,6 +306,8 @@ endmenu
source "arch/sparc/Kconfig.debug"
@@ -1153,89 +1523,41 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/sparc/kernel/ptrace.c 2006-04-09 13:49:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sparc/kernel/ptrace.c 2006-09-20 17:01:44 +0200
-@@ -299,6 +299,10 @@ asmlinkage void do_ptrace(struct pt_regs
+--- linux-2.6.20/arch/sparc/kernel/process.c 2007-02-06 03:00:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sparc/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -706,7 +706,8 @@ pid_t kernel_thread(int (*fn)(void *), v
+ /* Notreached by child. */
+ "1: mov %%o0, %0\n\t" :
+ "=r" (retval) :
+- "i" (__NR_clone), "r" (flags | CLONE_VM | CLONE_UNTRACED),
++ "i" (__NR_clone), "r" (flags |
++ CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD),
+ "i" (__NR_exit), "r" (fn), "r" (arg) :
+ "g1", "g2", "g3", "o0", "o1", "memory", "cc");
+ return retval;
+--- linux-2.6.20/arch/sparc/kernel/ptrace.c 2007-02-06 03:00:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sparc/kernel/ptrace.c 2007-02-06 03:05:21 +0100
+@@ -19,6 +19,7 @@
+ #include <linux/smp_lock.h>
+ #include <linux/security.h>
+ #include <linux/signal.h>
++#include <linux/vs_base.h>
+
+ #include <asm/pgtable.h>
+ #include <asm/system.h>
+@@ -302,6 +303,10 @@ asmlinkage void do_ptrace(struct pt_regs
pt_error_return(regs, -ret);
goto out;
}
-+ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT)) {
++ if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT)) {
+ pt_error_return(regs, ESRCH);
+ goto out_tsk;
+ }
if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
|| (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
---- linux-2.6.18.5/arch/sparc/kernel/sun4d_irq.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sparc/kernel/sun4d_irq.c 2006-12-10 02:04:47 +0100
-@@ -20,6 +20,7 @@
- #include <linux/smp_lock.h>
- #include <linux/spinlock.h>
- #include <linux/seq_file.h>
-+#include <linux/vs_context.h>
-
- #include <asm/ptrace.h>
- #include <asm/processor.h>
---- linux-2.6.18.5/arch/sparc/kernel/sys_sparc.c 2006-09-20 16:58:04 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sparc/kernel/sys_sparc.c 2006-09-20 19:57:58 +0200
-@@ -21,6 +21,7 @@
- #include <linux/utsname.h>
- #include <linux/smp.h>
- #include <linux/smp_lock.h>
-+#include <linux/vs_cvirt.h>
-
- #include <asm/uaccess.h>
- #include <asm/ipc.h>
-@@ -475,13 +476,13 @@ asmlinkage int sys_getdomainname(char __
-
- down_read(&uts_sem);
-
-- nlen = strlen(system_utsname.domainname) + 1;
-+ nlen = strlen(vx_new_uts(domainname)) + 1;
- err = -EINVAL;
- if (nlen > len)
- goto out;
-
- err = -EFAULT;
-- if (!copy_to_user(name, system_utsname.domainname, nlen))
-+ if (!copy_to_user(name, vx_new_uts(domainname), nlen))
- err = 0;
-
- out:
---- linux-2.6.18.5/arch/sparc/kernel/sys_sunos.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sparc/kernel/sys_sunos.c 2006-09-20 17:01:44 +0200
-@@ -35,6 +35,7 @@
- #include <linux/smp.h>
- #include <linux/smp_lock.h>
- #include <linux/syscalls.h>
-+#include <linux/vs_cvirt.h>
-
- #include <net/sock.h>
-
-@@ -482,14 +483,16 @@ struct sunos_utsname {
- asmlinkage int sunos_uname(struct sunos_utsname __user *name)
- {
- int ret;
-+ struct new_utsname *ptr;
- down_read(&uts_sem);
-- ret = copy_to_user(&name->sname[0], &system_utsname.sysname[0], sizeof(name->sname) - 1);
-+ ptr = vx_new_utsname();
-+ ret = copy_to_user(&name->sname[0], ptr->sysname, sizeof(name->sname) - 1);
- if (!ret) {
-- ret |= __copy_to_user(&name->nname[0], &system_utsname.nodename[0], sizeof(name->nname) - 1);
-+ ret |= __copy_to_user(&name->nname[0], ptr->nodename, sizeof(name->nname) - 1);
- ret |= __put_user('\0', &name->nname[8]);
-- ret |= __copy_to_user(&name->rel[0], &system_utsname.release[0], sizeof(name->rel) - 1);
-- ret |= __copy_to_user(&name->ver[0], &system_utsname.version[0], sizeof(name->ver) - 1);
-- ret |= __copy_to_user(&name->mach[0], &system_utsname.machine[0], sizeof(name->mach) - 1);
-+ ret |= __copy_to_user(&name->rel[0], ptr->release, sizeof(name->rel) - 1);
-+ ret |= __copy_to_user(&name->ver[0], ptr->version, sizeof(name->ver) - 1);
-+ ret |= __copy_to_user(&name->mach[0], ptr->machine, sizeof(name->mach) - 1);
- }
- up_read(&uts_sem);
- return ret ? -EFAULT : 0;
---- linux-2.6.18.5/arch/sparc/kernel/systbls.S 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sparc/kernel/systbls.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/sparc/kernel/systbls.S 2006-11-30 21:18:35 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sparc/kernel/systbls.S 2007-02-06 03:05:21 +0100
@@ -71,7 +71,7 @@ sys_call_table:
/*250*/ .long sparc_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
/*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
@@ -1245,9 +1567,21 @@
/*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
---- linux-2.6.18.5/arch/sparc64/Kconfig 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sparc64/Kconfig 2006-09-20 17:01:44 +0200
-@@ -431,6 +431,8 @@ endmenu
+--- linux-2.6.20/arch/sparc/kernel/traps.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/sparc/kernel/traps.c 2007-02-06 03:05:21 +0100
+@@ -99,7 +99,8 @@ void die_if_kernel(char *str, struct pt_
+ " /_| \\__/ |_\\\n"
+ " \\__U_/\n");
+
+- printk("%s(%d): %s [#%d]\n", current->comm, current->pid, str, ++die_counter);
++ printk("%s(%d[#%u]): %s [#%d]\n", current->comm,
++ current->pid, current->xid, str, ++die_counter);
+ show_regs(regs);
+
+ __SAVE; __SAVE; __SAVE; __SAVE;
+--- linux-2.6.20/arch/sparc64/Kconfig 2007-02-06 03:00:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sparc64/Kconfig 2007-02-06 03:05:21 +0100
+@@ -447,6 +447,8 @@ endmenu
source "arch/sparc64/Kconfig.debug"
@@ -1256,8 +1590,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/sparc64/kernel/binfmt_aout32.c 2006-06-18 04:52:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sparc64/kernel/binfmt_aout32.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/sparc64/kernel/binfmt_aout32.c 2007-02-06 03:00:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sparc64/kernel/binfmt_aout32.c 2007-02-06 03:05:21 +0100
@@ -27,6 +27,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
@@ -1266,83 +1600,52 @@
#include <asm/system.h>
#include <asm/uaccess.h>
---- linux-2.6.18.5/arch/sparc64/kernel/ptrace.c 2006-06-18 04:52:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sparc64/kernel/ptrace.c 2006-09-20 17:01:44 +0200
-@@ -212,6 +212,10 @@ asmlinkage void do_ptrace(struct pt_regs
+--- linux-2.6.20/arch/sparc64/kernel/process.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/sparc64/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -696,7 +696,8 @@ pid_t kernel_thread(int (*fn)(void *), v
+ /* Notreached by child. */
+ "1:" :
+ "=r" (retval) :
+- "i" (__NR_clone), "r" (flags | CLONE_VM | CLONE_UNTRACED),
++ "i" (__NR_clone), "r" (flags |
++ CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD),
+ "i" (__NR_exit), "r" (fn), "r" (arg) :
+ "g1", "g2", "g3", "o0", "o1", "memory", "cc");
+ return retval;
+--- linux-2.6.20/arch/sparc64/kernel/ptrace.c 2007-02-06 03:00:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sparc64/kernel/ptrace.c 2007-02-06 03:05:21 +0100
+@@ -22,6 +22,7 @@
+ #include <linux/seccomp.h>
+ #include <linux/audit.h>
+ #include <linux/signal.h>
++#include <linux/vs_base.h>
+
+ #include <asm/asi.h>
+ #include <asm/pgtable.h>
+@@ -215,6 +216,10 @@ asmlinkage void do_ptrace(struct pt_regs
pt_error_return(regs, -ret);
goto out;
}
-+ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT)) {
++ if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT)) {
+ pt_error_return(regs, ESRCH);
+ goto out_tsk;
+ }
if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
|| (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
---- linux-2.6.18.5/arch/sparc64/kernel/sys_sparc.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sparc64/kernel/sys_sparc.c 2006-09-20 19:57:05 +0200
-@@ -25,6 +25,7 @@
- #include <linux/ipc.h>
- #include <linux/personality.h>
- #include <linux/random.h>
-+#include <linux/vs_cvirt.h>
-
- #include <asm/uaccess.h>
- #include <asm/ipc.h>
-@@ -712,13 +713,13 @@ asmlinkage long sys_getdomainname(char _
-
- down_read(&uts_sem);
-
-- nlen = strlen(system_utsname.domainname) + 1;
-+ nlen = strlen(vx_new_uts(domainname)) + 1;
- err = -EINVAL;
- if (nlen > len)
- goto out;
-
- err = -EFAULT;
-- if (!copy_to_user(name, system_utsname.domainname, nlen))
-+ if (!copy_to_user(name, vx_new_uts(domainname), nlen))
- err = 0;
-
- out:
---- linux-2.6.18.5/arch/sparc64/kernel/sys_sunos32.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sparc64/kernel/sys_sunos32.c 2006-09-20 17:01:44 +0200
-@@ -35,6 +35,7 @@
- #include <linux/smp.h>
- #include <linux/smp_lock.h>
- #include <linux/syscalls.h>
-+#include <linux/vs_cvirt.h>
-
- #include <asm/uaccess.h>
- #include <asm/page.h>
-@@ -437,18 +438,20 @@ struct sunos_utsname {
- asmlinkage int sunos_uname(struct sunos_utsname __user *name)
- {
- int ret;
-+ struct new_utsname *ptr;
-
- down_read(&uts_sem);
-- ret = copy_to_user(&name->sname[0], &system_utsname.sysname[0],
-+ ptr = vx_new_utsname();
-+ ret = copy_to_user(&name->sname[0], ptr->sysname,
- sizeof(name->sname) - 1);
-- ret |= copy_to_user(&name->nname[0], &system_utsname.nodename[0],
-+ ret |= copy_to_user(&name->nname[0], ptr->nodename,
- sizeof(name->nname) - 1);
- ret |= put_user('\0', &name->nname[8]);
-- ret |= copy_to_user(&name->rel[0], &system_utsname.release[0],
-+ ret |= copy_to_user(&name->rel[0], ptr->release,
- sizeof(name->rel) - 1);
-- ret |= copy_to_user(&name->ver[0], &system_utsname.version[0],
-+ ret |= copy_to_user(&name->ver[0], ptr->version,
- sizeof(name->ver) - 1);
-- ret |= copy_to_user(&name->mach[0], &system_utsname.machine[0],
-+ ret |= copy_to_user(&name->mach[0], ptr->machine,
- sizeof(name->mach) - 1);
- up_read(&uts_sem);
- return (ret ? -EFAULT : 0);
---- linux-2.6.18.5/arch/sparc64/kernel/systbls.S 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sparc64/kernel/systbls.S 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/sparc64/kernel/sys_sparc32.c 2006-11-30 21:18:35 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sparc64/kernel/sys_sparc32.c 2007-02-06 03:05:21 +0100
+@@ -793,7 +793,7 @@ asmlinkage long sys32_gettimeofday(struc
+ {
+ if (tv) {
+ struct timeval ktv;
+- do_gettimeofday(&ktv);
++ vx_gettimeofday(&ktv);
+ if (put_tv32(tv, &ktv))
+ return -EFAULT;
+ }
+--- linux-2.6.20/arch/sparc64/kernel/systbls.S 2006-11-30 21:18:35 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sparc64/kernel/systbls.S 2007-02-06 03:05:21 +0100
@@ -72,7 +72,7 @@ sys_call_table32:
/*250*/ .word sys32_mremap, sys32_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
.word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
@@ -1361,9 +1664,21 @@
/*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
---- linux-2.6.18.5/arch/sparc64/solaris/fs.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sparc64/solaris/fs.c 2006-09-20 17:01:44 +0200
-@@ -363,7 +363,7 @@ static int report_statvfs(struct vfsmoun
+--- linux-2.6.20/arch/sparc64/kernel/traps.c 2007-02-06 03:00:20 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sparc64/kernel/traps.c 2007-02-06 03:05:21 +0100
+@@ -2233,7 +2233,8 @@ void die_if_kernel(char *str, struct pt_
+ " /_| \\__/ |_\\\n"
+ " \\__U_/\n");
+
+- printk("%s(%d): %s [#%d]\n", current->comm, current->pid, str, ++die_counter);
++ printk("%s(%d[#%u]): %s [#%d]\n", current->comm,
++ current->pid, current->xid, str, ++die_counter);
+ notify_die(DIE_OOPS, str, regs, 0, 255, SIGSEGV);
+ __asm__ __volatile__("flushw");
+ __show_regs(regs);
+--- linux-2.6.20/arch/sparc64/solaris/fs.c 2007-02-06 03:00:21 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/sparc64/solaris/fs.c 2007-02-06 03:05:21 +0100
+@@ -368,7 +368,7 @@ static int report_statvfs(struct vfsmoun
int j = strlen (p);
if (j > 15) j = 15;
@@ -1372,7 +1687,7 @@
if (mnt->mnt_flags & MNT_NOSUID) i |= 2;
if (!sysv_valid_dev(inode->i_sb->s_dev))
return -EOVERFLOW;
-@@ -399,7 +399,7 @@ static int report_statvfs64(struct vfsmo
+@@ -404,7 +404,7 @@ static int report_statvfs64(struct vfsmo
int j = strlen (p);
if (j > 15) j = 15;
@@ -1381,46 +1696,9 @@
if (mnt->mnt_flags & MNT_NOSUID) i |= 2;
if (!sysv_valid_dev(inode->i_sb->s_dev))
return -EOVERFLOW;
---- linux-2.6.18.5/arch/sparc64/solaris/misc.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/sparc64/solaris/misc.c 2006-09-20 17:01:44 +0200
-@@ -16,6 +16,7 @@
- #include <linux/timex.h>
- #include <linux/major.h>
- #include <linux/compat.h>
-+#include <linux/vs_cvirt.h>
-
- #include <asm/uaccess.h>
- #include <asm/string.h>
-@@ -248,7 +249,7 @@ asmlinkage int solaris_utssys(u32 buf, u
- /* Let's cheat */
- err = set_utsfield(v->sysname, "SunOS", 1, 0);
- down_read(&uts_sem);
-- err |= set_utsfield(v->nodename, system_utsname.nodename,
-+ err |= set_utsfield(v->nodename, vx_new_uts(nodename),
- 1, 1);
- up_read(&uts_sem);
- err |= set_utsfield(v->release, "2.6", 0, 0);
-@@ -272,7 +273,7 @@ asmlinkage int solaris_utsname(u32 buf)
- /* Why should we not lie a bit? */
- down_read(&uts_sem);
- err = set_utsfield(v->sysname, "SunOS", 0, 0);
-- err |= set_utsfield(v->nodename, system_utsname.nodename, 1, 1);
-+ err |= set_utsfield(v->nodename, vx_new_uts(nodename), 1, 1);
- err |= set_utsfield(v->release, "5.6", 0, 0);
- err |= set_utsfield(v->version, "Generic", 0, 0);
- err |= set_utsfield(v->machine, machine(), 0, 0);
-@@ -304,7 +305,7 @@ asmlinkage int solaris_sysinfo(int cmd,
- case SI_HOSTNAME:
- r = buffer + 256;
- down_read(&uts_sem);
-- for (p = system_utsname.nodename, q = buffer;
-+ for (p = vx_new_uts(nodename), q = buffer;
- q < r && *p && *p != '.'; *q++ = *p++);
- up_read(&uts_sem);
- *q = 0;
---- linux-2.6.18.5/arch/um/Kconfig 2006-12-04 06:13:47 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/um/Kconfig 2006-10-16 18:56:10 +0200
-@@ -284,6 +284,8 @@ source "drivers/connector/Kconfig"
+--- linux-2.6.20/arch/um/Kconfig 2007-02-06 03:00:21 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/um/Kconfig 2007-02-06 03:05:21 +0100
+@@ -311,6 +311,8 @@ source "drivers/connector/Kconfig"
source "fs/Kconfig"
@@ -1429,45 +1707,27 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/um/kernel/irq.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/um/kernel/irq.c 2006-11-07 19:17:23 +0100
-@@ -370,10 +370,11 @@ void forward_interrupts(int pid)
- */
+--- linux-2.6.20/arch/um/kernel/irq.c 2006-11-30 21:18:36 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/um/kernel/irq.c 2007-02-06 03:05:21 +0100
+@@ -357,6 +357,7 @@ void forward_interrupts(int pid)
unsigned int do_IRQ(int irq, union uml_pt_regs *regs)
{
-- irq_enter();
-- __do_IRQ(irq, (struct pt_regs *)regs);
-- irq_exit();
-- return 1;
-+ irq_enter();
+ struct pt_regs *old_regs = set_irq_regs((struct pt_regs *)regs);
+
-+ __do_IRQ(irq, (struct pt_regs *)regs);
-+ irq_exit();
-+ return 1;
- }
-
- int um_request_irq(unsigned int irq, int fd, int type,
---- linux-2.6.18.5/arch/um/kernel/syscall.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/um/kernel/syscall.c 2006-09-21 16:41:49 +0200
-@@ -15,6 +15,8 @@
+ irq_enter();
+ __do_IRQ(irq);
+ irq_exit();
+--- linux-2.6.20/arch/um/kernel/syscall.c 2006-11-30 21:18:36 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/um/kernel/syscall.c 2007-02-06 03:05:21 +0100
+@@ -15,6 +15,7 @@
#include "linux/unistd.h"
#include "linux/slab.h"
#include "linux/utime.h"
-+#include <linux/vs_cvirt.h>
+
#include "asm/mman.h"
#include "asm/uaccess.h"
#include "kern_util.h"
-@@ -110,7 +112,7 @@ long sys_uname(struct old_utsname __user
- if (!name)
- return -EFAULT;
- down_read(&uts_sem);
-- err = copy_to_user(name, &system_utsname, sizeof (*name));
-+ err = copy_to_user(name, vx_new_utsname(), sizeof (*name));
- up_read(&uts_sem);
- return err?-EFAULT:0;
- }
-@@ -118,6 +120,7 @@ long sys_uname(struct old_utsname __user
+@@ -118,6 +119,7 @@ long sys_uname(struct old_utsname __user
long sys_olduname(struct oldold_utsname __user * name)
{
long error;
@@ -1475,54 +1735,9 @@
if (!name)
return -EFAULT;
-@@ -126,19 +129,20 @@ long sys_olduname(struct oldold_utsname
-
- down_read(&uts_sem);
-
-- error = __copy_to_user(&name->sysname,&system_utsname.sysname,
-+ ptr = vx_new_utsname();
-+ error = __copy_to_user(&name->sysname,ptr->sysname,
- __OLD_UTS_LEN);
- error |= __put_user(0,name->sysname+__OLD_UTS_LEN);
-- error |= __copy_to_user(&name->nodename,&system_utsname.nodename,
-+ error |= __copy_to_user(&name->nodename,ptr->nodename,
- __OLD_UTS_LEN);
- error |= __put_user(0,name->nodename+__OLD_UTS_LEN);
-- error |= __copy_to_user(&name->release,&system_utsname.release,
-+ error |= __copy_to_user(&name->release,ptr->release,
- __OLD_UTS_LEN);
- error |= __put_user(0,name->release+__OLD_UTS_LEN);
-- error |= __copy_to_user(&name->version,&system_utsname.version,
-+ error |= __copy_to_user(&name->version,ptr->version,
- __OLD_UTS_LEN);
- error |= __put_user(0,name->version+__OLD_UTS_LEN);
-- error |= __copy_to_user(&name->machine,&system_utsname.machine,
-+ error |= __copy_to_user(&name->machine,ptr->machine,
- __OLD_UTS_LEN);
- error |= __put_user(0,name->machine+__OLD_UTS_LEN);
-
---- linux-2.6.18.5/arch/um/sys-x86_64/syscalls.c 2006-06-18 04:52:42 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/um/sys-x86_64/syscalls.c 2006-09-20 17:01:44 +0200
-@@ -9,6 +9,7 @@
- #include "linux/shm.h"
- #include "linux/utsname.h"
- #include "linux/personality.h"
-+#include "linux/vs_cvirt.h"
- #include "asm/uaccess.h"
- #define __FRAME_OFFSETS
- #include "asm/ptrace.h"
-@@ -21,7 +22,7 @@ asmlinkage long sys_uname64(struct new_u
- {
- int err;
- down_read(&uts_sem);
-- err = copy_to_user(name, &system_utsname, sizeof (*name));
-+ err = copy_to_user(name, vx_new_utsname(), sizeof (*name));
- up_read(&uts_sem);
- if (personality(current->personality) == PER_LINUX32)
- err |= copy_to_user(&name->machine, "i686", 5);
---- linux-2.6.18.5/arch/v850/Kconfig 2006-06-18 04:52:42 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/v850/Kconfig 2006-09-20 17:01:44 +0200
-@@ -326,6 +326,8 @@ source "drivers/usb/Kconfig"
+--- linux-2.6.20/arch/v850/Kconfig 2007-02-06 03:00:21 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/v850/Kconfig 2007-02-06 03:05:21 +0100
+@@ -334,6 +334,8 @@ source "drivers/usb/Kconfig"
source "arch/v850/Kconfig.debug"
@@ -1531,21 +1746,40 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/v850/kernel/ptrace.c 2006-04-09 13:49:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/v850/kernel/ptrace.c 2006-09-20 17:01:44 +0200
-@@ -117,6 +117,9 @@ long arch_ptrace(struct task_struct *chi
+--- linux-2.6.20/arch/v850/kernel/process.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/v850/kernel/process.c 2007-02-06 03:05:21 +0100
+@@ -83,7 +83,7 @@ int kernel_thread (int (*fn)(void *), vo
+ /* Clone this thread. Note that we don't pass the clone syscall's
+ second argument -- it's ignored for calls from kernel mode (the
+ child's SP is always set to the top of the kernel stack). */
+- arg0 = flags | CLONE_VM;
++ arg0 = flags | CLONE_VM | CLONE_KTHREAD;
+ syscall = __NR_clone;
+ asm volatile ("trap " SYSCALL_SHORT_TRAP
+ : "=r" (ret), "=r" (syscall)
+--- linux-2.6.20/arch/v850/kernel/ptrace.c 2006-04-09 13:49:44 +0200
++++ linux-2.6.20-vs2.2.0-pre1/arch/v850/kernel/ptrace.c 2007-02-06 03:05:21 +0100
+@@ -24,6 +24,7 @@
+ #include <linux/smp_lock.h>
+ #include <linux/ptrace.h>
+ #include <linux/signal.h>
++#include <linux/vs_base.h>
+
+ #include <asm/errno.h>
+ #include <asm/ptrace.h>
+@@ -117,6 +118,9 @@ long arch_ptrace(struct task_struct *chi
{
int rval;
-+ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT))
+ goto out;
+
switch (request) {
unsigned long val, copied;
---- linux-2.6.18.5/arch/x86_64/Kconfig 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/x86_64/Kconfig 2006-09-20 17:01:44 +0200
-@@ -654,6 +654,8 @@ endmenu
+--- linux-2.6.20/arch/x86_64/Kconfig 2007-02-06 03:00:21 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/x86_64/Kconfig 2007-02-06 03:05:21 +0100
+@@ -735,6 +735,8 @@ endmenu
source "arch/x86_64/Kconfig.debug"
@@ -1554,8 +1788,8 @@
source "security/Kconfig"
source "crypto/Kconfig"
---- linux-2.6.18.5/arch/x86_64/ia32/ia32_aout.c 2006-01-03 17:29:20 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/x86_64/ia32/ia32_aout.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/x86_64/ia32/ia32_aout.c 2007-02-06 03:00:21 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/x86_64/ia32/ia32_aout.c 2007-02-06 03:05:21 +0100
@@ -25,6 +25,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
@@ -1564,9 +1798,9 @@
#include <asm/system.h>
#include <asm/uaccess.h>
---- linux-2.6.18.5/arch/x86_64/ia32/ia32_binfmt.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/x86_64/ia32/ia32_binfmt.c 2006-09-20 17:01:44 +0200
-@@ -376,7 +376,8 @@ int ia32_setup_arg_pages(struct linux_bi
+--- linux-2.6.20/arch/x86_64/ia32/ia32_binfmt.c 2007-02-06 03:00:21 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/x86_64/ia32/ia32_binfmt.c 2007-02-06 03:05:21 +0100
+@@ -324,7 +324,8 @@ int ia32_setup_arg_pages(struct linux_bi
kmem_cache_free(vm_area_cachep, mpnt);
return ret;
}
@@ -1576,9 +1810,9 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
---- linux-2.6.18.5/arch/x86_64/ia32/ia32entry.S 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/x86_64/ia32/ia32entry.S 2006-09-20 17:01:44 +0200
-@@ -668,7 +668,7 @@ ia32_sys_call_table:
+--- linux-2.6.20/arch/x86_64/ia32/ia32entry.S 2006-11-30 21:18:37 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/x86_64/ia32/ia32entry.S 2007-02-06 03:05:21 +0100
+@@ -672,7 +672,7 @@ ia32_sys_call_table:
.quad sys_tgkill /* 270 */
.quad compat_sys_utimes
.quad sys32_fadvise64_64
@@ -1587,54 +1821,19 @@
.quad sys_mbind
.quad compat_sys_get_mempolicy /* 275 */
.quad sys_set_mempolicy
---- linux-2.6.18.5/arch/x86_64/ia32/sys_ia32.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/x86_64/ia32/sys_ia32.c 2006-09-20 17:01:44 +0200
-@@ -60,6 +60,7 @@
- #include <linux/highuid.h>
- #include <linux/vmalloc.h>
- #include <linux/fsnotify.h>
-+#include <linux/vs_cvirt.h>
- #include <asm/mman.h>
- #include <asm/types.h>
- #include <asm/uaccess.h>
-@@ -779,6 +780,7 @@ asmlinkage long sys32_mmap2(unsigned lon
- asmlinkage long sys32_olduname(struct oldold_utsname __user * name)
- {
- int error;
-+ struct new_utsname *ptr;
-
- if (!name)
- return -EFAULT;
-@@ -787,13 +789,14 @@ asmlinkage long sys32_olduname(struct ol
-
- down_read(&uts_sem);
-
-- error = __copy_to_user(&name->sysname,&system_utsname.sysname,__OLD_UTS_LEN);
-+ ptr = vx_new_utsname();
-+ error = __copy_to_user(&name->sysname,ptr->sysname,__OLD_UTS_LEN);
- __put_user(0,name->sysname+__OLD_UTS_LEN);
-- __copy_to_user(&name->nodename,&system_utsname.nodename,__OLD_UTS_LEN);
-+ __copy_to_user(&name->nodename,ptr->nodename,__OLD_UTS_LEN);
- __put_user(0,name->nodename+__OLD_UTS_LEN);
-- __copy_to_user(&name->release,&system_utsname.release,__OLD_UTS_LEN);
-+ __copy_to_user(&name->release,ptr->release,__OLD_UTS_LEN);
- __put_user(0,name->release+__OLD_UTS_LEN);
-- __copy_to_user(&name->version,&system_utsname.version,__OLD_UTS_LEN);
-+ __copy_to_user(&name->version,ptr->version,__OLD_UTS_LEN);
- __put_user(0,name->version+__OLD_UTS_LEN);
- {
- char *arch = "x86_64";
-@@ -816,7 +819,7 @@ long sys32_uname(struct old_utsname __us
- if (!name)
- return -EFAULT;
- down_read(&uts_sem);
-- err=copy_to_user(name, &system_utsname, sizeof (*name));
-+ err=copy_to_user(name, vx_new_utsname(), sizeof (*name));
- up_read(&uts_sem);
- if (personality(current->personality) == PER_LINUX32)
- err |= copy_to_user(&name->machine, "i686", 5);
---- linux-2.6.18.5/arch/x86_64/ia32/syscall32.c 2005-10-28 20:49:18 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/x86_64/ia32/syscall32.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/arch/x86_64/ia32/sys_ia32.c 2006-11-30 21:18:37 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/x86_64/ia32/sys_ia32.c 2007-02-06 03:05:21 +0100
+@@ -454,7 +454,7 @@ sys32_gettimeofday(struct compat_timeval
+ {
+ if (tv) {
+ struct timeval ktv;
+- do_gettimeofday(&ktv);
++ vx_gettimeofday(&ktv);
+ if (put_tv32(tv, &ktv))
+ return -EFAULT;
+ }
+--- linux-2.6.20/arch/x86_64/ia32/syscall32.c 2007-02-06 03:00:21 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/x86_64/ia32/syscall32.c 2007-02-06 03:05:21 +0100
@@ -10,6 +10,7 @@
#include <linux/init.h>
#include <linux/stringify.h>
@@ -1643,7 +1842,7 @@
#include <asm/proto.h>
#include <asm/tlbflush.h>
#include <asm/ia32_unistd.h>
-@@ -70,7 +71,7 @@ int syscall32_setup_pages(struct linux_b
+@@ -77,7 +78,7 @@ int syscall32_setup_pages(struct linux_b
kmem_cache_free(vm_area_cachep, vma);
return ret;
}
@@ -1652,28 +1851,42 @@
up_write(&mm->mmap_sem);
return 0;
}
---- linux-2.6.18.5/arch/x86_64/kernel/sys_x86_64.c 2006-01-03 17:29:20 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/x86_64/kernel/sys_x86_64.c 2006-09-20 17:01:44 +0200
-@@ -16,6 +16,7 @@
- #include <linux/file.h>
- #include <linux/utsname.h>
- #include <linux/personality.h>
-+#include <linux/vs_cvirt.h>
+--- linux-2.6.20/arch/x86_64/kernel/irq.c 2007-02-06 03:00:21 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/x86_64/kernel/irq.c 2007-02-06 03:05:21 +0100
+@@ -123,7 +123,6 @@ asmlinkage unsigned int do_IRQ(struct pt
+ else if (printk_ratelimit())
+ printk(KERN_EMERG "%s: %d.%d No irq handler for vector\n",
+ __func__, smp_processor_id(), vector);
+-
+ irq_exit();
- #include <asm/uaccess.h>
- #include <asm/ia32.h>
-@@ -148,7 +149,7 @@ asmlinkage long sys_uname(struct new_uts
- {
- int err;
- down_read(&uts_sem);
-- err = copy_to_user(name, &system_utsname, sizeof (*name));
-+ err = copy_to_user(name, vx_new_utsname(), sizeof (*name));
- up_read(&uts_sem);
- if (personality(current->personality) == PER_LINUX32)
- err |= copy_to_user(&name->machine, "i686", 5);
---- linux-2.6.18.5/arch/x86_64/kernel/traps.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/x86_64/kernel/traps.c 2006-09-20 17:01:44 +0200
-@@ -435,8 +435,9 @@ void show_registers(struct pt_regs *regs
+ set_irq_regs(old_regs);
+--- linux-2.6.20/arch/x86_64/kernel/process.c 2007-02-06 03:00:22 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/x86_64/kernel/process.c 2007-02-06 03:05:22 +0100
+@@ -54,7 +54,8 @@
+
+ asmlinkage extern void ret_from_fork(void);
+
+-unsigned long kernel_thread_flags = CLONE_VM | CLONE_UNTRACED;
++unsigned long kernel_thread_flags =
++ CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD;
+
+ unsigned long boot_option_idle_override = 0;
+ EXPORT_SYMBOL(boot_option_idle_override);
+@@ -308,8 +309,8 @@ void __show_regs(struct pt_regs * regs)
+
+ printk("\n");
+ print_modules();
+- printk("Pid: %d, comm: %.20s %s %s %.*s\n",
+- current->pid, current->comm, print_tainted(),
++ printk("Pid: %d:#%u, comm: %.20s %s %s %.*s\n",
++ current->pid, current->xid, current->comm, print_tainted(),
+ init_utsname()->release,
+ (int)strcspn(init_utsname()->version, " "),
+ init_utsname()->version);
+--- linux-2.6.20/arch/x86_64/kernel/traps.c 2007-02-06 03:00:22 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/x86_64/kernel/traps.c 2007-02-06 03:05:22 +0100
+@@ -430,8 +430,9 @@ void show_registers(struct pt_regs *regs
printk("CPU %d ", cpu);
__show_regs(regs);
@@ -1685,51 +1898,58 @@
/*
* When in-kernel, we also print out the stack and code at the
---- linux-2.6.18.5/arch/xtensa/kernel/irq.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/xtensa/kernel/irq.c 2006-11-07 19:19:14 +0100
-@@ -63,9 +63,7 @@ unsigned int do_IRQ(int irq, struct pt_
- sp - sizeof(struct thread_info));
- }
- #endif
--
- __do_IRQ(irq, regs);
--
- irq_exit();
-
- return 1;
---- linux-2.6.18.5/arch/xtensa/kernel/syscalls.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/xtensa/kernel/syscalls.c 2006-09-20 17:01:44 +0200
-@@ -34,6 +34,7 @@
- #include <linux/msg.h>
- #include <linux/shm.h>
- #include <linux/errno.h>
-+#include <linux/vs_cvirt.h>
- #include <asm/ptrace.h>
- #include <asm/signal.h>
- #include <asm/uaccess.h>
-@@ -128,7 +129,7 @@ out:
-
- int sys_uname(struct old_utsname * name)
- {
-- if (name && !copy_to_user(name, &system_utsname, sizeof (*name)))
-+ if (name && !copy_to_user(name, vx_new_utsname(), sizeof (*name)))
- return 0;
- return -EFAULT;
- }
---- linux-2.6.18.5/block/cfq-iosched.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/block/cfq-iosched.c 2006-10-17 01:20:07 +0200
-@@ -326,6 +326,8 @@ static int cfq_queue_empty(request_queue
+@@ -587,8 +588,8 @@ static void __kprobes do_trap(int trapnr
+ if (user_mode(regs)) {
+ if (exception_trace && unhandled_signal(tsk, signr))
+ printk(KERN_INFO
+- "%s[%d] trap %s rip:%lx rsp:%lx error:%lx\n",
+- tsk->comm, tsk->pid, str,
++ "%s[%d:#%u] trap %s rip:%lx rsp:%lx error:%lx\n",
++ tsk->comm, tsk->pid, tsk->xid, str,
+ regs->rip, regs->rsp, error_code);
+
+ if (info)
+@@ -688,8 +689,8 @@ asmlinkage void __kprobes do_general_pro
+ if (user_mode(regs)) {
+ if (exception_trace && unhandled_signal(tsk, SIGSEGV))
+ printk(KERN_INFO
+- "%s[%d] general protection rip:%lx rsp:%lx error:%lx\n",
+- tsk->comm, tsk->pid,
++ "%s[%d:#%u] general protection rip:%lx rsp:%lx error:%lx\n",
++ tsk->comm, tsk->pid, tsk->xid,
+ regs->rip, regs->rsp, error_code);
+
+ force_sig(SIGSEGV, tsk);
+--- linux-2.6.20/arch/x86_64/mm/fault.c 2007-02-06 03:00:22 +0100
++++ linux-2.6.20-vs2.2.0-pre1/arch/x86_64/mm/fault.c 2007-02-06 03:05:22 +0100
+@@ -514,10 +514,10 @@ bad_area_nosemaphore:
+
+ if (exception_trace && unhandled_signal(tsk, SIGSEGV)) {
+ printk(
+- "%s%s[%d]: segfault at %016lx rip %016lx rsp %016lx error %lx\n",
++ "%s%s[%d:#%u]: segfault at %016lx rip %016lx rsp %016lx error %lx\n",
+ tsk->pid > 1 ? KERN_INFO : KERN_EMERG,
+- tsk->comm, tsk->pid, address, regs->rip,
+- regs->rsp, error_code);
++ tsk->comm, tsk->pid, tsk->xid, address,
++ regs->rip, regs->rsp, error_code);
+ }
+
+ tsk->thread.cr2 = address;
+--- linux-2.6.20/block/cfq-iosched.c 2007-02-06 03:00:22 +0100
++++ linux-2.6.20-vs2.2.0-pre1/block/cfq-iosched.c 2007-02-06 03:11:09 +0100
+@@ -221,6 +221,8 @@ static int cfq_queue_empty(request_queue
- static inline pid_t cfq_queue_pid(struct task_struct *task, int rw)
+ static inline pid_t cfq_queue_pid(struct task_struct *task, int rw, int is_sync)
{
+ if (task->xid)
+ return task->xid + (1 << 16);
- if (rw == READ || rw == WRITE_SYNC)
- return task->pid;
-
---- linux-2.6.18.5/drivers/block/Kconfig 2006-09-20 16:58:07 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/drivers/block/Kconfig 2006-09-20 17:01:44 +0200
-@@ -315,6 +315,13 @@ config BLK_DEV_CRYPTOLOOP
+ /*
+ * Use the per-process queue, for read requests and syncronous writes
+ */
+--- linux-2.6.20/drivers/block/Kconfig 2007-02-06 03:00:26 +0100
++++ linux-2.6.20-vs2.2.0-pre1/drivers/block/Kconfig 2007-02-06 03:05:22 +0100
+@@ -311,6 +311,13 @@ config BLK_DEV_CRYPTOLOOP
instead, which can be configured to be on-disk compatible with the
cryptoloop device.
@@ -1743,26 +1963,63 @@
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
---- linux-2.6.18.5/drivers/block/Makefile 2006-06-18 04:52:46 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/drivers/block/Makefile 2006-09-20 17:01:44 +0200
-@@ -29,4 +29,5 @@ obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryp
+--- linux-2.6.20/drivers/block/Makefile 2007-02-06 03:00:26 +0100
++++ linux-2.6.20-vs2.2.0-pre1/drivers/block/Makefile 2007-02-06 03:05:22 +0100
+@@ -28,4 +28,5 @@ obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryp
obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_BLK_DEV_UB) += ub.o
+obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o
---- linux-2.6.18.5/drivers/block/loop.c 2006-09-20 16:58:07 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/drivers/block/loop.c 2006-12-10 02:04:47 +0100
-@@ -72,6 +72,7 @@
- #include <linux/completion.h>
+--- linux-2.6.20/drivers/block/loop.c 2007-02-06 03:00:26 +0100
++++ linux-2.6.20-vs2.2.0-pre1/drivers/block/loop.c 2007-02-06 03:05:22 +0100
+@@ -74,6 +74,7 @@
#include <linux/highmem.h>
#include <linux/gfp.h>
+ #include <linux/kthread.h>
+#include <linux/vs_context.h>
#include <asm/uaccess.h>
---- linux-2.6.18.5/drivers/block/vroot.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/drivers/block/vroot.c 2006-09-21 01:26:54 +0200
+@@ -795,6 +796,7 @@ static int loop_set_fd(struct loop_devic
+ lo->lo_blocksize = lo_blocksize;
+ lo->lo_device = bdev;
+ lo->lo_flags = lo_flags;
++ lo->lo_xid = vx_current_xid();
+ lo->lo_backing_file = file;
+ lo->transfer = transfer_none;
+ lo->ioctl = NULL;
+@@ -935,7 +937,7 @@ loop_set_status(struct loop_device *lo,
+ struct loop_func_table *xfer;
+
+ if (lo->lo_encrypt_key_size && lo->lo_key_owner != current->uid &&
+- !capable(CAP_SYS_ADMIN))
++ !vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP))
+ return -EPERM;
+ if (lo->lo_state != Lo_bound)
+ return -ENXIO;
+@@ -1015,7 +1017,8 @@ loop_get_status(struct loop_device *lo,
+ memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
+ info->lo_encrypt_type =
+ lo->lo_encryption ? lo->lo_encryption->number : 0;
+- if (lo->lo_encrypt_key_size && capable(CAP_SYS_ADMIN)) {
++ if (lo->lo_encrypt_key_size &&
++ vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP)) {
+ info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
+ memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
+ lo->lo_encrypt_key_size);
+@@ -1326,6 +1329,9 @@ static int lo_open(struct inode *inode,
+ {
+ struct loop_device *lo = inode->i_bdev->bd_disk->private_data;
+
++ if (!vx_check(lo->lo_xid, VS_WATCH_P|VS_IDENT))
++ return -EACCES;
++
+ mutex_lock(&lo->lo_ctl_mutex);
+ lo->lo_refcnt++;
+ mutex_unlock(&lo->lo_ctl_mutex);
+--- linux-2.6.20/drivers/block/vroot.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/drivers/block/vroot.c 2007-02-06 03:05:22 +0100
@@ -0,0 +1,281 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -1785,7 +2042,7 @@
+#include <linux/blkdev.h>
+
+#include <linux/vroot.h>
-+#include <linux/vserver/debug.h>
++#include <linux/vs_context.h>
+
+
+static int max_vroot = 8;
@@ -2045,9 +2302,9 @@
+
+#endif
+
---- linux-2.6.18.5/drivers/char/random.c 2006-09-20 16:58:13 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/drivers/char/random.c 2006-09-20 17:01:44 +0200
-@@ -1173,7 +1173,7 @@ static char sysctl_bootid[16];
+--- linux-2.6.20/drivers/char/random.c 2007-02-06 03:00:33 +0100
++++ linux-2.6.20-vs2.2.0-pre1/drivers/char/random.c 2007-02-06 03:05:22 +0100
+@@ -1178,7 +1178,7 @@ static char sysctl_bootid[16];
static int proc_do_uuid(ctl_table *table, int write, struct file *filp,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
@@ -2056,17 +2313,71 @@
unsigned char buf[64], tmp_uuid[16], *uuid;
uuid = table->data;
---- linux-2.6.18.5/drivers/char/tty_io.c 2006-09-20 16:58:13 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/drivers/char/tty_io.c 2006-09-20 19:55:41 +0200
+--- linux-2.6.20/drivers/char/sysrq.c 2007-02-06 03:00:34 +0100
++++ linux-2.6.20-vs2.2.0-pre1/drivers/char/sysrq.c 2007-02-06 03:12:21 +0100
+@@ -36,6 +36,7 @@
+ #include <linux/workqueue.h>
+ #include <linux/kexec.h>
+ #include <linux/irq.h>
++#include <linux/vserver/debug.h>
+
+ #include <asm/ptrace.h>
+ #include <asm/irq_regs.h>
+@@ -299,6 +300,21 @@ static struct sysrq_key_op sysrq_unrt_op
+ .enable_mask = SYSRQ_ENABLE_RTNICE,
+ };
+
++
++#ifdef CONFIG_VSERVER_DEBUG
++static void sysrq_handle_vxinfo(int key, struct tty_struct *tty)
++{
++ dump_vx_info_inactive((key == 'x')?0:1);
++}
++
++static struct sysrq_key_op sysrq_showvxinfo_op = {
++ .handler = sysrq_handle_vxinfo,
++ .help_msg = "conteXt",
++ .action_msg = "Show Context Info",
++ .enable_mask = SYSRQ_ENABLE_DUMP,
++};
++#endif
++
+ /* Key Operations table and lock */
+ static DEFINE_SPINLOCK(sysrq_key_table_lock);
+
+@@ -347,7 +363,11 @@ static struct sysrq_key_op *sysrq_key_ta
+ /* x: May be registered on ppc/powerpc for xmon */
+ NULL, /* x */
+ NULL, /* y */
+- NULL /* z */
++#ifdef CONFIG_VSERVER_DEBUG
++ &sysrq_showvxinfo_op, /* z */
++#else
++ NULL, /* z */
++#endif
+ };
+
+ /* key2index calculation, -1 on invalid index */
+@@ -359,6 +379,8 @@ static int sysrq_key_table_key2index(int
+ retval = key - '0';
+ else if ((key >= 'a') && (key <= 'z'))
+ retval = key + 10 - 'a';
++ else if ((key >= 'A') && (key <= 'Z'))
++ retval = key + 10 - 'A';
+ else
+ retval = -1;
+ return retval;
+--- linux-2.6.20/drivers/char/tty_io.c 2007-02-06 03:00:34 +0100
++++ linux-2.6.20-vs2.2.0-pre1/drivers/char/tty_io.c 2007-02-06 03:05:22 +0100
@@ -103,6 +103,7 @@
#include <linux/selection.h>
#include <linux/kmod.h>
-+#include <linux/vs_cvirt.h>
++#include <linux/vs_pid.h>
#undef TTY_DEBUG_HANGUP
-@@ -2940,13 +2941,16 @@ static int tiocsctty(struct tty_struct *
+@@ -2964,13 +2965,16 @@ unlock:
static int tiocgpgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t __user *p)
{
@@ -2084,7 +2395,7 @@
}
/**
-@@ -2978,6 +2982,8 @@ static int tiocspgrp(struct tty_struct *
+@@ -3000,6 +3004,8 @@ static int tiocspgrp(struct tty_struct *
return -ENOTTY;
if (get_user(pgrp, p))
return -EFAULT;
@@ -2092,9 +2403,9 @@
+ pgrp = vx_rmap_pid(pgrp);
if (pgrp < 0)
return -EINVAL;
- if (session_of_pgrp(pgrp) != current->signal->session)
---- linux-2.6.18.5/drivers/infiniband/core/uverbs_mem.c 2006-06-18 04:53:04 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/drivers/infiniband/core/uverbs_mem.c 2006-09-20 17:01:44 +0200
+ if (session_of_pgrp(pgrp) != process_session(current))
+--- linux-2.6.20/drivers/infiniband/core/uverbs_mem.c 2007-02-06 03:00:37 +0100
++++ linux-2.6.20-vs2.2.0-pre1/drivers/infiniband/core/uverbs_mem.c 2007-02-06 03:05:22 +0100
@@ -36,6 +36,7 @@
#include <linux/mm.h>
@@ -2123,8 +2434,8 @@
up_write(¤t->mm->mmap_sem);
}
-@@ -184,7 +185,7 @@ static void ib_umem_account(void *work_p
- struct ib_umem_account_work *work = work_ptr;
+@@ -185,7 +186,7 @@ static void ib_umem_account(struct work_
+ container_of(_work, struct ib_umem_account_work, work);
down_write(&work->mm->mmap_sem);
- work->mm->locked_vm -= work->diff;
@@ -2132,8 +2443,8 @@
up_write(&work->mm->mmap_sem);
mmput(work->mm);
kfree(work);
---- linux-2.6.18.5/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-09-20 16:58:14 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/drivers/infiniband/hw/ipath/ipath_user_pages.c 2007-02-06 03:00:37 +0100
++++ linux-2.6.20-vs2.2.0-pre1/drivers/infiniband/hw/ipath/ipath_user_pages.c 2007-02-06 03:05:22 +0100
@@ -33,6 +33,7 @@
#include <linux/mm.h>
@@ -2161,7 +2472,7 @@
ret = 0;
goto bail;
-@@ -147,7 +149,7 @@ void ipath_release_user_pages(struct pag
+@@ -203,7 +205,7 @@ void ipath_release_user_pages(struct pag
__ipath_release_user_pages(p, num_pages, 1);
@@ -2170,8 +2481,8 @@
up_write(¤t->mm->mmap_sem);
}
-@@ -163,7 +165,7 @@ static void user_pages_account(void *ptr
- struct ipath_user_pages_work *work = ptr;
+@@ -220,7 +222,7 @@ static void user_pages_account(struct wo
+ container_of(_work, struct ipath_user_pages_work, work);
down_write(&work->mm->mmap_sem);
- work->mm->locked_vm -= work->num_pages;
@@ -2179,43 +2490,194 @@
up_write(&work->mm->mmap_sem);
mmput(work->mm);
kfree(work);
---- linux-2.6.18.5/drivers/s390/cio/cio.c 2006-09-20 16:58:27 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/drivers/s390/cio/cio.c 2006-12-10 02:04:47 +0100
-@@ -16,6 +16,7 @@
- #include <linux/device.h>
- #include <linux/kernel_stat.h>
- #include <linux/interrupt.h>
+--- linux-2.6.20/drivers/md/dm-ioctl.c 2007-02-06 03:00:41 +0100
++++ linux-2.6.20-vs2.2.0-pre1/drivers/md/dm-ioctl.c 2007-02-06 03:05:22 +0100
+@@ -15,6 +15,7 @@
+ #include <linux/slab.h>
+ #include <linux/dm-ioctl.h>
+ #include <linux/hdreg.h>
+#include <linux/vs_context.h>
- #include <asm/cio.h>
- #include <asm/delay.h>
-@@ -639,6 +640,7 @@ do_IRQ (struct pt_regs *regs)
- spin_lock(&sch->lock);
- /* Store interrupt response block to lowcore. */
- if (tsch (tpi_info->schid, irb) == 0 && sch) {
-+
- /* Keep subchannel information word up to date. */
- memcpy (&sch->schib.scsw, &irb->scsw,
- sizeof (irb->scsw));
---- linux-2.6.18.5/fs/attr.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/attr.c 2006-09-20 17:01:44 +0200
-@@ -15,6 +15,9 @@
- #include <linux/fcntl.h>
- #include <linux/quotaops.h>
- #include <linux/security.h>
-+#include <linux/proc_fs.h>
-+#include <linux/devpts_fs.h>
-+#include <linux/vserver/debug.h>
+ #include <asm/uaccess.h>
- /* Taken over from the old code... */
+@@ -100,7 +101,8 @@ static struct hash_cell *__get_name_cell
+ unsigned int h = hash_str(str);
-@@ -56,6 +59,28 @@ int inode_change_ok(struct inode *inode,
- if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
- goto error;
- }
+ list_for_each_entry (hc, _name_buckets + h, name_list)
+- if (!strcmp(hc->name, str)) {
++ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P|VS_IDENT) &&
++ !strcmp(hc->name, str)) {
+ dm_get(hc->md);
+ return hc;
+ }
+@@ -114,7 +116,8 @@ static struct hash_cell *__get_uuid_cell
+ unsigned int h = hash_str(str);
+
+ list_for_each_entry (hc, _uuid_buckets + h, uuid_list)
+- if (!strcmp(hc->uuid, str)) {
++ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P|VS_IDENT) &&
++ !strcmp(hc->uuid, str)) {
+ dm_get(hc->md);
+ return hc;
+ }
+@@ -349,6 +352,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
+
+ static int remove_all(struct dm_ioctl *param, size_t param_size)
+ {
++ if (!vx_check(0, VS_ADMIN))
++ return -EPERM;
++
+ dm_hash_remove_all(1);
+ param->data_size = 0;
+ return 0;
+@@ -396,6 +402,8 @@ static int list_devices(struct dm_ioctl
+ */
+ for (i = 0; i < NUM_BUCKETS; i++) {
+ list_for_each_entry (hc, _name_buckets + i, name_list) {
++ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P|VS_IDENT))
++ continue;
+ needed += sizeof(struct dm_name_list);
+ needed += strlen(hc->name) + 1;
+ needed += ALIGN_MASK;
+@@ -419,6 +427,8 @@ static int list_devices(struct dm_ioctl
+ */
+ for (i = 0; i < NUM_BUCKETS; i++) {
+ list_for_each_entry (hc, _name_buckets + i, name_list) {
++ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P|VS_IDENT))
++ continue;
+ if (old_nl)
+ old_nl->next = (uint32_t) ((void *) nl -
+ (void *) old_nl);
+@@ -609,10 +619,11 @@ static struct hash_cell *__find_device_h
+ if (!md)
+ goto out;
+
+- mdptr = dm_get_mdptr(md);
++ if (vx_check(dm_get_xid(md), VS_WATCH_P|VS_IDENT))
++ mdptr = dm_get_mdptr(md);
++
+ if (!mdptr)
+ dm_put(md);
+-
+ out:
+ return mdptr;
+ }
+@@ -1409,8 +1420,8 @@ static int ctl_ioctl(struct inode *inode
+ ioctl_fn fn = NULL;
+ size_t param_size;
+
+- /* only root can play with this */
+- if (!capable(CAP_SYS_ADMIN))
++ /* only root and certain contexts can play with this */
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_MAPPER))
+ return -EACCES;
+
+ if (_IOC_TYPE(command) != DM_IOCTL)
+--- linux-2.6.20/drivers/md/dm.c 2007-02-06 03:00:41 +0100
++++ linux-2.6.20-vs2.2.0-pre1/drivers/md/dm.c 2007-02-06 03:05:22 +0100
+@@ -21,6 +21,7 @@
+ #include <linux/hdreg.h>
+ #include <linux/blktrace_api.h>
+ #include <linux/smp_lock.h>
++#include <linux/vs_base.h>
+
+ #define DM_MSG_PREFIX "core"
+
+@@ -77,6 +78,7 @@ struct mapped_device {
+ rwlock_t map_lock;
+ atomic_t holders;
+ atomic_t open_count;
++ xid_t xid;
+
+ unsigned long flags;
+
+@@ -223,6 +225,7 @@ static void __exit dm_exit(void)
+ static int dm_blk_open(struct inode *inode, struct file *file)
+ {
+ struct mapped_device *md;
++ int ret = -ENXIO;
+
+ spin_lock(&_minor_lock);
+
+@@ -231,18 +234,19 @@ static int dm_blk_open(struct inode *ino
+ 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))
+ 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 inode *inode, struct file *file)
+@@ -438,6 +442,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
+@@ -991,6 +1003,7 @@ static struct mapped_device *alloc_dev(i
+ atomic_set(&md->holders, 1);
+ atomic_set(&md->open_count, 0);
+ atomic_set(&md->event_nr, 0);
++ md->xid = vx_current_xid();
+
+ md->queue = blk_alloc_queue(GFP_KERNEL);
+ if (!md->queue)
+--- linux-2.6.20/drivers/md/dm.h 2007-02-06 03:00:41 +0100
++++ linux-2.6.20-vs2.2.0-pre1/drivers/md/dm.h 2007-02-06 03:05:22 +0100
+@@ -91,6 +91,8 @@ void dm_put_target_type(struct target_ty
+ int dm_target_iterate(void (*iter_func)(struct target_type *tt,
+ void *param), void *param);
+
++xid_t dm_get_xid(struct mapped_device *md);
++
+ /*-----------------------------------------------------------------
+ * Useful inlines.
+ *---------------------------------------------------------------*/
+--- linux-2.6.20/fs/attr.c 2006-04-09 13:49:53 +0200
++++ linux-2.6.20-vs2.2.0-pre1/fs/attr.c 2007-02-06 03:05:22 +0100
+@@ -15,6 +15,9 @@
+ #include <linux/fcntl.h>
+ #include <linux/quotaops.h>
+ #include <linux/security.h>
++#include <linux/proc_fs.h>
++#include <linux/devpts_fs.h>
++#include <linux/vs_base.h>
+
+ /* Taken over from the old code... */
+
+@@ -56,6 +59,30 @@ int inode_change_ok(struct inode *inode,
+ if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
+ goto error;
+ }
+
+ /* Check for evil vserver activity */
-+ if (vx_check(0, VX_ADMIN))
++ if (vx_check(0, VS_ADMIN))
+ goto fine;
+
+ if (IS_BARRIER(inode)) {
@@ -2225,11 +2687,13 @@
+ }
+ switch (inode->i_sb->s_magic) {
+ case PROC_SUPER_MAGIC:
++ /* maybe allow that in the future? */
+ vxwprintk(1, "xid=%d messing with the procfs.",
+ vx_current_xid());
+ goto error;
+ case DEVPTS_SUPER_MAGIC:
-+ if (vx_check(inode->i_xid, VX_IDENT))
++ /* devpts is xid tagged */
++ if (vx_check((xid_t)inode->i_tag, VS_IDENT))
+ goto fine;
+ vxwprintk(1, "xid=%d messing with the devpts.",
+ vx_current_xid());
@@ -2238,27 +2702,27 @@
fine:
retval = 0;
error:
-@@ -79,6 +104,8 @@ int inode_setattr(struct inode * inode,
+@@ -79,6 +106,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_XID) && IS_TAGXID(inode))
-+ inode->i_xid = attr->ia_xid;
++ if ((ia_valid & ATTR_TAG) && IS_TAGGED(inode))
++ inode->i_tag = attr->ia_tag;
if (ia_valid & ATTR_ATIME)
inode->i_atime = timespec_trunc(attr->ia_atime,
inode->i_sb->s_time_gran);
-@@ -153,7 +180,8 @@ int notify_change(struct dentry * dentry
+@@ -153,7 +182,8 @@ int notify_change(struct dentry * dentry
error = security_inode_setattr(dentry, attr);
if (!error) {
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
- (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
+ (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) ||
-+ (ia_valid & ATTR_XID && attr->ia_xid != inode->i_xid))
++ (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag))
error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;
if (!error)
error = inode_setattr(inode, attr);
---- linux-2.6.18.5/fs/binfmt_aout.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/binfmt_aout.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/fs/binfmt_aout.c 2007-02-06 03:01:16 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/binfmt_aout.c 2007-02-06 03:05:22 +0100
@@ -24,6 +24,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
@@ -2267,29 +2731,18 @@
#include <asm/system.h>
#include <asm/uaccess.h>
---- linux-2.6.18.5/fs/binfmt_elf.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/binfmt_elf.c 2006-09-20 18:28:33 +0200
-@@ -39,6 +39,8 @@
+--- linux-2.6.20/fs/binfmt_elf.c 2007-02-06 03:01:16 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/binfmt_elf.c 2007-02-06 03:05:22 +0100
+@@ -39,6 +39,7 @@
#include <linux/syscalls.h>
#include <linux/random.h>
#include <linux/elf.h>
+#include <linux/vs_memory.h>
-+#include <linux/vs_cvirt.h>
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
---- linux-2.6.18.5/fs/binfmt_elf_fdpic.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/binfmt_elf_fdpic.c 2006-09-20 17:01:44 +0200
-@@ -34,6 +34,7 @@
- #include <linux/elf.h>
- #include <linux/elf-fdpic.h>
- #include <linux/elfcore.h>
-+#include <linux/vs_cvirt.h>
-
- #include <asm/uaccess.h>
- #include <asm/param.h>
---- linux-2.6.18.5/fs/binfmt_flat.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/binfmt_flat.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/fs/binfmt_flat.c 2007-02-06 03:01:16 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/binfmt_flat.c 2007-02-06 03:05:22 +0100
@@ -36,6 +36,7 @@
#include <linux/init.h>
#include <linux/flat.h>
@@ -2298,21 +2751,84 @@
#include <asm/byteorder.h>
#include <asm/system.h>
---- linux-2.6.18.5/fs/binfmt_som.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/binfmt_som.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/fs/binfmt_som.c 2006-11-30 21:19:19 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/binfmt_som.c 2007-02-06 03:05:22 +0100
@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/personality.h>
#include <linux/init.h>
+#include <linux/vs_memory.h>
+ #include <asm/a.out.h>
#include <asm/uaccess.h>
- #include <asm/pgtable.h>
---- linux-2.6.18.5/fs/devpts/inode.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/devpts/inode.c 2006-09-20 17:01:44 +0200
-@@ -20,7 +20,19 @@
+--- linux-2.6.20/fs/dcache.c 2007-02-06 03:01:17 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/dcache.c 2007-02-06 03:05:22 +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"
+
+
+@@ -155,6 +156,7 @@ void dput(struct dentry *dentry)
+ if (!dentry)
+ return;
+
++ vx_dentry_dec(dentry);
+ repeat:
+ if (atomic_read(&dentry->d_count) == 1)
+ might_sleep();
+@@ -168,6 +170,8 @@ repeat:
+ return;
+ }
+
++ vx_dentry_dec(dentry);
++
+ /*
+ * AV: ->d_delete() is _NOT_ allowed to block now.
+ */
+@@ -278,6 +282,7 @@ static inline struct dentry * __dget_loc
+ if (!list_empty(&dentry->d_lru)) {
+ dentry_stat.nr_unused--;
+ list_del_init(&dentry->d_lru);
++ vx_dentry_inc(dentry);
+ }
+ return dentry;
+ }
+@@ -869,6 +874,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;
+@@ -917,6 +925,7 @@ struct dentry *d_alloc(struct dentry * p
+ if (parent)
+ list_add(&dentry->d_u.d_child, &parent->d_subdirs);
+ dentry_stat.nr_dentry++;
++ vx_dentry_inc(dentry);
+ spin_unlock(&dcache_lock);
+
+ return dentry;
+@@ -1266,6 +1275,7 @@ struct dentry * __d_lookup(struct dentry
+
+ if (!d_unhashed(dentry)) {
+ atomic_inc(&dentry->d_count);
++ vx_dentry_inc(dentry);
+ found = dentry;
+ }
+ spin_unlock(&dentry->d_lock);
+--- linux-2.6.20/fs/devpts/inode.c 2006-11-30 21:19:19 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/devpts/inode.c 2007-02-06 03:05:22 +0100
+@@ -19,8 +19,22 @@
+ #include <linux/tty.h>
#include <linux/devpts_fs.h>
#include <linux/parser.h>
++#include <linux/vs_base.h>
-#define DEVPTS_SUPER_MAGIC 0x1cd1
+
@@ -2320,7 +2836,8 @@
+{
+ int ret = -EACCES;
+
-+ if (vx_check(inode->i_xid, VX_IDENT))
++ /* devpts is xid tagged */
++ if (vx_check((xid_t)inode->i_tag, VS_WATCH_P|VS_IDENT))
+ ret = generic_permission(inode, mask, NULL);
+ return ret;
+}
@@ -2331,13 +2848,14 @@
static struct vfsmount *devpts_mnt;
static struct dentry *devpts_root;
-@@ -91,6 +103,24 @@ static int devpts_remount(struct super_b
+@@ -91,6 +105,25 @@ static int devpts_remount(struct super_b
return 0;
}
+static int devpts_filter(struct dentry *de)
+{
-+ return vx_check(de->d_inode->i_xid, VX_IDENT);
++ /* devpts is xid tagged */
++ return vx_check((xid_t)de->d_inode->i_tag, VS_WATCH_P|VS_IDENT);
+}
+
+static int devpts_readdir(struct file * filp, void * dirent, filldir_t filldir)
@@ -2356,38 +2874,95 @@
static struct super_operations devpts_sops = {
.statfs = simple_statfs,
.remount_fs = devpts_remount,
-@@ -117,8 +147,9 @@ devpts_fill_super(struct super_block *s,
+@@ -116,8 +149,10 @@ devpts_fill_super(struct super_block *s,
inode->i_uid = inode->i_gid = 0;
inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
inode->i_op = &simple_dir_inode_operations;
- inode->i_fop = &simple_dir_operations;
+ inode->i_fop = &devpts_dir_operations;
inode->i_nlink = 2;
-+ inode->i_xid = vx_current_xid();
++ /* devpts is xid tagged */
++ inode->i_tag = (tag_t)vx_current_xid();
devpts_root = s->s_root = d_alloc_root(inode);
if (s->s_root)
-@@ -177,6 +208,8 @@ int devpts_pty_new(struct tty_struct *tt
+@@ -175,6 +210,9 @@ int devpts_pty_new(struct tty_struct *tt
inode->i_gid = config.setgid ? config.gid : current->fsgid;
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
init_special_inode(inode, S_IFCHR|config.mode, device);
-+ inode->i_xid = vx_current_xid();
++ /* devpts is xid tagged */
++ inode->i_tag = (tag_t)vx_current_xid();
+ inode->i_op = &devpts_file_inode_operations;
- inode->u.generic_ip = tty;
+ inode->i_private = tty;
dentry = get_node(number);
---- linux-2.6.18.5/fs/exec.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/exec.c 2006-09-20 18:03:28 +0200
-@@ -49,6 +49,8 @@
- #include <linux/acct.h>
+--- linux-2.6.20/fs/ecryptfs/inode.c 2007-02-06 03:01:17 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ecryptfs/inode.c 2007-02-06 03:05:22 +0100
+@@ -415,7 +415,7 @@ static int ecryptfs_link(struct dentry *
+ dget(lower_new_dentry);
+ lower_dir_dentry = lock_parent(lower_new_dentry);
+ rc = vfs_link(lower_old_dentry, lower_dir_dentry->d_inode,
+- lower_new_dentry);
++ lower_new_dentry, NULL);
+ if (rc || !lower_new_dentry->d_inode)
+ goto out_lock;
+ rc = ecryptfs_interpose(lower_new_dentry, new_dentry, dir->i_sb, 0);
+@@ -443,7 +443,7 @@ static int ecryptfs_unlink(struct inode
+ struct inode *lower_dir_inode = ecryptfs_inode_to_lower(dir);
+
+ lock_parent(lower_dentry);
+- rc = vfs_unlink(lower_dir_inode, lower_dentry);
++ rc = vfs_unlink(lower_dir_inode, lower_dentry, NULL);
+ if (rc) {
+ printk(KERN_ERR "Error in vfs_unlink; rc = [%d]\n", rc);
+ goto out_unlock;
+@@ -480,7 +480,7 @@ static int ecryptfs_symlink(struct inode
+ goto out_lock;
+ }
+ rc = vfs_symlink(lower_dir_dentry->d_inode, lower_dentry,
+- encoded_symname, mode);
++ encoded_symname, mode, NULL);
+ kfree(encoded_symname);
+ if (rc || !lower_dentry->d_inode)
+ goto out_lock;
+@@ -505,7 +505,7 @@ static int ecryptfs_mkdir(struct inode *
+
+ lower_dentry = ecryptfs_dentry_to_lower(dentry);
+ lower_dir_dentry = lock_parent(lower_dentry);
+- rc = vfs_mkdir(lower_dir_dentry->d_inode, lower_dentry, mode);
++ rc = vfs_mkdir(lower_dir_dentry->d_inode, lower_dentry, mode, NULL);
+ if (rc || !lower_dentry->d_inode)
+ goto out;
+ rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0);
+@@ -531,7 +531,7 @@ static int ecryptfs_rmdir(struct inode *
+ dget(dentry);
+ lower_dir_dentry = lock_parent(lower_dentry);
+ dget(lower_dentry);
+- rc = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry);
++ rc = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry, NULL);
+ dput(lower_dentry);
+ if (!rc)
+ d_delete(lower_dentry);
+@@ -553,7 +553,7 @@ ecryptfs_mknod(struct inode *dir, struct
+
+ lower_dentry = ecryptfs_dentry_to_lower(dentry);
+ lower_dir_dentry = lock_parent(lower_dentry);
+- rc = vfs_mknod(lower_dir_dentry->d_inode, lower_dentry, mode, dev);
++ rc = vfs_mknod(lower_dir_dentry->d_inode, lower_dentry, mode, dev, NULL);
+ if (rc || !lower_dentry->d_inode)
+ goto out;
+ rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0);
+--- linux-2.6.20/fs/exec.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/exec.c 2007-02-06 03:05:22 +0100
+@@ -50,6 +50,7 @@
+ #include <linux/tsacct_kern.h>
#include <linux/cn_proc.h>
#include <linux/audit.h>
+#include <linux/vs_memory.h>
-+#include <linux/vs_cvirt.h>
#include <asm/uaccess.h>
#include <asm/mmu_context.h>
-@@ -436,7 +438,8 @@ int setup_arg_pages(struct linux_binprm
+@@ -437,7 +438,8 @@ int setup_arg_pages(struct linux_binprm
kmem_cache_free(vm_area_cachep, mpnt);
return ret;
}
@@ -2397,38 +2972,38 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-@@ -1322,7 +1325,7 @@ static void format_corename(char *corena
- case 'h':
- down_read(&uts_sem);
+@@ -1307,7 +1309,7 @@ static void format_corename(char *corena
+ /* UNIX time of coredump */
+ case 't': {
+ struct timeval tv;
+- do_gettimeofday(&tv);
++ vx_gettimeofday(&tv);
rc = snprintf(out_ptr, out_end - out_ptr,
-- "%s", system_utsname.nodename);
-+ "%s", vx_new_uts(nodename));
- up_read(&uts_sem);
+ "%lu", tv.tv_sec);
if (rc > out_end - out_ptr)
- goto out;
---- linux-2.6.18.5/fs/ext2/balloc.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext2/balloc.c 2006-10-16 19:05:41 +0200
-@@ -16,6 +16,7 @@
+--- linux-2.6.20/fs/ext2/balloc.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext2/balloc.c 2007-02-06 03:05:22 +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
-@@ -102,12 +103,14 @@ static int reserve_blocks(struct super_b
+@@ -102,12 +104,13 @@ static int reserve_blocks(struct super_b
{
struct ext2_sb_info *sbi = EXT2_SB(sb);
struct ext2_super_block *es = sbi->s_es;
- unsigned free_blocks;
- unsigned root_blocks;
-+ unsigned long free_blocks;
-+ unsigned long root_blocks;
++ unsigned long long free_blocks, root_blocks;
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
root_blocks = le32_to_cpu(es->s_r_blocks_count);
-+ DLIMIT_ADJUST_BLOCK(sb, vx_current_xid(), &free_blocks, &root_blocks);
++ DLIMIT_ADJUST_BLOCK(sb, dx_current_tag(), &free_blocks, &root_blocks);
+
if (free_blocks < count)
count = free_blocks;
@@ -2461,9 +3036,9 @@
release_blocks(sb, es_alloc);
out_dquot:
DQUOT_FREE_BLOCK(inode, dq_alloc);
---- linux-2.6.18.5/fs/ext2/ext2.h 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext2/ext2.h 2006-09-20 19:55:12 +0200
-@@ -165,6 +165,7 @@ extern const struct file_operations ext2
+--- linux-2.6.20/fs/ext2/ext2.h 2006-11-30 21:19:19 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext2/ext2.h 2007-02-06 03:05:22 +0100
+@@ -166,6 +166,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;
@@ -2471,22 +3046,30 @@
/* namei.c */
extern struct inode_operations ext2_dir_inode_operations;
---- linux-2.6.18.5/fs/ext2/file.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext2/file.c 2006-09-20 17:01:44 +0200
-@@ -81,4 +81,5 @@ struct inode_operations ext2_file_inode_
+--- linux-2.6.20/fs/ext2/file.c 2006-11-30 21:19:19 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext2/file.c 2007-02-06 03:05:22 +0100
+@@ -54,6 +54,7 @@ const struct file_operations ext2_file_o
+ .release = ext2_release_file,
+ .fsync = ext2_sync_file,
+ .sendfile = generic_file_sendfile,
++ .sendpage = generic_file_sendpage,
+ .splice_read = generic_file_splice_read,
+ .splice_write = generic_file_splice_write,
+ };
+@@ -85,4 +86,5 @@ struct inode_operations ext2_file_inode_
#endif
.setattr = ext2_setattr,
.permission = ext2_permission,
+ .sync_flags = ext2_sync_flags,
};
---- linux-2.6.18.5/fs/ext2/ialloc.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext2/ialloc.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/fs/ext2/ialloc.c 2006-11-30 21:19:19 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext2/ialloc.c 2007-02-06 03:05:22 +0100
@@ -17,6 +17,8 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
#include <linux/random.h>
+#include <linux/vs_dlimit.h>
-+#include <linux/vserver/xid.h>
++#include <linux/vs_tag.h>
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
@@ -2502,7 +3085,7 @@
if (!inode)
return ERR_PTR(-ENOMEM);
-+ inode->i_xid = vx_current_fsxid(sb);
++ inode->i_tag = dx_current_fstag(sb);
+ if (DLIMIT_ALLOC_INODE(inode)) {
+ err = -ENOSPC;
+ goto fail_dlim;
@@ -2510,7 +3093,7 @@
ei = EXT2_I(inode);
sbi = EXT2_SB(sb);
es = sbi->s_es;
-@@ -578,7 +586,8 @@ got:
+@@ -577,7 +585,8 @@ got:
inode->i_blocks = 0;
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
memset(ei->i_data, 0, sizeof(ei->i_data));
@@ -2520,7 +3103,7 @@
if (S_ISLNK(mode))
ei->i_flags &= ~(EXT2_IMMUTABLE_FL|EXT2_APPEND_FL);
/* dirsync is only applied to directories */
-@@ -626,12 +635,15 @@ fail_free_drop:
+@@ -625,12 +634,15 @@ fail_free_drop:
fail_drop:
DQUOT_DROP(inode);
@@ -2536,13 +3119,13 @@
make_bad_inode(inode);
iput(inode);
return ERR_PTR(err);
---- linux-2.6.18.5/fs/ext2/inode.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext2/inode.c 2006-11-06 05:08:58 +0100
+--- linux-2.6.20/fs/ext2/inode.c 2006-11-30 21:19:19 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext2/inode.c 2007-02-06 03:05:22 +0100
@@ -31,6 +31,7 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
#include <linux/mpage.h>
-+#include <linux/vserver/xid.h>
++#include <linux/vs_tag.h>
#include "ext2.h"
#include "acl.h"
#include "xip.h"
@@ -2555,7 +3138,7 @@
return;
ext2_discard_prealloc(inode);
-@@ -1042,25 +1043,70 @@ void ext2_set_inode_flags(struct inode *
+@@ -1042,25 +1043,57 @@ void ext2_set_inode_flags(struct inode *
{
unsigned int flags = EXT2_I(inode)->i_flags;
@@ -2587,13 +3170,9 @@
+ unsigned int oldflags, newflags;
+
+ oldflags = EXT2_I(inode)->i_flags;
-+ newflags = oldflags & ~(EXT2_APPEND_FL |
-+ EXT2_IMMUTABLE_FL | EXT2_IUNLINK_FL |
-+ EXT2_BARRIER_FL | EXT2_NOATIME_FL |
-+ EXT2_SYNC_FL | EXT2_DIRSYNC_FL);
++ newflags = oldflags & ~(EXT2_IMMUTABLE_FL |
++ EXT2_IUNLINK_FL | EXT2_BARRIER_FL);
+
-+ if (IS_APPEND(inode))
-+ newflags |= EXT2_APPEND_FL;
+ if (IS_IMMUTABLE(inode))
+ newflags |= EXT2_IMMUTABLE_FL;
+ if (IS_IUNLINK(inode))
@@ -2601,20 +3180,11 @@
+ if (IS_BARRIER(inode))
+ newflags |= EXT2_BARRIER_FL;
+
-+ /* we do not want to copy superblock flags */
-+ if (inode->i_flags & S_NOATIME)
-+ newflags |= EXT2_NOATIME_FL;
-+ if (inode->i_flags & S_SYNC)
-+ newflags |= EXT2_SYNC_FL;
-+ if (inode->i_flags & S_DIRSYNC)
-+ newflags |= EXT2_DIRSYNC_FL;
-+
+ if (oldflags ^ newflags) {
+ EXT2_I(inode)->i_flags = newflags;
+ inode->i_ctime = CURRENT_TIME;
+ mark_inode_dirty(inode);
+ }
-+
+ return 0;
+}
+
@@ -2629,7 +3199,7 @@
int n;
#ifdef CONFIG_EXT2_FS_POSIX_ACL
-@@ -1071,12 +1117,17 @@ void ext2_read_inode (struct inode * ino
+@@ -1071,12 +1104,17 @@ void ext2_read_inode (struct inode * ino
goto bad_inode;
inode->i_mode = le16_to_cpu(raw_inode->i_mode);
@@ -2643,56 +3213,56 @@
+ uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+ gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
}
-+ inode->i_uid = INOXID_UID(XID_TAG(inode), uid, gid);
-+ inode->i_gid = INOXID_GID(XID_TAG(inode), uid, gid);
-+ inode->i_xid = INOXID_XID(XID_TAG(inode), uid, gid,
-+ le16_to_cpu(raw_inode->i_raw_xid));
++ 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));
+
inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
inode->i_size = le32_to_cpu(raw_inode->i_size);
inode->i_atime.tv_sec = le32_to_cpu(raw_inode->i_atime);
-@@ -1174,8 +1225,8 @@ static int ext2_update_inode(struct inod
+@@ -1173,8 +1211,8 @@ static int ext2_update_inode(struct inod
struct ext2_inode_info *ei = EXT2_I(inode);
struct super_block *sb = inode->i_sb;
ino_t ino = inode->i_ino;
- uid_t uid = inode->i_uid;
- gid_t gid = inode->i_gid;
-+ uid_t uid = XIDINO_UID(XID_TAG(inode), inode->i_uid, inode->i_xid);
-+ gid_t gid = XIDINO_GID(XID_TAG(inode), inode->i_gid, inode->i_xid);
++ 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);
struct buffer_head * bh;
struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh);
int n;
-@@ -1210,6 +1261,9 @@ static int ext2_update_inode(struct inod
+@@ -1209,6 +1247,9 @@ static int ext2_update_inode(struct inod
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
-+#ifdef CONFIG_INOXID_INTERN
-+ raw_inode->i_raw_xid = cpu_to_le16(inode->i_xid);
++#ifdef CONFIG_TAGGING_INTERN
++ raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
+#endif
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);
-@@ -1296,7 +1350,8 @@ int ext2_setattr(struct dentry *dentry,
+@@ -1295,7 +1336,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_XID && iattr->ia_xid != inode->i_xid)) {
++ (iattr->ia_valid & ATTR_TAG && iattr->ia_tag != inode->i_tag)) {
error = DQUOT_TRANSFER(inode, iattr) ? -EDQUOT : 0;
if (error)
return error;
---- linux-2.6.18.5/fs/ext2/ioctl.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext2/ioctl.c 2006-09-20 17:01:44 +0200
-@@ -11,6 +11,7 @@
- #include <linux/capability.h>
- #include <linux/time.h>
+--- linux-2.6.20/fs/ext2/ioctl.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext2/ioctl.c 2007-02-06 03:13:14 +0100
+@@ -13,6 +13,7 @@
#include <linux/sched.h>
+ #include <linux/compat.h>
+ #include <linux/smp_lock.h>
+#include <linux/mount.h>
#include <asm/current.h>
#include <asm/uaccess.h>
-@@ -30,7 +31,8 @@ int ext2_ioctl (struct inode * inode, st
+@@ -32,7 +33,8 @@ int ext2_ioctl (struct inode * inode, st
case EXT2_IOC_SETFLAGS: {
unsigned int oldflags;
@@ -2702,7 +3272,7 @@
return -EROFS;
if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
-@@ -50,7 +52,9 @@ int ext2_ioctl (struct inode * inode, st
+@@ -53,7 +55,9 @@ int ext2_ioctl (struct inode * inode, st
*
* This test looks nicer. Thanks to Pauline Middelink
*/
@@ -2710,10 +3280,10 @@
+ if ((oldflags & EXT2_IMMUTABLE_FL) ||
+ ((flags ^ oldflags) & (EXT2_APPEND_FL |
+ EXT2_IMMUTABLE_FL | EXT2_IUNLINK_FL))) {
- if (!capable(CAP_LINUX_IMMUTABLE))
+ if (!capable(CAP_LINUX_IMMUTABLE)) {
+ mutex_unlock(&inode->i_mutex);
return -EPERM;
- }
-@@ -69,7 +73,8 @@ int ext2_ioctl (struct inode * inode, st
+@@ -75,7 +79,8 @@ int ext2_ioctl (struct inode * inode, st
case EXT2_IOC_SETVERSION:
if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
return -EPERM;
@@ -2723,13 +3293,13 @@
return -EROFS;
if (get_user(inode->i_generation, (int __user *) arg))
return -EFAULT;
---- linux-2.6.18.5/fs/ext2/namei.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext2/namei.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/fs/ext2/namei.c 2006-11-30 21:19:19 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext2/namei.c 2007-02-06 03:05:22 +0100
@@ -31,6 +31,7 @@
*/
#include <linux/pagemap.h>
-+#include <linux/vserver/xid.h>
++#include <linux/vs_tag.h>
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
@@ -2737,7 +3307,7 @@
inode = iget(dir->i_sb, ino);
if (!inode)
return ERR_PTR(-EACCES);
-+ vx_propagate_xid(nd, inode);
++ dx_propagate_tag(nd, inode);
}
return d_splice_alias(inode, dentry);
}
@@ -2755,53 +3325,65 @@
.permission = ext2_permission,
+ .sync_flags = ext2_sync_flags,
};
---- linux-2.6.18.5/fs/ext2/super.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext2/super.c 2006-09-20 17:01:44 +0200
-@@ -325,7 +325,7 @@ enum {
+--- linux-2.6.20/fs/ext2/super.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext2/super.c 2007-02-06 03:05:22 +0100
+@@ -324,7 +324,7 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
Opt_acl, Opt_noacl, Opt_xip, Opt_ignore, Opt_err, Opt_quota,
- Opt_usrquota, Opt_grpquota
-+ Opt_usrquota, Opt_grpquota, Opt_tagxid
++ Opt_usrquota, Opt_grpquota, Opt_tag, Opt_notag, Opt_tagid
};
static match_table_t tokens = {
-@@ -353,6 +353,7 @@ static match_table_t tokens = {
+@@ -352,6 +352,10 @@ static match_table_t tokens = {
{Opt_acl, "acl"},
{Opt_noacl, "noacl"},
{Opt_xip, "xip"},
-+ {Opt_tagxid, "tagxid"},
++ {Opt_tag, "tag"},
++ {Opt_notag, "notag"},
++ {Opt_tagid, "tagid=%u"},
++ {Opt_tag, "tagxid"},
{Opt_grpquota, "grpquota"},
{Opt_ignore, "noquota"},
{Opt_quota, "quota"},
-@@ -416,6 +417,11 @@ static int parse_options (char * options
+@@ -420,6 +424,20 @@ static int parse_options (char * options
case Opt_nouid32:
set_opt (sbi->s_mount_opt, NO_UID32);
break;
-+#ifndef CONFIG_INOXID_NONE
-+ case Opt_tagxid:
-+ set_opt (sbi->s_mount_opt, TAGXID);
++#ifndef CONFIG_TAGGING_NONE
++ case Opt_tag:
++ set_opt (sbi->s_mount_opt, TAGGED);
++ break;
++ case Opt_notag:
++ clear_opt (sbi->s_mount_opt, TAGGED);
++ break;
++#endif
++#ifdef CONFIG_PROPAGATE
++ case Opt_tagid:
++ /* use args[0] */
++ set_opt (sbi->s_mount_opt, TAGGED);
+ break;
+#endif
case Opt_nocheck:
clear_opt (sbi->s_mount_opt, CHECK);
break;
-@@ -717,6 +723,8 @@ static int ext2_fill_super(struct super_
+@@ -726,6 +744,8 @@ static int ext2_fill_super(struct super_
if (!parse_options ((char *) data, sbi))
goto failed_mount;
-+ if (EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_TAGXID)
-+ sb->s_flags |= MS_TAGXID;
++ if (EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_TAGGED)
++ sb->s_flags |= MS_TAGGED;
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
MS_POSIXACL : 0);
-@@ -1026,6 +1034,13 @@ static int ext2_remount (struct super_bl
+@@ -1034,6 +1054,13 @@ static int ext2_remount (struct super_bl
goto restore_opts;
}
-+ if ((sbi->s_mount_opt & EXT2_MOUNT_TAGXID) &&
-+ !(sb->s_flags & MS_TAGXID)) {
-+ printk("EXT2-fs: %s: tagxid not permitted on remount.\n",
++ if ((sbi->s_mount_opt & EXT2_MOUNT_TAGGED) &&
++ !(sb->s_flags & MS_TAGGED)) {
++ printk("EXT2-fs: %s: tagging not permitted on remount.\n",
+ sb->s_id);
+ return -EINVAL;
+ }
@@ -2809,8 +3391,8 @@
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
---- linux-2.6.18.5/fs/ext2/symlink.c 2005-08-29 22:25:30 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext2/symlink.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/fs/ext2/symlink.c 2005-08-29 22:25:30 +0200
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext2/symlink.c 2007-02-06 03:05:22 +0100
@@ -38,6 +38,7 @@ struct inode_operations ext2_symlink_ino
.listxattr = ext2_listxattr,
.removexattr = generic_removexattr,
@@ -2825,8 +3407,8 @@
#endif
+ .sync_flags = ext2_sync_flags,
};
---- linux-2.6.18.5/fs/ext2/xattr.c 2006-02-18 14:40:21 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext2/xattr.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/fs/ext2/xattr.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext2/xattr.c 2007-02-06 03:05:22 +0100
@@ -60,6 +60,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
@@ -2835,7 +3417,7 @@
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
-@@ -645,8 +646,12 @@ ext2_xattr_set2(struct inode *inode, str
+@@ -641,8 +642,12 @@ ext2_xattr_set2(struct inode *inode, str
the inode. */
ea_bdebug(new_bh, "reusing block");
@@ -2848,7 +3430,7 @@
unlock_buffer(new_bh);
goto cleanup;
}
-@@ -740,6 +745,7 @@ ext2_xattr_set2(struct inode *inode, str
+@@ -736,6 +741,7 @@ ext2_xattr_set2(struct inode *inode, str
le32_to_cpu(HDR(old_bh)->h_refcount) - 1);
if (ce)
mb_cache_entry_release(ce);
@@ -2856,7 +3438,7 @@
DQUOT_FREE_BLOCK(inode, 1);
mark_buffer_dirty(old_bh);
ea_bdebug(old_bh, "refcount now=%d",
-@@ -804,6 +810,7 @@ ext2_xattr_delete_inode(struct inode *in
+@@ -800,6 +806,7 @@ ext2_xattr_delete_inode(struct inode *in
mark_buffer_dirty(bh);
if (IS_SYNC(inode))
sync_dirty_buffer(bh);
@@ -2864,17 +3446,18 @@
DQUOT_FREE_BLOCK(inode, 1);
}
EXT2_I(inode)->i_file_acl = 0;
---- linux-2.6.18.5/fs/ext3/balloc.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext3/balloc.c 2006-10-16 19:06:32 +0200
-@@ -19,6 +19,7 @@
+--- linux-2.6.20/fs/ext3/balloc.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext3/balloc.c 2007-02-06 03:05:22 +0100
+@@ -19,6 +19,8 @@
#include <linux/ext3_jbd.h>
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
+#include <linux/vs_dlimit.h>
++#include <linux/vs_tag.h>
/*
* balloc.c contains the blocks allocation and deallocation routines
-@@ -503,8 +504,10 @@ void ext3_free_blocks(handle_t *handle,
+@@ -613,8 +615,10 @@ void ext3_free_blocks(handle_t *handle,
return;
}
ext3_free_blocks_sb(handle, sb, block, count, &dquot_freed_blocks);
@@ -2886,39 +3469,39 @@
return;
}
-@@ -1161,18 +1164,33 @@ out:
- return ret;
- }
-
+@@ -1353,18 +1357,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);
- ext3_fsblk_t free_blocks, root_blocks;
++ 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) &&
-- sbi->s_resuid != current->fsuid &&
-- (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
-- return 0;
-- }
-- return 1;
+
+ vxdprintk(VXD_CBIT(dlim, 3),
-+ "ext3_has_free_blocks(%p): free=%lu, root=%lu",
++ "ext3_has_free_blocks(%p): free=%llu, root=%llu",
+ sb, free_blocks, root_blocks);
+
-+ DLIMIT_ADJUST_BLOCK(sb, vx_current_xid(), &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_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): %lu<%lu+1, %c, %u!=%u r=%d",
++ "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);
@@ -2926,8 +3509,8 @@
+ return (cond ? 0 : 1);
}
- /*
-@@ -1183,7 +1201,7 @@ static int ext3_has_free_blocks(struct e
+ /**
+@@ -1381,7 +1400,7 @@ static int ext3_has_free_blocks(struct e
*/
int ext3_should_retry_alloc(struct super_block *sb, int *retries)
{
@@ -2936,7 +3519,7 @@
return 0;
jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);
-@@ -1240,6 +1258,8 @@ ext3_fsblk_t ext3_new_blocks(handle_t *h
+@@ -1444,6 +1463,8 @@ ext3_fsblk_t ext3_new_blocks(handle_t *h
*errp = -EDQUOT;
return 0;
}
@@ -2945,7 +3528,7 @@
sbi = EXT3_SB(sb);
es = EXT3_SB(sb)->s_es;
-@@ -1256,7 +1276,7 @@ ext3_fsblk_t ext3_new_blocks(handle_t *h
+@@ -1460,7 +1481,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;
@@ -2954,7 +3537,7 @@
*errp = -ENOSPC;
goto out;
}
-@@ -1450,6 +1470,9 @@ allocated:
+@@ -1653,6 +1674,9 @@ allocated:
io_error:
*errp = -EIO;
out:
@@ -2964,23 +3547,31 @@
if (fatal) {
*errp = fatal;
ext3_std_error(sb, fatal);
---- linux-2.6.18.5/fs/ext3/file.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext3/file.c 2006-09-20 17:01:44 +0200
-@@ -133,5 +133,6 @@ struct inode_operations ext3_file_inode_
+--- linux-2.6.20/fs/ext3/file.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext3/file.c 2007-02-06 03:05:22 +0100
+@@ -121,6 +121,7 @@ const struct file_operations ext3_file_o
+ .release = ext3_release_file,
+ .fsync = ext3_sync_file,
+ .sendfile = generic_file_sendfile,
++ .sendpage = generic_file_sendpage,
+ .splice_read = generic_file_splice_read,
+ .splice_write = generic_file_splice_write,
+ };
+@@ -135,5 +136,6 @@ struct inode_operations ext3_file_inode_
.removexattr = generic_removexattr,
#endif
.permission = ext3_permission,
+ .sync_flags = ext3_sync_flags,
};
---- linux-2.6.18.5/fs/ext3/ialloc.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext3/ialloc.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/fs/ext3/ialloc.c 2006-11-30 21:19:19 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext3/ialloc.c 2007-02-06 03:05:22 +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/vserver/xid.h>
++#include <linux/vs_tag.h>
#include <asm/byteorder.h>
@@ -2997,7 +3588,7 @@
if (!inode)
return ERR_PTR(-ENOMEM);
+
-+ inode->i_xid = vx_current_fsxid(sb);
++ inode->i_tag = dx_current_fstag(sb);
+ if (DLIMIT_ALLOC_INODE(inode)) {
+ err = -ENOSPC;
+ goto out_dlimit;
@@ -3005,7 +3596,7 @@
ei = EXT3_I(inode);
sbi = EXT3_SB(sb);
-@@ -567,7 +576,8 @@ got:
+@@ -566,7 +575,8 @@ got:
ei->i_dir_start_lookup = 0;
ei->i_disksize = 0;
@@ -3015,7 +3606,7 @@
if (S_ISLNK(mode))
ei->i_flags &= ~(EXT3_IMMUTABLE_FL|EXT3_APPEND_FL);
/* dirsync only applies to directories */
-@@ -622,6 +632,8 @@ got:
+@@ -621,6 +631,8 @@ got:
fail:
ext3_std_error(sb, err);
out:
@@ -3024,7 +3615,7 @@
iput(inode);
ret = ERR_PTR(err);
really_out:
-@@ -633,6 +645,7 @@ fail_free_drop:
+@@ -632,6 +644,7 @@ fail_free_drop:
fail_drop:
DQUOT_DROP(inode);
@@ -3032,17 +3623,17 @@
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
iput(inode);
---- linux-2.6.18.5/fs/ext3/inode.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext3/inode.c 2006-11-06 05:08:58 +0100
-@@ -36,6 +36,7 @@
- #include <linux/writeback.h>
+--- linux-2.6.20/fs/ext3/inode.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext3/inode.c 2007-02-06 03:05:22 +0100
+@@ -37,6 +37,7 @@
#include <linux/mpage.h>
#include <linux/uio.h>
-+#include <linux/vserver/xid.h>
+ #include <linux/bio.h>
++#include <linux/vs_tag.h>
#include "xattr.h"
#include "acl.h"
-@@ -2245,7 +2246,7 @@ void ext3_truncate(struct inode *inode)
+@@ -2311,7 +2312,7 @@ void ext3_truncate(struct inode *inode)
return;
if (ext3_inode_is_fast_symlink(inode))
return;
@@ -3051,7 +3642,7 @@
return;
/*
-@@ -2567,19 +2568,77 @@ void ext3_set_inode_flags(struct inode *
+@@ -2633,19 +2634,65 @@ void ext3_set_inode_flags(struct inode *
{
unsigned int flags = EXT3_I(inode)->i_flags;
@@ -3084,13 +3675,9 @@
+ int err = 0;
+
+ oldflags = EXT3_I(inode)->i_flags;
-+ newflags = oldflags & ~(EXT3_APPEND_FL |
-+ EXT3_IMMUTABLE_FL | EXT3_IUNLINK_FL |
-+ EXT3_BARRIER_FL | EXT3_NOATIME_FL |
-+ EXT3_SYNC_FL | EXT3_DIRSYNC_FL);
++ newflags = oldflags & ~(EXT3_IMMUTABLE_FL |
++ EXT3_IUNLINK_FL | EXT3_BARRIER_FL);
+
-+ if (IS_APPEND(inode))
-+ newflags |= EXT3_APPEND_FL;
+ if (IS_IMMUTABLE(inode))
+ newflags |= EXT3_IMMUTABLE_FL;
+ if (IS_IUNLINK(inode))
@@ -3098,14 +3685,6 @@
+ if (IS_BARRIER(inode))
+ newflags |= EXT3_BARRIER_FL;
+
-+ /* we do not want to copy superblock flags */
-+ if (inode->i_flags & S_NOATIME)
-+ newflags |= EXT3_NOATIME_FL;
-+ if (inode->i_flags & S_SYNC)
-+ newflags |= EXT3_SYNC_FL;
-+ if (inode->i_flags & S_DIRSYNC)
-+ newflags |= EXT3_DIRSYNC_FL;
-+
+ if (oldflags ^ newflags) {
+ handle_t *handle;
+ struct ext3_iloc iloc;
@@ -3132,7 +3711,7 @@
void ext3_read_inode(struct inode * inode)
{
struct ext3_iloc iloc;
-@@ -2587,6 +2646,8 @@ void ext3_read_inode(struct inode * inod
+@@ -2653,6 +2700,8 @@ void ext3_read_inode(struct inode * inod
struct ext3_inode_info *ei = EXT3_I(inode);
struct buffer_head *bh;
int block;
@@ -3141,7 +3720,7 @@
#ifdef CONFIG_EXT3_FS_POSIX_ACL
ei->i_acl = EXT3_ACL_NOT_CACHED;
-@@ -2599,12 +2660,17 @@ void ext3_read_inode(struct inode * inod
+@@ -2665,12 +2714,17 @@ void ext3_read_inode(struct inode * inod
bh = iloc.bh;
raw_inode = ext3_raw_inode(&iloc);
inode->i_mode = le16_to_cpu(raw_inode->i_mode);
@@ -3155,24 +3734,24 @@
+ uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+ gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
}
-+ inode->i_uid = INOXID_UID(XID_TAG(inode), uid, gid);
-+ inode->i_gid = INOXID_GID(XID_TAG(inode), uid, gid);
-+ inode->i_xid = INOXID_XID(XID_TAG(inode), uid, gid,
-+ le16_to_cpu(raw_inode->i_raw_xid));
++ 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));
+
inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
inode->i_size = le32_to_cpu(raw_inode->i_size);
inode->i_atime.tv_sec = le32_to_cpu(raw_inode->i_atime);
-@@ -2731,6 +2797,8 @@ static int ext3_do_update_inode(handle_t
+@@ -2794,6 +2848,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;
-+ uid_t uid = XIDINO_UID(XID_TAG(inode), inode->i_uid, inode->i_xid);
-+ gid_t gid = XIDINO_GID(XID_TAG(inode), inode->i_gid, inode->i_xid);
++ 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);
int err = 0, rc, block;
/* For fields not not tracking in the in-memory inode,
-@@ -2740,29 +2808,32 @@ static int ext3_do_update_inode(handle_t
+@@ -2803,29 +2859,32 @@ static int ext3_do_update_inode(handle_t
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
if(!(test_opt(inode->i_sb, NO_UID32))) {
@@ -3205,34 +3784,34 @@
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
-+#ifdef CONFIG_INOXID_INTERN
-+ raw_inode->i_raw_xid = cpu_to_le16(inode->i_xid);
++#ifdef CONFIG_TAGGING_INTERN
++ raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
+#endif
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);
-@@ -2915,7 +2986,8 @@ int ext3_setattr(struct dentry *dentry,
+@@ -2978,7 +3037,8 @@ int ext3_setattr(struct dentry *dentry,
return 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_XID && attr->ia_xid != inode->i_xid)) {
++ (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) {
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -2937,6 +3009,8 @@ int ext3_setattr(struct dentry *dentry,
+@@ -3000,6 +3060,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;
-+ if ((attr->ia_valid & ATTR_XID) && IS_TAGXID(inode))
-+ inode->i_xid = attr->ia_xid;
++ if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode))
++ inode->i_tag = attr->ia_tag;
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
---- linux-2.6.18.5/fs/ext3/ioctl.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext3/ioctl.c 2006-09-20 17:01:44 +0200
-@@ -8,11 +8,13 @@
+--- linux-2.6.20/fs/ext3/ioctl.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext3/ioctl.c 2007-02-06 03:05:22 +0100
+@@ -8,6 +8,7 @@
*/
#include <linux/fs.h>
@@ -3240,13 +3819,15 @@
#include <linux/jbd.h>
#include <linux/capability.h>
#include <linux/ext3_fs.h>
- #include <linux/ext3_jbd.h>
+@@ -15,6 +16,7 @@
#include <linux/time.h>
-+#include <linux/vserver/xid.h>
+ #include <linux/compat.h>
+ #include <linux/smp_lock.h>
++#include <linux/vs_tag.h>
#include <asm/uaccess.h>
-
-@@ -36,7 +38,8 @@ int ext3_ioctl (struct inode * inode, st
+ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
+@@ -37,7 +39,8 @@ int ext3_ioctl (struct inode * inode, st
unsigned int oldflags;
unsigned int jflag;
@@ -3256,7 +3837,7 @@
return -EROFS;
if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
-@@ -60,7 +63,9 @@ int ext3_ioctl (struct inode * inode, st
+@@ -61,7 +64,9 @@ int ext3_ioctl (struct inode * inode, st
*
* This test looks nicer. Thanks to Pauline Middelink
*/
@@ -3267,7 +3848,7 @@
if (!capable(CAP_LINUX_IMMUTABLE)) {
mutex_unlock(&inode->i_mutex);
return -EPERM;
-@@ -122,7 +127,8 @@ flags_err:
+@@ -123,7 +128,8 @@ flags_err:
if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
return -EPERM;
@@ -3277,7 +3858,7 @@
return -EROFS;
if (get_user(generation, (int __user *) arg))
return -EFAULT;
-@@ -176,7 +182,8 @@ flags_err:
+@@ -177,7 +183,8 @@ flags_err:
if (!test_opt(inode->i_sb, RESERVATION) ||!S_ISREG(inode->i_mode))
return -ENOTTY;
@@ -3287,7 +3868,7 @@
return -EROFS;
if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
-@@ -211,7 +218,8 @@ flags_err:
+@@ -212,7 +219,8 @@ flags_err:
if (!capable(CAP_SYS_RESOURCE))
return -EPERM;
@@ -3297,7 +3878,7 @@
return -EROFS;
if (get_user(n_blocks_count, (__u32 __user *)arg))
-@@ -232,7 +240,8 @@ flags_err:
+@@ -233,7 +241,8 @@ flags_err:
if (!capable(CAP_SYS_RESOURCE))
return -EPERM;
@@ -3307,15 +3888,15 @@
return -EROFS;
if (copy_from_user(&input, (struct ext3_new_group_input __user *)arg,
-@@ -247,6 +256,38 @@ flags_err:
+@@ -248,6 +257,38 @@ flags_err:
return err;
}
-+#if defined(CONFIG_VSERVER_LEGACY) && !defined(CONFIG_INOXID_NONE)
-+ case EXT3_IOC_SETXID: {
++#if defined(CONFIG_VSERVER_LEGACY) && !defined(CONFIG_TAGGING_NONE)
++ case EXT3_IOC_SETTAG: {
+ handle_t *handle;
+ struct ext3_iloc iloc;
-+ int xid;
++ int tag;
+ int err;
+
+ /* fixme: if stealth, return -ENOTTY */
@@ -3323,9 +3904,9 @@
+ return -EPERM;
+ if (IS_RDONLY(inode))
+ return -EROFS;
-+ if (!(inode->i_sb->s_flags & MS_TAGXID))
++ if (!(inode->i_sb->s_flags & MS_TAGGED))
+ return -ENOSYS;
-+ if (get_user(xid, (int __user *) arg))
++ if (get_user(tag, (int __user *) arg))
+ return -EFAULT;
+
+ handle = ext3_journal_start(inode, 1);
@@ -3335,7 +3916,7 @@
+ if (err)
+ return err;
+
-+ inode->i_xid = (xid & 0xFFFF);
++ inode->i_tag = (tag & 0xFFFF);
+ inode->i_ctime = CURRENT_TIME;
+
+ err = ext3_mark_iloc_dirty(handle, inode, &iloc);
@@ -3346,25 +3927,25 @@
default:
return -ENOTTY;
---- linux-2.6.18.5/fs/ext3/namei.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext3/namei.c 2006-09-20 17:01:44 +0200
-@@ -36,6 +36,7 @@
- #include <linux/quotaops.h>
+--- linux-2.6.20/fs/ext3/namei.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext3/namei.c 2007-02-06 03:05:22 +0100
+@@ -37,6 +37,7 @@
#include <linux/buffer_head.h>
+ #include <linux/bio.h>
#include <linux/smp_lock.h>
-+#include <linux/vserver/xid.h>
++#include <linux/vs_tag.h>
#include "namei.h"
#include "xattr.h"
-@@ -1009,6 +1010,7 @@ static struct dentry *ext3_lookup(struct
+@@ -1019,6 +1020,7 @@ static struct dentry *ext3_lookup(struct
if (!inode)
return ERR_PTR(-EACCES);
-+ vx_propagate_xid(nd, inode);
++ dx_propagate_tag(nd, inode);
}
return d_splice_alias(inode, dentry);
}
-@@ -2382,6 +2384,7 @@ struct inode_operations ext3_dir_inode_o
+@@ -2392,6 +2394,7 @@ struct inode_operations ext3_dir_inode_o
.removexattr = generic_removexattr,
#endif
.permission = ext3_permission,
@@ -3372,68 +3953,80 @@
};
struct inode_operations ext3_special_inode_operations = {
-@@ -2393,4 +2396,5 @@ struct inode_operations ext3_special_ino
+@@ -2403,4 +2406,5 @@ struct inode_operations ext3_special_ino
.removexattr = generic_removexattr,
#endif
.permission = ext3_permission,
+ .sync_flags = ext3_sync_flags,
- };
---- linux-2.6.18.5/fs/ext3/super.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext3/super.c 2006-09-20 17:01:44 +0200
+ };
+--- linux-2.6.20/fs/ext3/super.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext3/super.c 2007-02-06 03:05:22 +0100
@@ -677,7 +677,7 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
- Opt_grpquota
-+ Opt_grpquota, Opt_tagxid
++ Opt_grpquota, Opt_tag, Opt_notag, Opt_tagid
};
static match_table_t tokens = {
-@@ -727,6 +727,7 @@ static match_table_t tokens = {
+@@ -727,6 +727,10 @@ static match_table_t tokens = {
{Opt_quota, "quota"},
{Opt_usrquota, "usrquota"},
{Opt_barrier, "barrier=%u"},
-+ {Opt_tagxid, "tagxid"},
++ {Opt_tag, "tag"},
++ {Opt_notag, "notag"},
++ {Opt_tagid, "tagid=%u"},
++ {Opt_tag, "tagxid"},
{Opt_err, NULL},
{Opt_resize, "resize"},
};
-@@ -820,6 +821,11 @@ static int parse_options (char *options,
+@@ -820,6 +824,20 @@ static int parse_options (char *options,
case Opt_nouid32:
set_opt (sbi->s_mount_opt, NO_UID32);
break;
-+#ifndef CONFIG_INOXID_NONE
-+ case Opt_tagxid:
-+ set_opt (sbi->s_mount_opt, TAGXID);
++#ifndef CONFIG_TAGGING_NONE
++ case Opt_tag:
++ set_opt (sbi->s_mount_opt, TAGGED);
++ break;
++ case Opt_notag:
++ clear_opt (sbi->s_mount_opt, TAGGED);
++ break;
++#endif
++#ifdef CONFIG_PROPAGATE
++ case Opt_tagid:
++ /* use args[0] */
++ set_opt (sbi->s_mount_opt, TAGGED);
+ break;
+#endif
case Opt_nocheck:
clear_opt (sbi->s_mount_opt, CHECK);
break;
-@@ -1476,6 +1482,9 @@ static int ext3_fill_super (struct super
+@@ -1486,6 +1504,9 @@ static int ext3_fill_super (struct super
NULL, 0))
goto failed_mount;
-+ if (EXT3_SB(sb)->s_mount_opt & EXT3_MOUNT_TAGXID)
-+ sb->s_flags |= MS_TAGXID;
++ if (EXT3_SB(sb)->s_mount_opt & EXT3_MOUNT_TAGGED)
++ sb->s_flags |= MS_TAGGED;
+
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -2291,6 +2300,12 @@ static int ext3_remount (struct super_bl
+@@ -2301,6 +2322,12 @@ static int ext3_remount (struct super_bl
if (sbi->s_mount_opt & EXT3_MOUNT_ABORT)
ext3_abort(sb, __FUNCTION__, "Abort forced by user");
-+ if ((sbi->s_mount_opt & EXT3_MOUNT_TAGXID) &&
-+ !(sb->s_flags & MS_TAGXID)) {
-+ printk("EXT3-fs: %s: tagxid not permitted on remount.\n",
++ if ((sbi->s_mount_opt & EXT3_MOUNT_TAGGED) &&
++ !(sb->s_flags & MS_TAGGED)) {
++ printk("EXT3-fs: %s: tagging not permitted on remount.\n",
+ sb->s_id);
+ return -EINVAL;
+ }
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
---- linux-2.6.18.5/fs/ext3/symlink.c 2005-08-29 22:25:30 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext3/symlink.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/fs/ext3/symlink.c 2005-08-29 22:25:30 +0200
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext3/symlink.c 2007-02-06 03:05:22 +0100
@@ -40,6 +40,7 @@ struct inode_operations ext3_symlink_ino
.listxattr = ext3_listxattr,
.removexattr = generic_removexattr,
@@ -3448,8 +4041,8 @@
#endif
+ .sync_flags = ext3_sync_flags,
};
---- linux-2.6.18.5/fs/ext3/xattr.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ext3/xattr.c 2006-09-20 17:01:44 +0200
+--- linux-2.6.20/fs/ext3/xattr.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext3/xattr.c 2007-02-06 03:05:22 +0100
@@ -58,6 +58,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
@@ -3458,7 +4051,7 @@
#include "xattr.h"
#include "acl.h"
-@@ -495,6 +496,7 @@ ext3_xattr_release_block(handle_t *handl
+@@ -492,6 +493,7 @@ ext3_xattr_release_block(handle_t *handl
ext3_journal_dirty_metadata(handle, bh);
if (IS_SYNC(inode))
handle->h_sync = 1;
@@ -3466,7 +4059,7 @@
DQUOT_FREE_BLOCK(inode, 1);
unlock_buffer(bh);
ea_bdebug(bh, "refcount now=%d; releasing",
-@@ -763,11 +765,14 @@ inserted:
+@@ -760,11 +762,14 @@ inserted:
if (new_bh == bs->bh)
ea_bdebug(new_bh, "keeping");
else {
@@ -3482,7 +4075,7 @@
error = ext3_journal_get_write_access(handle,
new_bh);
if (error)
-@@ -844,6 +849,8 @@ cleanup:
+@@ -841,6 +846,8 @@ cleanup:
cleanup_dquot:
DQUOT_FREE_BLOCK(inode, 1);
@@ -3491,5864 +4084,8081 @@
goto cleanup;
bad_block:
---- linux-2.6.18.5/fs/fcntl.c 2006-06-18 04:54:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/fcntl.c 2006-09-20 17:01:44 +0200
-@@ -18,6 +18,7 @@
- #include <linux/ptrace.h>
- #include <linux/signal.h>
- #include <linux/rcupdate.h>
-+#include <linux/vs_limit.h>
+--- linux-2.6.20/fs/ext4/balloc.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext4/balloc.c 2007-02-06 03:05:22 +0100
+@@ -19,6 +19,8 @@
+ #include <linux/ext4_jbd2.h>
+ #include <linux/quotaops.h>
+ #include <linux/buffer_head.h>
++#include <linux/vs_dlimit.h>
++#include <linux/vs_tag.h>
- #include <asm/poll.h>
- #include <asm/siginfo.h>
-@@ -85,6 +86,8 @@ repeat:
- error = -EMFILE;
- if (newfd >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
- goto out;
-+ if (!vx_files_avail(1))
-+ goto out;
+ /*
+ * balloc.c contains the blocks allocation and deallocation routines
+@@ -630,8 +632,10 @@ void ext4_free_blocks(handle_t *handle,
+ return;
+ }
+ ext4_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;
+ }
- error = expand_files(files, newfd);
- if (error < 0)
-@@ -125,6 +128,7 @@ static int dupfd(struct file *file, unsi
- FD_SET(fd, fdt->open_fds);
- FD_CLR(fd, fdt->close_on_exec);
- spin_unlock(&files->file_lock);
-+ vx_openfd_inc(fd);
- fd_install(fd, file);
- } else {
- spin_unlock(&files->file_lock);
-@@ -177,6 +181,9 @@ asmlinkage long sys_dup2(unsigned int ol
+@@ -1370,18 +1374,33 @@ out:
+ *
+ * Check if filesystem has at least 1 free block available for allocation.
+ */
+-static int ext4_has_free_blocks(struct ext4_sb_info *sbi)
++static int ext4_has_free_blocks(struct super_block *sb)
+ {
++ struct ext4_sb_info *sbi = EXT4_SB(sb);
+ ext4_fsblk_t free_blocks, root_blocks;
++ int cond;
- if (tofree)
- filp_close(tofree, files);
-+ else
-+ vx_openfd_inc(newfd); /* fd was unused */
+ free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
+ root_blocks = ext4_r_blocks_count(sbi->s_es);
+- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
+
- err = newfd;
- out:
- return err;
-@@ -479,7 +486,7 @@ void send_sigio(struct fown_struct *fown
-
- read_lock(&tasklist_lock);
- if (pid > 0) {
-- p = find_task_by_pid(pid);
-+ p = find_task_by_real_pid(pid);
- if (p) {
- send_sigio_to_task(p, fown, fd, band);
- }
-@@ -514,7 +521,7 @@ int send_sigurg(struct fown_struct *fown
-
- read_lock(&tasklist_lock);
- if (pid > 0) {
-- p = find_task_by_pid(pid);
-+ p = find_task_by_real_pid(pid);
- if (p) {
- send_sigurg_to_task(p, fown);
- }
---- linux-2.6.18.5/fs/file_table.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/file_table.c 2006-09-20 17:01:44 +0200
-@@ -21,6 +21,8 @@
- #include <linux/fsnotify.h>
- #include <linux/sysctl.h>
- #include <linux/percpu_counter.h>
-+#include <linux/vs_limit.h>
-+#include <linux/vs_context.h>
-
- #include <asm/atomic.h>
++ vxdprintk(VXD_CBIT(dlim, 3),
++ "ext4_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),
++ "ext4_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);
+ }
-@@ -120,6 +122,8 @@ struct file *get_empty_filp(void)
- f->f_gid = tsk->fsgid;
- eventpoll_init_file(f);
- /* f->f_version: 0 */
-+ f->f_xid = vx_current_xid();
-+ vx_files_inc(f);
- return f;
+ /**
+@@ -1398,7 +1417,7 @@ static int ext4_has_free_blocks(struct e
+ */
+ int ext4_should_retry_alloc(struct super_block *sb, int *retries)
+ {
+- if (!ext4_has_free_blocks(EXT4_SB(sb)) || (*retries)++ > 3)
++ if (!ext4_has_free_blocks(sb) || (*retries)++ > 3)
+ return 0;
- over:
-@@ -174,6 +178,8 @@ void fastcall __fput(struct file *file)
- fops_put(file->f_op);
- if (file->f_mode & FMODE_WRITE)
- put_write_access(inode);
-+ vx_files_dec(file);
-+ file->f_xid = 0;
- file_kill(file);
- file->f_dentry = NULL;
- file->f_vfsmnt = NULL;
-@@ -239,6 +245,8 @@ void put_filp(struct file *file)
- {
- if (atomic_dec_and_test(&file->f_count)) {
- security_file_free(file);
-+ vx_files_dec(file);
-+ file->f_xid = 0;
- file_kill(file);
- file_free(file);
+ jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);
+@@ -1461,6 +1480,8 @@ ext4_fsblk_t ext4_new_blocks(handle_t *h
+ *errp = -EDQUOT;
+ return 0;
}
---- linux-2.6.18.5/fs/hfsplus/ioctl.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/hfsplus/ioctl.c 2006-09-20 17:01:44 +0200
-@@ -16,6 +16,7 @@
- #include <linux/fs.h>
- #include <linux/sched.h>
- #include <linux/xattr.h>
-+#include <linux/mount.h>
- #include <asm/uaccess.h>
- #include "hfsplus_fs.h"
-
-@@ -35,7 +36,8 @@ int hfsplus_ioctl(struct inode *inode, s
- flags |= EXT2_FLAG_NODUMP; /* EXT2_NODUMP_FL */
- return put_user(flags, (int __user *)arg);
- case HFSPLUS_IOC_EXT2_SETFLAGS: {
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
-
- if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
---- linux-2.6.18.5/fs/inode.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/inode.c 2006-09-20 17:01:44 +0200
-@@ -115,6 +115,9 @@ static struct inode *alloc_inode(struct
- struct address_space * const mapping = &inode->i_data;
-
- inode->i_sb = sb;
-+
-+ /* essential because of inode slab reuse */
-+ inode->i_xid = 0;
- inode->i_blkbits = sb->s_blocksize_bits;
- inode->i_flags = 0;
- atomic_set(&inode->i_count, 1);
-@@ -234,6 +237,8 @@ void __iget(struct inode * inode)
- inodes_stat.nr_unused--;
- }
-
-+EXPORT_SYMBOL_GPL(__iget);
-+
- /**
- * clear_inode - clear an inode
- * @inode: inode to clear
---- linux-2.6.18.5/fs/ioctl.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ioctl.c 2006-09-20 17:01:44 +0200
-@@ -12,10 +12,19 @@
- #include <linux/fs.h>
- #include <linux/security.h>
- #include <linux/module.h>
-+#include <linux/proc_fs.h>
-+#include <linux/vserver/inode.h>
-+#include <linux/vserver/xid.h>
-
- #include <asm/uaccess.h>
- #include <asm/ioctls.h>
-
-+
-+#ifdef CONFIG_VSERVER_LEGACY
-+extern int vx_proc_ioctl(struct inode *, struct file *,
-+ unsigned int, unsigned long);
-+#endif
-+
- static long do_ioctl(struct file *filp, unsigned int cmd,
- unsigned long arg)
- {
-@@ -146,6 +155,48 @@ int vfs_ioctl(struct file *filp, unsigne
- else
- error = -ENOTTY;
- break;
-+#ifdef CONFIG_VSERVER_LEGACY
-+#ifndef CONFIG_INOXID_NONE
-+ case FIOC_GETXID: {
-+ struct inode *inode = filp->f_dentry->d_inode;
-+
-+ /* fixme: if stealth, return -ENOTTY */
-+ error = -EPERM;
-+ if (capable(CAP_CONTEXT))
-+ error = put_user(inode->i_xid, (int __user *) arg);
-+ break;
-+ }
-+ case FIOC_SETXID: {
-+ struct inode *inode = filp->f_dentry->d_inode;
-+ int xid;
-+
-+ /* fixme: if stealth, return -ENOTTY */
-+ error = -EPERM;
-+ if (!capable(CAP_CONTEXT))
-+ break;
-+ error = -EROFS;
-+ if (IS_RDONLY(inode))
-+ break;
-+ error = -ENOSYS;
-+ if (!(inode->i_sb->s_flags & MS_TAGXID))
-+ break;
-+ error = -EFAULT;
-+ if (get_user(xid, (int __user *) arg))
-+ break;
-+ error = 0;
-+ inode->i_xid = (xid & 0xFFFF);
-+ inode->i_ctime = CURRENT_TIME;
-+ mark_inode_dirty(inode);
-+ break;
-+ }
-+#endif
-+ case FIOC_GETXFLG:
-+ case FIOC_SETXFLG:
-+ error = -ENOTTY;
-+ if (filp->f_dentry->d_inode->i_sb->s_magic == PROC_SUPER_MAGIC)
-+ error = vx_proc_ioctl(filp->f_dentry->d_inode, filp, cmd, arg);
-+ break;
-+#endif
- default:
- if (S_ISREG(filp->f_dentry->d_inode->i_mode))
- error = file_ioctl(filp, cmd, arg);
---- linux-2.6.18.5/fs/ioprio.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/ioprio.c 2006-10-18 01:19:40 +0200
-@@ -104,7 +104,7 @@ asmlinkage long sys_ioprio_set(int which
- if (!who)
- user = current->user;
- else
-- user = find_user(who);
-+ user = find_user(vx_current_xid(), who);
-
- if (!user)
- break;
-@@ -197,7 +197,7 @@ asmlinkage long sys_ioprio_get(int which
- if (!who)
- user = current->user;
- else
-- user = find_user(who);
-+ user = find_user(vx_current_xid(), who);
++ if (DLIMIT_ALLOC_BLOCK(inode, 1))
++ goto out_dlimit;
- if (!user)
- break;
---- linux-2.6.18.5/fs/jfs/acl.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/jfs/acl.c 2006-09-20 17:01:44 +0200
-@@ -232,7 +232,8 @@ int jfs_setattr(struct dentry *dentry, s
- return rc;
+ sbi = EXT4_SB(sb);
+ es = EXT4_SB(sb)->s_es;
+@@ -1477,7 +1498,7 @@ ext4_fsblk_t ext4_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 ((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_XID && iattr->ia_xid != inode->i_xid)) {
- if (DQUOT_TRANSFER(inode, iattr))
- return -EDQUOT;
+- if (!ext4_has_free_blocks(sbi)) {
++ if (!ext4_has_free_blocks(sb)) {
+ *errp = -ENOSPC;
+ goto out;
}
---- linux-2.6.18.5/fs/jfs/file.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/jfs/file.c 2006-09-20 17:01:44 +0200
-@@ -98,6 +98,7 @@ struct inode_operations jfs_file_inode_o
- .setattr = jfs_setattr,
- .permission = jfs_permission,
+@@ -1667,6 +1688,9 @@ allocated:
+ io_error:
+ *errp = -EIO;
+ out:
++ if (!performed_allocation)
++ DLIMIT_FREE_BLOCK(inode, 1);
++out_dlimit:
+ if (fatal) {
+ *errp = fatal;
+ ext4_std_error(sb, fatal);
+--- linux-2.6.20/fs/ext4/file.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext4/file.c 2007-02-06 03:05:22 +0100
+@@ -121,6 +121,7 @@ const struct file_operations ext4_file_o
+ .release = ext4_release_file,
+ .fsync = ext4_sync_file,
+ .sendfile = generic_file_sendfile,
++ .sendpage = generic_file_sendpage,
+ .splice_read = generic_file_splice_read,
+ .splice_write = generic_file_splice_write,
+ };
+@@ -135,5 +136,6 @@ struct inode_operations ext4_file_inode_
+ .removexattr = generic_removexattr,
#endif
-+ .sync_flags = jfs_sync_flags,
+ .permission = ext4_permission,
++ .sync_flags = ext4_sync_flags,
};
- const struct file_operations jfs_file_operations = {
---- linux-2.6.18.5/fs/jfs/inode.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/jfs/inode.c 2006-09-20 17:01:44 +0200
-@@ -22,6 +22,7 @@
- #include <linux/buffer_head.h>
- #include <linux/pagemap.h>
- #include <linux/quotaops.h>
+--- linux-2.6.20/fs/ext4/ialloc.c 2006-11-30 21:19:20 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext4/ialloc.c 2007-02-06 03:05:22 +0100
+@@ -24,6 +24,8 @@
+ #include <linux/random.h>
+ #include <linux/bitops.h>
+ #include <linux/blkdev.h>
+#include <linux/vs_dlimit.h>
- #include "jfs_incore.h"
- #include "jfs_inode.h"
- #include "jfs_filsys.h"
-@@ -144,6 +145,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);
---- linux-2.6.18.5/fs/jfs/ioctl.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/jfs/ioctl.c 2006-09-20 17:01:44 +0200
-@@ -10,6 +10,7 @@
- #include <linux/ctype.h>
- #include <linux/capability.h>
- #include <linux/time.h>
-+#include <linux/mount.h>
- #include <asm/current.h>
- #include <asm/uaccess.h>
-
-@@ -65,7 +66,8 @@ int jfs_ioctl(struct inode * inode, stru
- case JFS_IOC_SETFLAGS: {
- unsigned int oldflags;
++#include <linux/vs_tag.h>
+ #include <asm/byteorder.h>
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
+ #include "xattr.h"
+@@ -127,6 +129,7 @@ void ext4_free_inode (handle_t *handle,
+ ext4_xattr_delete_inode(handle, inode);
+ DQUOT_FREE_INODE(inode);
+ DQUOT_DROP(inode);
++ DLIMIT_FREE_INODE(inode);
- if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
-@@ -85,8 +87,8 @@ int jfs_ioctl(struct inode * inode, stru
- * the relevant capability.
- */
- if ((oldflags & JFS_IMMUTABLE_FL) ||
-- ((flags ^ oldflags) &
-- (JFS_APPEND_FL | JFS_IMMUTABLE_FL))) {
-+ ((flags ^ oldflags) & (JFS_APPEND_FL |
-+ JFS_IMMUTABLE_FL | JFS_IUNLINK_FL))) {
- if (!capable(CAP_LINUX_IMMUTABLE))
- return -EPERM;
- }
---- linux-2.6.18.5/fs/jfs/jfs_dinode.h 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/jfs/jfs_dinode.h 2006-09-20 17:01:44 +0200
-@@ -162,9 +162,12 @@ struct dinode {
- #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
- #define JFS_IMMUTABLE_FL 0x02000000 /* Immutable file */
+ is_directory = S_ISDIR(inode->i_mode);
--#define JFS_FL_USER_VISIBLE 0x03F80000
-+#define JFS_BARRIER_FL 0x04000000 /* Barrier for chroot() */
-+#define JFS_IUNLINK_FL 0x08000000 /* Immutable unlink */
+@@ -448,6 +451,12 @@ struct inode *ext4_new_inode(handle_t *h
+ inode = new_inode(sb);
+ if (!inode)
+ return ERR_PTR(-ENOMEM);
+
-+#define JFS_FL_USER_VISIBLE 0x0FF80000
- #define JFS_FL_USER_MODIFIABLE 0x03F80000
--#define JFS_FL_INHERIT 0x03C80000
-+#define JFS_FL_INHERIT 0x0BC80000
-
- /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
- #define JFS_IOC_GETFLAGS _IOR('f', 1, long)
---- linux-2.6.18.5/fs/jfs/jfs_dtree.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/jfs/jfs_dtree.c 2006-09-20 17:01:44 +0200
-@@ -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_quota;
-+ if (dbAlloc(ip, 0, sbi->nbperpage, &xaddr))
-+ goto clean_up_dlim;
-
- /*
- * Save the table, we're going to overwrite it with the
-@@ -479,6 +480,10 @@ static u32 add_index(tid_t tid, struct i
++ inode->i_tag = dx_current_fstag(sb);
++ if (DLIMIT_ALLOC_INODE(inode)) {
++ err = -ENOSPC;
++ goto out_dlimit;
++ }
+ ei = EXT4_I(inode);
- return index;
+ sbi = EXT4_SB(sb);
+@@ -569,7 +578,8 @@ got:
+ ei->i_dir_start_lookup = 0;
+ ei->i_disksize = 0;
-+ clean_up_dlim:
-+ DLIMIT_FREE_BLOCK(ip, sbi->nbperpage);
-+ clean_up_quota:
-+ DQUOT_FREE_BLOCK(ip, sbi->nbperpage);
- clean_up:
+- ei->i_flags = EXT4_I(dir)->i_flags & ~EXT4_INDEX_FL;
++ ei->i_flags = EXT4_I(dir)->i_flags &
++ ~(EXT4_INDEX_FL|EXT4_IUNLINK_FL|EXT4_BARRIER_FL);
+ if (S_ISLNK(mode))
+ ei->i_flags &= ~(EXT4_IMMUTABLE_FL|EXT4_APPEND_FL);
+ /* dirsync only applies to directories */
+@@ -635,6 +645,8 @@ got:
+ fail:
+ ext4_std_error(sb, err);
+ out:
++ DLIMIT_FREE_INODE(inode);
++out_dlimit:
+ iput(inode);
+ ret = ERR_PTR(err);
+ really_out:
+@@ -646,6 +658,7 @@ fail_free_drop:
- jfs_ip->next_index--;
-@@ -952,6 +957,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;
-@@ -1036,6 +1042,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;
-@@ -1309,6 +1321,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);
-@@ -1376,6 +1391,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);
-
-@@ -1926,6 +1947,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);
- /*
-@@ -2292,6 +2319,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);
-
-@@ -2368,6 +2397,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);
-
---- linux-2.6.18.5/fs/jfs/jfs_extent.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/jfs/jfs_extent.c 2006-09-20 17:01:44 +0200
-@@ -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"
-@@ -146,6 +147,13 @@ extAlloc(struct inode *ip, s64 xlen, s64
- 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);
-+ mutex_unlock(&JFS_IP(ip)->commit_mutex);
-+ return -ENOSPC;
-+ }
-
- /* determine the value of the extent flag */
- xflag = (abnr == TRUE) ? XAD_NOTRECORDED : 0;
-@@ -164,6 +172,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 +270,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 +313,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 +325,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;
- }
---- linux-2.6.18.5/fs/jfs/jfs_filsys.h 2005-10-28 20:49:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/jfs/jfs_filsys.h 2006-09-20 17:01:44 +0200
-@@ -84,6 +84,7 @@
- #define JFS_DIR_INDEX 0x00200000 /* Persistant index for */
- /* directory entries */
-
-+#define JFS_TAGXID 0x00800000 /* xid tagging */
-
- /*
- * buffer cache configuration
---- linux-2.6.18.5/fs/jfs/jfs_imap.c 2006-12-04 06:13:51 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/jfs/jfs_imap.c 2006-11-06 04:47:17 +0100
-@@ -45,6 +45,7 @@
- #include <linux/buffer_head.h>
- #include <linux/pagemap.h>
- #include <linux/quotaops.h>
-+#include <linux/vserver/xid.h>
-
- #include "jfs_incore.h"
- #include "jfs_inode.h"
-@@ -3075,6 +3076,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);
-+ uid_t uid;
-+ gid_t gid;
-
- jfs_ip->fileset = le32_to_cpu(dip->di_fileset);
- jfs_ip->mode2 = le32_to_cpu(dip->di_mode);
-@@ -3094,14 +3097,18 @@ static int copy_from_dinode(struct dinod
- }
- ip->i_nlink = le32_to_cpu(dip->di_nlink);
+ fail_drop:
+ DQUOT_DROP(inode);
++ DLIMIT_FREE_INODE(inode);
+ inode->i_flags |= S_NOQUOTA;
+ inode->i_nlink = 0;
+ iput(inode);
+--- linux-2.6.20/fs/ext4/inode.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext4/inode.c 2007-02-06 03:05:22 +0100
+@@ -37,6 +37,7 @@
+ #include <linux/mpage.h>
+ #include <linux/uio.h>
+ #include <linux/bio.h>
++#include <linux/vs_tag.h>
+ #include "xattr.h"
+ #include "acl.h"
-- jfs_ip->saved_uid = le32_to_cpu(dip->di_uid);
-+ uid = le32_to_cpu(dip->di_uid);
-+ gid = le32_to_cpu(dip->di_gid);
-+ ip->i_xid = INOXID_XID(XID_TAG(ip), uid, gid, 0);
-+
-+ jfs_ip->saved_uid = INOXID_UID(XID_TAG(ip), uid, gid);
- if (sbi->uid == -1)
- ip->i_uid = jfs_ip->saved_uid;
- else {
- ip->i_uid = sbi->uid;
- }
+@@ -2310,7 +2311,7 @@ void ext4_truncate(struct inode *inode)
+ return;
+ if (ext4_inode_is_fast_symlink(inode))
+ return;
+- if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
++ if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
+ return;
-- jfs_ip->saved_gid = le32_to_cpu(dip->di_gid);
-+ jfs_ip->saved_gid = INOXID_GID(XID_TAG(ip), uid, gid);
- if (sbi->gid == -1)
- ip->i_gid = jfs_ip->saved_gid;
- else {
-@@ -3167,14 +3174,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);
-- if (sbi->uid == -1)
-- dip->di_uid = cpu_to_le32(ip->i_uid);
-- else
-- dip->di_uid = cpu_to_le32(jfs_ip->saved_uid);
-- if (sbi->gid == -1)
-- dip->di_gid = cpu_to_le32(ip->i_gid);
-- else
-- dip->di_gid = cpu_to_le32(jfs_ip->saved_gid);
-+
-+ dip->di_uid = cpu_to_le32(XIDINO_UID(XID_TAG(ip),
-+ (sbi->uid == -1) ? ip->i_uid : jfs_ip->saved_uid, ip->i_xid));
-+ dip->di_gid = cpu_to_le32(XIDINO_GID(XID_TAG(ip),
-+ (sbi->gid == -1) ? ip->i_gid : jfs_ip->saved_gid, ip->i_xid));
-+
/*
- * mode2 is only needed for storing the higher order bits.
- * Trust i_mode for the lower order ones
---- linux-2.6.18.5/fs/jfs/jfs_inode.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/jfs/jfs_inode.c 2006-09-20 17:01:44 +0200
-@@ -18,6 +18,8 @@
-
- #include <linux/fs.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
-+#include <linux/vserver/xid.h>
- #include "jfs_incore.h"
- #include "jfs_inode.h"
- #include "jfs_filsys.h"
-@@ -30,19 +32,59 @@ void jfs_set_inode_flags(struct inode *i
+@@ -2636,19 +2637,65 @@ void ext4_set_inode_flags(struct inode *
{
- unsigned int flags = JFS_IP(inode)->mode2;
+ unsigned int flags = EXT4_I(inode)->i_flags;
-- inode->i_flags &= ~(S_IMMUTABLE | S_APPEND |
-- S_NOATIME | S_DIRSYNC | S_SYNC);
+- inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
+ inode->i_flags &= ~(S_IMMUTABLE | S_IUNLINK | S_BARRIER |
+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
-
- if (flags & JFS_IMMUTABLE_FL)
- inode->i_flags |= S_IMMUTABLE;
-+ if (flags & JFS_IUNLINK_FL)
++
++ if (flags & EXT4_IMMUTABLE_FL)
++ inode->i_flags |= S_IMMUTABLE;
++ if (flags & EXT4_IUNLINK_FL)
+ inode->i_flags |= S_IUNLINK;
-+ if (flags & JFS_BARRIER_FL)
++ if (flags & EXT4_BARRIER_FL)
+ inode->i_flags |= S_BARRIER;
+
-+ if (flags & JFS_SYNC_FL)
-+ inode->i_flags |= S_SYNC;
- if (flags & JFS_APPEND_FL)
+ if (flags & EXT4_SYNC_FL)
+ inode->i_flags |= S_SYNC;
+ if (flags & EXT4_APPEND_FL)
inode->i_flags |= S_APPEND;
- if (flags & JFS_NOATIME_FL)
+- if (flags & EXT4_IMMUTABLE_FL)
+- inode->i_flags |= S_IMMUTABLE;
+ if (flags & EXT4_NOATIME_FL)
inode->i_flags |= S_NOATIME;
- if (flags & JFS_DIRSYNC_FL)
+ if (flags & EXT4_DIRSYNC_FL)
inode->i_flags |= S_DIRSYNC;
-- if (flags & JFS_SYNC_FL)
-- inode->i_flags |= S_SYNC;
-+}
-+
-+int jfs_sync_flags(struct inode *inode)
+ }
+
++int ext4_sync_flags(struct inode *inode)
+{
+ unsigned int oldflags, newflags;
++ int err = 0;
+
-+ oldflags = JFS_IP(inode)->mode2;
-+ newflags = oldflags & ~(JFS_APPEND_FL |
-+ JFS_IMMUTABLE_FL | JFS_IUNLINK_FL |
-+ JFS_BARRIER_FL | JFS_NOATIME_FL |
-+ JFS_SYNC_FL | JFS_DIRSYNC_FL);
++ oldflags = EXT4_I(inode)->i_flags;
++ newflags = oldflags & ~(EXT4_IMMUTABLE_FL |
++ EXT4_IUNLINK_FL | EXT4_BARRIER_FL);
+
-+ if (IS_APPEND(inode))
-+ newflags |= JFS_APPEND_FL;
+ if (IS_IMMUTABLE(inode))
-+ newflags |= JFS_IMMUTABLE_FL;
++ newflags |= EXT4_IMMUTABLE_FL;
+ if (IS_IUNLINK(inode))
-+ newflags |= JFS_IUNLINK_FL;
++ newflags |= EXT4_IUNLINK_FL;
+ if (IS_BARRIER(inode))
-+ newflags |= JFS_BARRIER_FL;
-+
-+ /* we do not want to copy superblock flags */
-+ if (inode->i_flags & S_NOATIME)
-+ newflags |= JFS_NOATIME_FL;
-+ if (inode->i_flags & S_SYNC)
-+ newflags |= JFS_SYNC_FL;
-+ if (inode->i_flags & S_DIRSYNC)
-+ newflags |= JFS_DIRSYNC_FL;
++ newflags |= EXT4_BARRIER_FL;
+
+ if (oldflags ^ newflags) {
-+ JFS_IP(inode)->mode2 = newflags;
++ handle_t *handle;
++ struct ext4_iloc iloc;
++
++ 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_I(inode)->i_flags = newflags;
+ inode->i_ctime = CURRENT_TIME;
-+ mark_inode_dirty(inode);
-+ }
-+ return 0;
- }
-
- /*
-@@ -89,10 +131,17 @@ struct inode *ialloc(struct inode *paren
- jfs_inode->saved_uid = inode->i_uid;
- jfs_inode->saved_gid = inode->i_gid;
-
-+ inode->i_xid = vx_current_fsxid(sb);
-+ if (DLIMIT_ALLOC_INODE(inode)) {
-+ iput(inode);
-+ return NULL;
++
++ err = ext4_mark_iloc_dirty(handle, inode, &iloc);
++ flags_err:
++ ext4_journal_stop(handle);
+ }
++ return err;
++}
+
- /*
- * Allocate inode to quota.
- */
- if (DQUOT_ALLOC_INODE(inode)) {
-+ DLIMIT_FREE_INODE(inode);
- DQUOT_DROP(inode);
- inode->i_flags |= S_NOQUOTA;
- inode->i_nlink = 0;
---- linux-2.6.18.5/fs/jfs/jfs_inode.h 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/jfs/jfs_inode.h 2006-09-20 17:01:44 +0200
-@@ -31,6 +31,7 @@ extern void jfs_truncate(struct inode *)
- extern void jfs_truncate_nolock(struct inode *, loff_t);
- extern void jfs_free_zero_link(struct inode *);
- extern struct dentry *jfs_get_parent(struct dentry *dentry);
-+extern int jfs_sync_flags(struct inode *);
- extern void jfs_set_inode_flags(struct inode *);
- extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
+ void ext4_read_inode(struct inode * inode)
+ {
+ struct ext4_iloc iloc;
+@@ -2656,6 +2703,8 @@ void ext4_read_inode(struct inode * inod
+ struct ext4_inode_info *ei = EXT4_I(inode);
+ struct buffer_head *bh;
+ int block;
++ uid_t uid;
++ gid_t gid;
---- linux-2.6.18.5/fs/jfs/jfs_xtree.c 2006-01-03 17:29:57 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/jfs/jfs_xtree.c 2006-09-20 17:01:44 +0200
-@@ -21,6 +21,7 @@
+ #ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
+ ei->i_acl = EXT4_ACL_NOT_CACHED;
+@@ -2668,12 +2717,17 @@ void ext4_read_inode(struct inode * inod
+ bh = iloc.bh;
+ 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);
+- inode->i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
++ uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
++ gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
+ if(!(test_opt (inode->i_sb, NO_UID32))) {
+- inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+- inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
++ uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
++ gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
+ }
++ 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));
++
+ inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
+ inode->i_size = le32_to_cpu(raw_inode->i_size);
+ inode->i_atime.tv_sec = le32_to_cpu(raw_inode->i_atime);
+@@ -2801,6 +2855,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;
++ 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);
+ int err = 0, rc, block;
- #include <linux/fs.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
- #include "jfs_incore.h"
- #include "jfs_filsys.h"
- #include "jfs_metapage.h"
-@@ -841,7 +842,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;
+ /* For fields not not tracking in the in-memory inode,
+@@ -2810,29 +2866,32 @@ static int ext4_do_update_inode(handle_t
+
+ raw_inode->i_mode = cpu_to_le16(inode->i_mode);
+ if(!(test_opt(inode->i_sb, NO_UID32))) {
+- raw_inode->i_uid_low = cpu_to_le16(low_16_bits(inode->i_uid));
+- raw_inode->i_gid_low = cpu_to_le16(low_16_bits(inode->i_gid));
++ raw_inode->i_uid_low = cpu_to_le16(low_16_bits(uid));
++ raw_inode->i_gid_low = cpu_to_le16(low_16_bits(gid));
+ /*
+ * Fix up interoperability with old kernels. Otherwise, old inodes get
+ * re-used with the upper 16 bits of the uid/gid intact
+ */
+ if(!ei->i_dtime) {
+ raw_inode->i_uid_high =
+- cpu_to_le16(high_16_bits(inode->i_uid));
++ cpu_to_le16(high_16_bits(uid));
+ raw_inode->i_gid_high =
+- cpu_to_le16(high_16_bits(inode->i_gid));
++ cpu_to_le16(high_16_bits(gid));
+ } else {
+ raw_inode->i_uid_high = 0;
+ raw_inode->i_gid_high = 0;
}
-@@ -871,6 +877,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;
-@@ -1231,6 +1238,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;
+ } else {
+ raw_inode->i_uid_low =
+- cpu_to_le16(fs_high2lowuid(inode->i_uid));
++ cpu_to_le16(fs_high2lowuid(uid));
+ raw_inode->i_gid_low =
+- cpu_to_le16(fs_high2lowgid(inode->i_gid));
++ cpu_to_le16(fs_high2lowgid(gid));
+ raw_inode->i_uid_high = 0;
+ raw_inode->i_gid_high = 0;
+ }
++#ifdef CONFIG_TAGGING_INTERN
++ raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
++#endif
+ 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);
+@@ -2989,7 +3048,8 @@ int ext4_setattr(struct dentry *dentry,
+ return error;
- smp = split->mp;
- sp = XT_PAGE(ip, smp);
-@@ -1250,6 +1258,13 @@ xtSplitPage(tid_t tid, struct inode *ip,
+ 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)) {
+ handle_t *handle;
- quota_allocation += lengthPXD(pxd);
+ /* (user+group)*(old+new) structure, inode write (sb,
+@@ -3011,6 +3071,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;
++ if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode))
++ inode->i_tag = attr->ia_tag;
+ error = ext4_mark_inode_dirty(handle, inode);
+ ext4_journal_stop(handle);
+ }
+--- linux-2.6.20/fs/ext4/ioctl.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext4/ioctl.c 2007-02-06 03:05:22 +0100
+@@ -8,6 +8,7 @@
+ */
-+ /* 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
- */
-@@ -1451,6 +1466,9 @@ xtSplitPage(tid_t tid, struct inode *ip,
+ #include <linux/fs.h>
++#include <linux/mount.h>
+ #include <linux/jbd2.h>
+ #include <linux/capability.h>
+ #include <linux/ext4_fs.h>
+@@ -15,6 +16,7 @@
+ #include <linux/time.h>
+ #include <linux/compat.h>
+ #include <linux/smp_lock.h>
++#include <linux/vs_tag.h>
+ #include <asm/uaccess.h>
- clean_up:
+ int ext4_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
+@@ -37,7 +39,8 @@ int ext4_ioctl (struct inode * inode, st
+ unsigned int oldflags;
+ unsigned int jflag;
-+ /* Rollback dlimit allocation. */
-+ if (dlimit_allocation)
-+ DLIMIT_FREE_BLOCK(ip, dlimit_allocation);
- /* Rollback quota allocation. */
- if (quota_allocation)
- DQUOT_FREE_BLOCK(ip, quota_allocation);
-@@ -1515,6 +1533,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;
-+ }
+- if (IS_RDONLY(inode))
++ if (IS_RDONLY(inode) ||
++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
+ return -EROFS;
- jfs_info("xtSplitRoot: ip:0x%p rmp:0x%p", ip, rmp);
+ if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
+@@ -61,7 +64,9 @@ int ext4_ioctl (struct inode * inode, st
+ *
+ * This test looks nicer. Thanks to Pauline Middelink
+ */
+- if ((flags ^ oldflags) & (EXT4_APPEND_FL | EXT4_IMMUTABLE_FL)) {
++ if ((oldflags & EXT4_IMMUTABLE_FL) ||
++ ((flags ^ oldflags) & (EXT4_APPEND_FL |
++ EXT4_IMMUTABLE_FL | EXT4_IUNLINK_FL))) {
+ if (!capable(CAP_LINUX_IMMUTABLE)) {
+ mutex_unlock(&inode->i_mutex);
+ return -EPERM;
+@@ -123,7 +128,8 @@ flags_err:
-@@ -3941,6 +3965,8 @@ s64 xtTruncate(tid_t tid, struct inode *
- else
- ip->i_size = newsize;
+ if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
+ return -EPERM;
+- if (IS_RDONLY(inode))
++ if (IS_RDONLY(inode) ||
++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
+ return -EROFS;
+ if (get_user(generation, (int __user *) arg))
+ return -EFAULT;
+@@ -177,7 +183,8 @@ flags_err:
+ if (!test_opt(inode->i_sb, RESERVATION) ||!S_ISREG(inode->i_mode))
+ return -ENOTTY;
-+ /* update dlimit allocation to reflect freed blocks */
-+ DLIMIT_FREE_BLOCK(ip, nfreed);
- /* update quota allocation to reflect freed blocks */
- DQUOT_FREE_BLOCK(ip, nfreed);
+- if (IS_RDONLY(inode))
++ if (IS_RDONLY(inode) ||
++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
+ return -EROFS;
---- linux-2.6.18.5/fs/jfs/namei.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/jfs/namei.c 2006-09-20 17:01:44 +0200
-@@ -20,6 +20,7 @@
- #include <linux/fs.h>
- #include <linux/ctype.h>
- #include <linux/quotaops.h>
-+#include <linux/vserver/xid.h>
- #include "jfs_incore.h"
- #include "jfs_superblock.h"
- #include "jfs_inode.h"
-@@ -1464,6 +1465,7 @@ static struct dentry *jfs_lookup(struct
- return ERR_PTR(-EACCES);
- }
+ if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
+@@ -212,7 +219,8 @@ flags_err:
+ if (!capable(CAP_SYS_RESOURCE))
+ return -EPERM;
-+ vx_propagate_xid(nd, ip);
- dentry = d_splice_alias(ip, dentry);
+- if (IS_RDONLY(inode))
++ if (IS_RDONLY(inode) ||
++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
+ return -EROFS;
- if (dentry && (JFS_SBI(dip->i_sb)->mntflag & JFS_OS2))
-@@ -1516,6 +1518,7 @@ struct inode_operations jfs_dir_inode_op
- .setattr = jfs_setattr,
- .permission = jfs_permission,
- #endif
-+ .sync_flags = jfs_sync_flags,
- };
+ if (get_user(n_blocks_count, (__u32 __user *)arg))
+@@ -233,7 +241,8 @@ flags_err:
+ if (!capable(CAP_SYS_RESOURCE))
+ return -EPERM;
- const struct file_operations jfs_dir_operations = {
---- linux-2.6.18.5/fs/jfs/super.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/jfs/super.c 2006-09-20 17:01:44 +0200
-@@ -194,7 +194,8 @@ static void jfs_put_super(struct super_b
- enum {
- Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
- Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota,
-- Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask
-+ Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask,
-+ Opt_tagxid
- };
+- if (IS_RDONLY(inode))
++ if (IS_RDONLY(inode) ||
++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
+ return -EROFS;
- static match_table_t tokens = {
-@@ -204,6 +205,7 @@ static match_table_t tokens = {
- {Opt_resize, "resize=%u"},
- {Opt_resize_nosize, "resize"},
- {Opt_errors, "errors=%s"},
-+ {Opt_tagxid, "tagxid"},
- {Opt_ignore, "noquota"},
- {Opt_ignore, "quota"},
- {Opt_usrquota, "usrquota"},
-@@ -338,6 +340,11 @@ static int parse_options(char *options,
- }
- break;
- }
-+#ifndef CONFIG_TAGGING_NONE
-+ case Opt_tagxid:
-+ *flag |= JFS_TAGXID;
-+ break;
-+#endif
- default:
- printk("jfs: Unrecognized mount option \"%s\" "
- " or missing value\n", p);
-@@ -368,6 +375,13 @@ static int jfs_remount(struct super_bloc
- if (!parse_options(data, sb, &newLVSize, &flag)) {
- return -EINVAL;
+ if (copy_from_user(&input, (struct ext4_new_group_input __user *)arg,
+@@ -248,6 +257,39 @@ flags_err:
+ return err;
}
+
++#if defined(CONFIG_VSERVER_LEGACY) && !defined(CONFIG_TAGGING_NONE)
++ case EXT4_IOC_SETTAG: {
++ handle_t *handle;
++ struct ext4_iloc iloc;
++ int tag;
++ int err;
+
-+ if ((flag & JFS_TAGXID) && !(sb->s_flags & MS_TAGXID)) {
-+ printk(KERN_ERR "JFS: %s: tagxid not permitted on remount.\n",
-+ sb->s_id);
-+ return -EINVAL;
-+ }
-+
- if (newLVSize) {
- if (sb->s_flags & MS_RDONLY) {
- printk(KERN_ERR
-@@ -439,6 +453,9 @@ static int jfs_fill_super(struct super_b
- #ifdef CONFIG_JFS_POSIX_ACL
- sb->s_flags |= MS_POSIXACL;
- #endif
-+ /* map mount option tagxid */
-+ if (sbi->flag & JFS_TAGXID)
-+ sb->s_flags |= MS_TAGXID;
-
- if (newLVSize) {
- printk(KERN_ERR "resize option for remount only\n");
---- linux-2.6.18.5/fs/jfs/xattr.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/jfs/xattr.c 2006-09-20 17:01:44 +0200
-@@ -23,6 +23,7 @@
- #include <linux/posix_acl_xattr.h>
- #include <linux/quotaops.h>
- #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;
++ /* fixme: if stealth, return -ENOTTY */
++ if (!capable(CAP_CONTEXT))
++ return -EPERM;
++ if (IS_RDONLY(inode))
++ return -EROFS;
++ if (!(inode->i_sb->s_flags & MS_TAGGED))
++ return -ENOSYS;
++ if (get_user(tag, (int __user *) arg))
++ return -EFAULT;
++
++ handle = ext4_journal_start(inode, 1);
++ if (IS_ERR(handle))
++ return PTR_ERR(handle);
++ err = ext4_reserve_inode_write(handle, inode, &iloc);
++ if (err)
++ return err;
++
++ inode->i_tag = (tag & 0xFFFF);
++ inode->i_ctime = CURRENT_TIME;
++
++ err = ext4_mark_iloc_dirty(handle, inode, &iloc);
++ ext4_journal_stop(handle);
++ return err;
+ }
++#endif
++
+ default:
+ return -ENOTTY;
+ }
+--- linux-2.6.20/fs/ext4/namei.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext4/namei.c 2007-02-06 03:05:22 +0100
+@@ -37,6 +37,7 @@
+ #include <linux/buffer_head.h>
+ #include <linux/bio.h>
+ #include <linux/smp_lock.h>
++#include <linux/vs_tag.h>
- 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);
+ #include "namei.h"
+ #include "xattr.h"
+@@ -1017,6 +1018,7 @@ static struct dentry *ext4_lookup(struct
- 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;
+ if (!inode)
+ return ERR_PTR(-EACCES);
++ dx_propagate_tag(nd, inode);
+ }
+ return d_splice_alias(inode, dentry);
+ }
+@@ -2390,6 +2392,7 @@ struct inode_operations ext4_dir_inode_o
+ .removexattr = generic_removexattr,
+ #endif
+ .permission = ext4_permission,
++ .sync_flags = ext4_sync_flags,
+ };
- /* 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
+ struct inode_operations ext4_special_inode_operations = {
+@@ -2401,4 +2404,5 @@ struct inode_operations ext4_special_ino
+ .removexattr = generic_removexattr,
+ #endif
+ .permission = ext4_permission,
++ .sync_flags = ext4_sync_flags,
+ };
+--- linux-2.6.20/fs/ext4/super.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext4/super.c 2007-02-06 03:05:22 +0100
+@@ -728,7 +728,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,
+- Opt_grpquota, Opt_extents,
++ Opt_grpquota, Opt_extents, Opt_tag, Opt_notag, Opt_tagid
+ };
- quota_allocation = blocks_needed;
+ static match_table_t tokens = {
+@@ -779,6 +779,10 @@ static match_table_t tokens = {
+ {Opt_usrquota, "usrquota"},
+ {Opt_barrier, "barrier=%u"},
+ {Opt_extents, "extents"},
++ {Opt_tag, "tag"},
++ {Opt_notag, "notag"},
++ {Opt_tagid, "tagid=%u"},
++ {Opt_tag, "tagxid"},
+ {Opt_err, NULL},
+ {Opt_resize, "resize"},
+ };
+@@ -872,6 +876,20 @@ static int parse_options (char *options,
+ case Opt_nouid32:
+ set_opt (sbi->s_mount_opt, NO_UID32);
+ break;
++#ifndef CONFIG_TAGGING_NONE
++ case Opt_tag:
++ set_opt (sbi->s_mount_opt, TAGGED);
++ break;
++ case Opt_notag:
++ clear_opt (sbi->s_mount_opt, TAGGED);
++ break;
++#endif
++#ifdef CONFIG_PROPAGATE
++ case Opt_tagid:
++ /* use args[0] */
++ set_opt (sbi->s_mount_opt, TAGGED);
++ break;
++#endif
+ case Opt_nocheck:
+ clear_opt (sbi->s_mount_opt, CHECK);
+ break;
+@@ -1545,6 +1563,9 @@ static int ext4_fill_super (struct super
+ NULL, 0))
+ goto failed_mount;
-+ /* Allocate new blocks to dlimit. */
-+ rc = -ENOSPC;
-+ if (DLIMIT_ALLOC_BLOCK(inode, blocks_needed))
-+ goto clean_up;
-+ dlimit_allocation = blocks_needed;
++ if (EXT4_SB(sb)->s_mount_opt & EXT4_MOUNT_TAGGED)
++ sb->s_flags |= MS_TAGGED;
+
- rc = dbAlloc(inode, INOHINT(inode), (s64) blocks_needed,
- &blkno);
- if (rc)
-@@ -599,6 +616,9 @@ static int ea_get(struct inode *inode, s
- return ea_size;
+ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ ((sbi->s_mount_opt & EXT4_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
- 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);
-@@ -675,8 +695,10 @@ static int ea_put(tid_t tid, struct inod
- }
+@@ -2376,6 +2397,12 @@ static int ext4_remount (struct super_bl
- /* 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);
+ if (sbi->s_mount_opt & EXT4_MOUNT_ABORT)
+ ext4_abort(sb, __FUNCTION__, "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;
+ }
- inode->i_ctime = CURRENT_TIME;
-
---- linux-2.6.18.5/fs/libfs.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/libfs.c 2006-09-20 17:01:44 +0200
-@@ -124,7 +124,8 @@ static inline unsigned char dt_type(stru
- * both impossible due to the lock on directory.
- */
+ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ ((sbi->s_mount_opt & EXT4_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
+--- linux-2.6.20/fs/ext4/symlink.c 2006-11-30 21:19:20 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext4/symlink.c 2007-02-06 03:05:22 +0100
+@@ -40,6 +40,7 @@ struct inode_operations ext4_symlink_ino
+ .listxattr = ext4_listxattr,
+ .removexattr = generic_removexattr,
+ #endif
++ .sync_flags = ext4_sync_flags,
+ };
--int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
-+static inline int do_dcache_readdir_filter(struct file * filp,
-+ void * dirent, filldir_t filldir, int (*filter)(struct dentry *dentry))
- {
- struct dentry *dentry = filp->f_dentry;
- struct dentry *cursor = filp->private_data;
-@@ -157,6 +158,8 @@ int dcache_readdir(struct file * filp, v
- next = list_entry(p, struct dentry, d_u.d_child);
- if (d_unhashed(next) || !next->d_inode)
- continue;
-+ if (filter && !filter(next))
-+ continue;
+ struct inode_operations ext4_fast_symlink_inode_operations = {
+@@ -51,4 +52,5 @@ struct inode_operations ext4_fast_symlin
+ .listxattr = ext4_listxattr,
+ .removexattr = generic_removexattr,
+ #endif
++ .sync_flags = ext4_sync_flags,
+ };
+--- linux-2.6.20/fs/ext4/xattr.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ext4/xattr.c 2007-02-06 03:05:22 +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"
- spin_unlock(&dcache_lock);
- if (filldir(dirent, next->d_name.name, next->d_name.len, filp->f_pos, next->d_inode->i_ino, dt_type(next->d_inode)) < 0)
-@@ -172,6 +175,18 @@ int dcache_readdir(struct file * filp, v
- return 0;
- }
+@@ -492,6 +493,7 @@ ext4_xattr_release_block(handle_t *handl
+ ext4_journal_dirty_metadata(handle, bh);
+ if (IS_SYNC(inode))
+ handle->h_sync = 1;
++ DLIMIT_FREE_BLOCK(inode, 1);
+ DQUOT_FREE_BLOCK(inode, 1);
+ unlock_buffer(bh);
+ ea_bdebug(bh, "refcount now=%d; releasing",
+@@ -760,11 +762,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)
+@@ -841,6 +846,8 @@ cleanup:
-+int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
-+{
-+ return do_dcache_readdir_filter(filp, dirent, filldir, NULL);
-+}
-+
-+int dcache_readdir_filter(struct file * filp, void * dirent, filldir_t filldir,
-+ int (*filter)(struct dentry *))
-+{
-+ return do_dcache_readdir_filter(filp, dirent, filldir, filter);
-+}
-+
-+
- ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
- {
- return -EISDIR;
-@@ -621,6 +636,7 @@ EXPORT_SYMBOL(dcache_dir_close);
- EXPORT_SYMBOL(dcache_dir_lseek);
- EXPORT_SYMBOL(dcache_dir_open);
- EXPORT_SYMBOL(dcache_readdir);
-+EXPORT_SYMBOL(dcache_readdir_filter);
- EXPORT_SYMBOL(generic_read_dir);
- EXPORT_SYMBOL(get_sb_pseudo);
- EXPORT_SYMBOL(simple_commit_write);
---- linux-2.6.18.5/fs/lockd/clntproc.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/lockd/clntproc.c 2006-09-20 17:01:44 +0200
-@@ -17,6 +17,7 @@
- #include <linux/sunrpc/svc.h>
- #include <linux/lockd/lockd.h>
- #include <linux/lockd/sm_inter.h>
-+#include <linux/vs_cvirt.h>
+ cleanup_dquot:
+ DQUOT_FREE_BLOCK(inode, 1);
++cleanup_dlimit:
++ DLIMIT_FREE_BLOCK(inode, 1);
+ goto cleanup;
- #define NLMDBG_FACILITY NLMDBG_CLIENT
- #define NLMCLNT_GRACE_WAIT (5*HZ)
-@@ -129,11 +130,11 @@ static void nlmclnt_setlockargs(struct n
- nlmclnt_next_cookie(&argp->cookie);
- argp->state = nsm_local_state;
- memcpy(&lock->fh, NFS_FH(fl->fl_file->f_dentry->d_inode), sizeof(struct nfs_fh));
-- lock->caller = system_utsname.nodename;
-+ lock->caller = vx_new_uts(nodename);
- lock->oh.data = req->a_owner;
- lock->oh.len = snprintf(req->a_owner, sizeof(req->a_owner), "%u@%s",
- (unsigned int)fl->fl_u.nfs_fl.owner->pid,
-- system_utsname.nodename);
-+ vx_new_uts(nodename));
- lock->svid = fl->fl_u.nfs_fl.owner->pid;
- lock->fl.fl_start = fl->fl_start;
- lock->fl.fl_end = fl->fl_end;
---- linux-2.6.18.5/fs/locks.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/locks.c 2006-09-20 18:02:37 +0200
-@@ -125,6 +125,7 @@
- #include <linux/syscalls.h>
- #include <linux/time.h>
+ bad_block:
+--- linux-2.6.20/fs/fcntl.c 2007-02-06 03:01:18 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/fcntl.c 2007-02-06 03:05:22 +0100
+@@ -18,6 +18,7 @@
+ #include <linux/ptrace.h>
+ #include <linux/signal.h>
#include <linux/rcupdate.h>
+#include <linux/vs_limit.h>
- #include <asm/semaphore.h>
- #include <asm/uaccess.h>
-@@ -147,6 +148,8 @@ static kmem_cache_t *filelock_cache __re
- /* Allocate an empty lock structure. */
- static struct file_lock *locks_alloc_lock(void)
- {
-+ if (!vx_locks_avail(1))
-+ return NULL;
- return kmem_cache_alloc(filelock_cache, SLAB_KERNEL);
- }
+ #include <asm/poll.h>
+ #include <asm/siginfo.h>
+@@ -84,6 +85,8 @@ repeat:
+ error = -EMFILE;
+ if (newfd >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
+ goto out;
++ if (!vx_files_avail(1))
++ goto out;
-@@ -172,6 +175,7 @@ static void locks_free_lock(struct file_
- BUG_ON(!list_empty(&fl->fl_block));
- BUG_ON(!list_empty(&fl->fl_link));
+ error = expand_files(files, newfd);
+ if (error < 0)
+@@ -124,6 +127,7 @@ static int dupfd(struct file *file, unsi
+ FD_SET(fd, fdt->open_fds);
+ FD_CLR(fd, fdt->close_on_exec);
+ spin_unlock(&files->file_lock);
++ vx_openfd_inc(fd);
+ fd_install(fd, file);
+ } else {
+ spin_unlock(&files->file_lock);
+@@ -176,6 +180,9 @@ asmlinkage long sys_dup2(unsigned int ol
-+ vx_locks_dec(fl);
- locks_release_private(fl);
- kmem_cache_free(filelock_cache, fl);
- }
-@@ -191,6 +195,7 @@ void locks_init_lock(struct file_lock *f
- fl->fl_start = fl->fl_end = 0;
- fl->fl_ops = NULL;
- fl->fl_lmops = NULL;
-+ fl->fl_xid = -1;
- }
-
- EXPORT_SYMBOL(locks_init_lock);
-@@ -248,6 +253,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;
-+ new->fl_xid = fl->fl_xid;
-
- locks_copy_private(new, fl);
- }
-@@ -286,6 +292,9 @@ static int flock_make_lock(struct file *
- fl->fl_flags = FL_FLOCK;
- fl->fl_type = type;
- fl->fl_end = OFFSET_MAX;
+ if (tofree)
+ filp_close(tofree, files);
++ else
++ vx_openfd_inc(newfd); /* fd was unused */
+
-+ fl->fl_xid = filp->f_xid;
-+ vx_locks_inc(fl);
-
- *lock = fl;
- return 0;
-@@ -451,6 +460,7 @@ static int lease_init(struct file *filp,
-
- fl->fl_owner = current->files;
- fl->fl_pid = current->tgid;
-+ fl->fl_xid = vx_current_xid();
+ err = newfd;
+ out:
+ return err;
+--- linux-2.6.20/fs/file_table.c 2007-02-06 03:01:19 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/file_table.c 2007-02-06 03:05:22 +0100
+@@ -21,6 +21,8 @@
+ #include <linux/fsnotify.h>
+ #include <linux/sysctl.h>
+ #include <linux/percpu_counter.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_context.h>
- fl->fl_file = filp;
- fl->fl_flags = FL_LEASE;
-@@ -470,6 +480,8 @@ static int lease_alloc(struct file *filp
- if (fl == NULL)
- goto out;
+ #include <asm/atomic.h>
-+ fl->fl_xid = vx_current_xid();
-+ vx_locks_inc(fl);
- error = lease_init(filp, type, fl);
- if (error) {
- locks_free_lock(fl);
-@@ -790,6 +802,7 @@ find_conflict:
- if (request->fl_flags & FL_ACCESS)
- goto out;
- locks_copy_lock(new_fl, request);
-+ vx_locks_inc(new_fl);
- locks_insert_lock(&inode->i_flock, new_fl);
- new_fl = NULL;
- error = 0;
-@@ -801,7 +814,8 @@ out:
- return error;
- }
+@@ -120,6 +122,8 @@ struct file *get_empty_filp(void)
+ f->f_gid = tsk->fsgid;
+ eventpoll_init_file(f);
+ /* f->f_version: 0 */
++ f->f_xid = vx_current_xid();
++ vx_files_inc(f);
+ return f;
--static int __posix_lock_file_conf(struct inode *inode, struct file_lock *request, struct file_lock *conflock)
-+static int __posix_lock_file_conf(struct inode *inode, struct file_lock *request,
-+ struct file_lock *conflock, xid_t xid)
+ over:
+@@ -175,6 +179,8 @@ void fastcall __fput(struct file *file)
+ if (file->f_mode & FMODE_WRITE)
+ put_write_access(inode);
+ put_pid(file->f_owner.pid);
++ vx_files_dec(file);
++ file->f_xid = 0;
+ file_kill(file);
+ file->f_path.dentry = NULL;
+ file->f_path.mnt = NULL;
+@@ -240,6 +246,8 @@ void put_filp(struct file *file)
{
- struct file_lock *fl;
- struct file_lock *new_fl = NULL;
-@@ -821,7 +835,11 @@ static int __posix_lock_file_conf(struct
- (request->fl_type != F_UNLCK ||
- request->fl_start != 0 || request->fl_end != OFFSET_MAX)) {
- new_fl = locks_alloc_lock();
-+ new_fl->fl_xid = xid;
-+ vx_locks_inc(new_fl);
- new_fl2 = locks_alloc_lock();
-+ new_fl2->fl_xid = xid;
-+ vx_locks_inc(new_fl2);
+ if (atomic_dec_and_test(&file->f_count)) {
+ security_file_free(file);
++ vx_files_dec(file);
++ file->f_xid = 0;
+ file_kill(file);
+ file_free(file);
}
+--- linux-2.6.20/fs/hfsplus/ioctl.c 2006-11-30 21:19:25 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/hfsplus/ioctl.c 2007-02-06 03:05:22 +0100
+@@ -16,6 +16,7 @@
+ #include <linux/fs.h>
+ #include <linux/sched.h>
+ #include <linux/xattr.h>
++#include <linux/mount.h>
+ #include <asm/uaccess.h>
+ #include "hfsplus_fs.h"
- lock_kernel();
-@@ -1018,7 +1036,8 @@ static int __posix_lock_file_conf(struct
- */
- int posix_lock_file(struct file *filp, struct file_lock *fl)
- {
-- return __posix_lock_file_conf(filp->f_dentry->d_inode, fl, NULL);
-+ return __posix_lock_file_conf(filp->f_dentry->d_inode,
-+ fl, NULL, filp->f_xid);
- }
- EXPORT_SYMBOL(posix_lock_file);
-
-@@ -1033,7 +1052,8 @@ EXPORT_SYMBOL(posix_lock_file);
- int posix_lock_file_conf(struct file *filp, struct file_lock *fl,
- struct file_lock *conflock)
- {
-- return __posix_lock_file_conf(filp->f_dentry->d_inode, fl, conflock);
-+ return __posix_lock_file_conf(filp->f_dentry->d_inode,
-+ fl, conflock, filp->f_xid);
- }
- EXPORT_SYMBOL(posix_lock_file_conf);
-
-@@ -1123,7 +1143,7 @@ int locks_mandatory_area(int read_write,
- fl.fl_end = offset + count - 1;
+@@ -35,7 +36,8 @@ int hfsplus_ioctl(struct inode *inode, s
+ flags |= FS_NODUMP_FL; /* EXT2_NODUMP_FL */
+ return put_user(flags, (int __user *)arg);
+ case HFSPLUS_IOC_EXT2_SETFLAGS: {
+- if (IS_RDONLY(inode))
++ if (IS_RDONLY(inode) ||
++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
+ return -EROFS;
- for (;;) {
-- error = __posix_lock_file_conf(inode, &fl, NULL);
-+ error = __posix_lock_file_conf(inode, &fl, NULL, filp->f_xid);
- if (error != -EAGAIN)
- break;
- if (!(fl.fl_flags & FL_SLEEP))
-@@ -1685,6 +1705,9 @@ int fcntl_setlk(unsigned int fd, struct
- if (file_lock == NULL)
- return -ENOLCK;
+ if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
+--- linux-2.6.20/fs/inode.c 2007-02-06 03:01:22 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/inode.c 2007-02-06 03:05:22 +0100
+@@ -115,6 +115,9 @@ static struct inode *alloc_inode(struct
+ struct address_space * const mapping = &inode->i_data;
-+ file_lock->fl_xid = filp->f_xid;
-+ vx_locks_inc(file_lock);
+ inode->i_sb = sb;
+
- /*
- * This might block, so we do it before checking the inode.
- */
-@@ -1828,6 +1851,9 @@ int fcntl_setlk64(unsigned int fd, struc
- if (file_lock == NULL)
- return -ENOLCK;
++ /* essential because of inode slab reuse */
++ inode->i_tag = 0;
+ inode->i_blkbits = sb->s_blocksize_bits;
+ inode->i_flags = 0;
+ atomic_set(&inode->i_count, 1);
+@@ -233,6 +236,8 @@ void __iget(struct inode * inode)
+ inodes_stat.nr_unused--;
+ }
-+ file_lock->fl_xid = filp->f_xid;
-+ vx_locks_inc(file_lock);
-+
- /*
- * This might block, so we do it before checking the inode.
- */
-@@ -2123,6 +2149,10 @@ int get_locks_status(char *buffer, char
- list_for_each(tmp, &file_lock_list) {
- struct list_head *btmp;
- struct file_lock *fl = list_entry(tmp, struct file_lock, fl_link);
-+
-+ if (!vx_check(fl->fl_xid, VX_IDENT|VX_WATCH))
-+ continue;
++EXPORT_SYMBOL_GPL(__iget);
+
- lock_get_status(q, fl, ++i, "");
- move_lock_status(&q, &pos, offset);
-
---- linux-2.6.18.5/fs/namei.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/namei.c 2006-11-21 10:50:41 +0100
-@@ -32,6 +32,9 @@
- #include <linux/file.h>
- #include <linux/fcntl.h>
- #include <linux/namei.h>
+ /**
+ * clear_inode - clear an inode
+ * @inode: inode to clear
+--- linux-2.6.20/fs/ioctl.c 2007-02-06 03:01:22 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ioctl.c 2007-02-06 03:05:22 +0100
+@@ -12,10 +12,19 @@
+ #include <linux/fs.h>
+ #include <linux/security.h>
+ #include <linux/module.h>
+#include <linux/proc_fs.h>
+#include <linux/vserver/inode.h>
-+#include <linux/vserver/debug.h>
- #include <asm/namei.h>
- #include <asm/uaccess.h>
++#include <linux/vs_tag.h>
-@@ -225,6 +228,31 @@ int generic_permission(struct inode *ino
- return -EACCES;
- }
+ #include <asm/uaccess.h>
+ #include <asm/ioctls.h>
-+static inline int vx_barrier(struct inode *inode)
-+{
-+ if (IS_BARRIER(inode) && !vx_check(0, VX_ADMIN|VX_WATCH)) {
-+ vxwprintk(1, "xid=%d did hit the barrier.",
-+ vx_current_xid());
-+ return 1;
-+ }
-+ return 0;
-+}
-+
-+static inline int xid_permission(struct inode *inode, int mask, struct nameidata *nd)
-+{
-+ if (vx_barrier(inode))
-+ return -EACCES;
-+ if (inode->i_xid == 0)
-+ return 0;
-+ if (vx_check(inode->i_xid, VX_ADMIN|VX_WATCH|VX_IDENT))
-+ return 0;
+
-+ vxwprintk(1, "xid=%d denied access to %p[#%d,%lu] »%s«.",
-+ vx_current_xid(), inode, inode->i_xid, inode->i_ino,
-+ vxd_cond_path(nd));
-+ return -EACCES;
-+}
++#ifdef CONFIG_VSERVER_LEGACY
++extern int vx_proc_ioctl(struct inode *, struct file *,
++ unsigned int, unsigned long);
++#endif
+
- int permission(struct inode *inode, int mask, struct nameidata *nd)
- {
- umode_t mode = inode->i_mode;
-@@ -235,7 +263,7 @@ int permission(struct inode *inode, int
- /*
- * Nobody gets write access to a read-only fs.
- */
-- if (IS_RDONLY(inode) &&
-+ if ((IS_RDONLY(inode) || (nd && MNT_IS_RDONLY(nd->mnt))) &&
- (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)))
- return -EROFS;
-
-@@ -256,6 +284,8 @@ int permission(struct inode *inode, int
-
- /* Ordinary permission routines do not understand MAY_APPEND. */
- submask = mask & ~MAY_APPEND;
-+ if ((retval = xid_permission(inode, mask, nd)))
-+ return retval;
- if (inode->i_op && inode->i_op->permission)
- retval = inode->i_op->permission(inode, submask, nd);
- else
-@@ -410,6 +440,8 @@ static int exec_permission_lite(struct i
- {
- umode_t mode = inode->i_mode;
-
-+ if (vx_barrier(inode))
-+ return -EACCES;
- if (inode->i_op && inode->i_op->permission)
- return -EAGAIN;
-
-@@ -712,7 +744,8 @@ static __always_inline void follow_dotdo
- if (nd->dentry == current->fs->root &&
- nd->mnt == current->fs->rootmnt) {
- read_unlock(¤t->fs->lock);
-- break;
-+ /* for sane '/' avoid follow_mount() */
-+ return;
- }
- read_unlock(¤t->fs->lock);
- spin_lock(&dcache_lock);
-@@ -749,16 +782,34 @@ static int do_lookup(struct nameidata *n
+ static long do_ioctl(struct file *filp, unsigned int cmd,
+ unsigned long arg)
{
- struct vfsmount *mnt = nd->mnt;
- struct dentry *dentry = __d_lookup(nd->dentry, name);
-+ struct inode *inode;
-
- if (!dentry)
- goto need_lookup;
- if (dentry->d_op && dentry->d_op->d_revalidate)
- goto need_revalidate;
-+ inode = dentry->d_inode;
-+ if (!inode)
-+ goto done;
-+ if (!vx_check(inode->i_xid, VX_WATCH|VX_ADMIN|VX_HOSTID|VX_IDENT))
-+ goto hidden;
-+ if (inode->i_sb->s_magic == PROC_SUPER_MAGIC) {
-+ struct proc_dir_entry *de = PDE(inode);
+@@ -146,6 +155,48 @@ int vfs_ioctl(struct file *filp, unsigne
+ else
+ error = -ENOTTY;
+ break;
++#ifdef CONFIG_VSERVER_LEGACY
++#ifndef CONFIG_TAGGING_NONE
++ case FIOC_GETTAG: {
++ struct inode *inode = filp->f_dentry->d_inode;
+
-+ if (de && !vx_hide_check(0, de->vx_flags))
-+ goto hidden;
-+ }
- done:
- path->mnt = mnt;
- path->dentry = dentry;
- __follow_mount(path);
- return 0;
-+hidden:
-+ vxwprintk(1, "xid=%d did lookup hidden %p[#%d,%lu] »%s«.",
-+ vx_current_xid(), inode, inode->i_xid, inode->i_ino,
-+ vxd_path(dentry, mnt));
-+ dput(dentry);
-+ return -ENOENT;
++ /* fixme: if stealth, return -ENOTTY */
++ error = -EPERM;
++ if (capable(CAP_CONTEXT))
++ error = put_user(inode->i_tag, (int __user *) arg);
++ break;
++ }
++ case FIOC_SETTAG: {
++ struct inode *inode = filp->f_dentry->d_inode;
++ int tag;
++
++ /* fixme: if stealth, return -ENOTTY */
++ error = -EPERM;
++ if (!capable(CAP_CONTEXT))
++ break;
++ error = -EROFS;
++ if (IS_RDONLY(inode))
++ break;
++ error = -ENOSYS;
++ if (!(inode->i_sb->s_flags & MS_TAGGED))
++ break;
++ error = -EFAULT;
++ if (get_user(tag, (int __user *) arg))
++ break;
++ error = 0;
++ inode->i_tag = (tag & 0xFFFF);
++ inode->i_ctime = CURRENT_TIME;
++ mark_inode_dirty(inode);
++ break;
++ }
++#endif
++ case FIOC_GETXFLG:
++ case FIOC_SETXFLG:
++ error = -ENOTTY;
++ if (filp->f_dentry->d_inode->i_sb->s_magic == PROC_SUPER_MAGIC)
++ error = vx_proc_ioctl(filp->f_dentry->d_inode, filp, cmd, arg);
++ break;
++#endif
+ default:
+ if (S_ISREG(filp->f_path.dentry->d_inode->i_mode))
+ error = file_ioctl(filp, cmd, arg);
+--- linux-2.6.20/fs/ioprio.c 2006-11-30 21:19:25 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ioprio.c 2007-02-06 03:05:22 +0100
+@@ -25,6 +25,7 @@
+ #include <linux/capability.h>
+ #include <linux/syscalls.h>
+ #include <linux/security.h>
++#include <linux/vs_base.h>
- need_lookup:
- dentry = real_lookup(nd->dentry, name, nd);
-@@ -1356,7 +1407,8 @@ static inline int check_sticky(struct in
- * 10. We don't allow removal of NFS sillyrenamed files; it's handled by
- * nfs_async_unlink().
- */
--static int may_delete(struct inode *dir,struct dentry *victim,int isdir)
-+static int may_delete(struct inode *dir, struct dentry *victim,
-+ int isdir, struct nameidata *nd)
+ static int set_task_ioprio(struct task_struct *task, int ioprio)
{
- int error;
+@@ -109,7 +110,7 @@ asmlinkage long sys_ioprio_set(int which
+ if (!who)
+ user = current->user;
+ else
+- user = find_user(who);
++ user = find_user(vx_current_xid(), who);
-@@ -1366,13 +1418,13 @@ static int may_delete(struct inode *dir,
- BUG_ON(victim->d_parent->d_inode != dir);
- audit_inode_child(victim->d_name.name, victim->d_inode, dir);
+ if (!user)
+ break;
+@@ -197,7 +198,7 @@ asmlinkage long sys_ioprio_get(int which
+ if (!who)
+ user = current->user;
+ else
+- user = find_user(who);
++ user = find_user(vx_current_xid(), who);
-- error = permission(dir,MAY_WRITE | MAY_EXEC, NULL);
-+ error = permission(dir,MAY_WRITE | MAY_EXEC, nd);
- if (error)
- return error;
- if (IS_APPEND(dir))
- return -EPERM;
- if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)||
-- IS_IMMUTABLE(victim->d_inode))
-+ IS_IXORUNLINK(victim->d_inode))
- return -EPERM;
- if (isdir) {
- if (!S_ISDIR(victim->d_inode->i_mode))
-@@ -1519,7 +1571,8 @@ int may_open(struct nameidata *nd, int a
- return -EACCES;
+ if (!user)
+ break;
+--- linux-2.6.20/fs/jfs/acl.c 2006-11-30 21:19:25 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/jfs/acl.c 2007-02-06 03:05:22 +0100
+@@ -232,7 +232,8 @@ int jfs_setattr(struct dentry *dentry, s
+ return rc;
- flag &= ~O_TRUNC;
-- } else if (IS_RDONLY(inode) && (flag & FMODE_WRITE))
-+ } else if ((IS_RDONLY(inode) || MNT_IS_RDONLY(nd->mnt))
-+ && (flag & FMODE_WRITE))
- return -EROFS;
- /*
- * An append-only file must be opened in append mode for writing.
-@@ -1801,9 +1854,10 @@ fail:
- }
- EXPORT_SYMBOL_GPL(lookup_create);
+ 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))
+ return -EDQUOT;
+ }
+--- linux-2.6.20/fs/jfs/file.c 2006-11-30 21:19:25 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/jfs/file.c 2007-02-06 03:05:22 +0100
+@@ -98,6 +98,7 @@ struct inode_operations jfs_file_inode_o
+ .setattr = jfs_setattr,
+ .permission = jfs_permission,
+ #endif
++ .sync_flags = jfs_sync_flags,
+ };
--int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
-+int vfs_mknod(struct inode *dir, struct dentry *dentry,
-+ int mode, dev_t dev, struct nameidata *nd)
- {
-- int error = may_create(dir, dentry, NULL);
-+ int error = may_create(dir, dentry, nd);
+ const struct file_operations jfs_file_operations = {
+@@ -109,6 +110,7 @@ const struct file_operations jfs_file_op
+ .aio_write = generic_file_aio_write,
+ .mmap = generic_file_mmap,
+ .sendfile = generic_file_sendfile,
++ .sendpage = generic_file_sendpage,
+ .splice_read = generic_file_splice_read,
+ .splice_write = generic_file_splice_write,
+ .fsync = jfs_fsync,
+--- linux-2.6.20/fs/jfs/inode.c 2006-11-30 21:19:25 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/jfs/inode.c 2007-02-06 03:05:22 +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"
+@@ -144,6 +145,7 @@ void jfs_delete_inode(struct inode *inod
+ DQUOT_INIT(inode);
+ DQUOT_FREE_INODE(inode);
+ DQUOT_DROP(inode);
++ DLIMIT_FREE_INODE(inode);
+ }
- if (error)
- return error;
-@@ -1853,11 +1907,12 @@ asmlinkage long sys_mknodat(int dfd, con
- error = vfs_create(nd.dentry->d_inode,dentry,mode,&nd);
- break;
- case S_IFCHR: case S_IFBLK:
-- error = vfs_mknod(nd.dentry->d_inode,dentry,mode,
-- new_decode_dev(dev));
-+ error = vfs_mknod(nd.dentry->d_inode, dentry, mode,
-+ new_decode_dev(dev), &nd);
- break;
- case S_IFIFO: case S_IFSOCK:
-- error = vfs_mknod(nd.dentry->d_inode,dentry,mode,0);
-+ error = vfs_mknod(nd.dentry->d_inode, dentry, mode,
-+ 0, &nd);
- break;
- case S_IFDIR:
- error = -EPERM;
-@@ -1880,9 +1935,10 @@ asmlinkage long sys_mknod(const char __u
- return sys_mknodat(AT_FDCWD, filename, mode, dev);
- }
+ clear_inode(inode);
+--- linux-2.6.20/fs/jfs/ioctl.c 2007-02-06 03:01:24 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/jfs/ioctl.c 2007-02-06 03:13:33 +0100
+@@ -10,6 +10,7 @@
+ #include <linux/capability.h>
+ #include <linux/time.h>
+ #include <linux/sched.h>
++#include <linux/mount.h>
+ #include <asm/current.h>
+ #include <asm/uaccess.h>
--int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
-+int vfs_mkdir(struct inode *dir, struct dentry *dentry,
-+ int mode, struct nameidata *nd)
- {
-- int error = may_create(dir, dentry, NULL);
-+ int error = may_create(dir, dentry, nd);
+@@ -65,7 +66,8 @@ int jfs_ioctl(struct inode * inode, stru
+ case JFS_IOC_SETFLAGS: {
+ unsigned int oldflags;
- if (error)
- return error;
-@@ -1921,7 +1977,8 @@ asmlinkage long sys_mkdirat(int dfd, con
- if (!IS_ERR(dentry)) {
- if (!IS_POSIXACL(nd.dentry->d_inode))
- mode &= ~current->fs->umask;
-- error = vfs_mkdir(nd.dentry->d_inode, dentry, mode);
-+ error = vfs_mkdir(nd.dentry->d_inode, dentry,
-+ mode, &nd);
- dput(dentry);
+- if (IS_RDONLY(inode))
++ if (IS_RDONLY(inode) ||
++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
+ return -EROFS;
+
+ if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
+@@ -85,8 +87,8 @@ int jfs_ioctl(struct inode * inode, stru
+ * the relevant capability.
+ */
+ if ((oldflags & JFS_IMMUTABLE_FL) ||
+- ((flags ^ oldflags) &
+- (JFS_APPEND_FL | JFS_IMMUTABLE_FL))) {
++ ((flags ^ oldflags) & (JFS_APPEND_FL |
++ JFS_IMMUTABLE_FL | JFS_IUNLINK_FL))) {
+ if (!capable(CAP_LINUX_IMMUTABLE))
+ return -EPERM;
}
- mutex_unlock(&nd.dentry->d_inode->i_mutex);
-@@ -1966,9 +2023,10 @@ void dentry_unhash(struct dentry *dentry
- spin_unlock(&dcache_lock);
- }
+--- linux-2.6.20/fs/jfs/jfs_dinode.h 2006-11-30 21:19:25 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/jfs/jfs_dinode.h 2007-02-06 03:05:22 +0100
+@@ -162,9 +162,12 @@ struct dinode {
+ #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
+ #define JFS_IMMUTABLE_FL 0x02000000 /* Immutable file */
--int vfs_rmdir(struct inode *dir, struct dentry *dentry)
-+int vfs_rmdir(struct inode *dir, struct dentry *dentry,
-+ struct nameidata *nd)
- {
-- int error = may_delete(dir, dentry, 1);
-+ int error = may_delete(dir, dentry, 1, nd);
+-#define JFS_FL_USER_VISIBLE 0x03F80000
++#define JFS_BARRIER_FL 0x04000000 /* Barrier for chroot() */
++#define JFS_IUNLINK_FL 0x08000000 /* Immutable unlink */
++
++#define JFS_FL_USER_VISIBLE 0x0FF80000
+ #define JFS_FL_USER_MODIFIABLE 0x03F80000
+-#define JFS_FL_INHERIT 0x03C80000
++#define JFS_FL_INHERIT 0x0BC80000
- if (error)
- return error;
-@@ -2029,7 +2087,7 @@ static long do_rmdir(int dfd, const char
- dentry = lookup_hash(&nd);
- error = PTR_ERR(dentry);
- if (!IS_ERR(dentry)) {
-- error = vfs_rmdir(nd.dentry->d_inode, dentry);
-+ error = vfs_rmdir(nd.dentry->d_inode, dentry, &nd);
- dput(dentry);
- }
- mutex_unlock(&nd.dentry->d_inode->i_mutex);
-@@ -2045,9 +2103,10 @@ asmlinkage long sys_rmdir(const char __u
- return do_rmdir(AT_FDCWD, pathname);
- }
+ /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
+ #define JFS_IOC_GETFLAGS _IOR('f', 1, long)
+--- linux-2.6.20/fs/jfs/jfs_dtree.c 2007-02-06 03:01:24 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/jfs/jfs_dtree.c 2007-02-06 03:05:22 +0100
+@@ -102,6 +102,7 @@
--int vfs_unlink(struct inode *dir, struct dentry *dentry)
-+int vfs_unlink(struct inode *dir, struct dentry *dentry,
-+ struct nameidata *nd)
- {
-- int error = may_delete(dir, dentry, 0);
-+ int error = may_delete(dir, dentry, 0, nd);
+ #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;
- if (error)
- return error;
-@@ -2109,7 +2168,7 @@ static long do_unlinkat(int dfd, const c
- inode = dentry->d_inode;
- if (inode)
- atomic_inc(&inode->i_count);
-- error = vfs_unlink(nd.dentry->d_inode, dentry);
-+ error = vfs_unlink(nd.dentry->d_inode, dentry, &nd);
- exit2:
- dput(dentry);
- }
-@@ -2144,9 +2203,10 @@ asmlinkage long sys_unlink(const char __
- return do_unlinkat(AT_FDCWD, pathname);
- }
+ /*
+ * Save the table, we're going to overwrite it with the
+@@ -479,6 +480,12 @@ static u32 add_index(tid_t tid, struct i
--int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname, int mode)
-+int vfs_symlink(struct inode *dir, struct dentry *dentry,
-+ const char *oldname, int mode, struct nameidata *nd)
- {
-- int error = may_create(dir, dentry, NULL);
-+ int error = may_create(dir, dentry, nd);
+ return index;
- if (error)
- return error;
-@@ -2187,7 +2247,8 @@ asmlinkage long sys_symlinkat(const char
- dentry = lookup_create(&nd, 0);
- error = PTR_ERR(dentry);
- if (!IS_ERR(dentry)) {
-- error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO);
-+ error = vfs_symlink(nd.dentry->d_inode, dentry,
-+ from, S_IALLUGO, &nd);
- dput(dentry);
- }
- mutex_unlock(&nd.dentry->d_inode->i_mutex);
-@@ -2204,7 +2265,8 @@ asmlinkage long sys_symlink(const char _
- return sys_symlinkat(oldname, AT_FDCWD, newname);
- }
-
--int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_dentry)
-+int vfs_link(struct dentry *old_dentry, struct inode *dir,
-+ struct dentry *new_dentry, struct nameidata *nd)
- {
- struct inode *inode = old_dentry->d_inode;
- int error;
-@@ -2212,7 +2274,7 @@ int vfs_link(struct dentry *old_dentry,
- if (!inode)
- return -ENOENT;
-
-- error = may_create(dir, new_dentry, NULL);
-+ error = may_create(dir, new_dentry, nd);
- if (error)
- return error;
-
-@@ -2222,7 +2284,7 @@ int vfs_link(struct dentry *old_dentry,
- /*
- * A link to an append-only or immutable file cannot be created.
- */
-- if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
-+ if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
- return -EPERM;
- if (!dir->i_op || !dir->i_op->link)
- return -EPERM;
-@@ -2281,7 +2343,8 @@ asmlinkage long sys_linkat(int olddfd, c
- new_dentry = lookup_create(&nd, 0);
- error = PTR_ERR(new_dentry);
- if (!IS_ERR(new_dentry)) {
-- error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
-+ error = vfs_link(old_nd.dentry, nd.dentry->d_inode,
-+ new_dentry, &nd);
- dput(new_dentry);
- }
- mutex_unlock(&nd.dentry->d_inode->i_mutex);
-@@ -2413,14 +2476,14 @@ int vfs_rename(struct inode *old_dir, st
- if (old_dentry->d_inode == new_dentry->d_inode)
- return 0;
-
-- error = may_delete(old_dir, old_dentry, is_dir);
-+ error = may_delete(old_dir, old_dentry, is_dir, NULL);
- if (error)
- return error;
-
- if (!new_dentry->d_inode)
- error = may_create(new_dir, new_dentry, NULL);
- else
-- error = may_delete(new_dir, new_dentry, is_dir);
-+ error = may_delete(new_dir, new_dentry, is_dir, NULL);
- if (error)
- return error;
++ clean_up_dlimit:
++ DLIMIT_FREE_BLOCK(ip, sbi->nbperpage);
++
++ clean_up_dquot:
++ DQUOT_FREE_BLOCK(ip, sbi->nbperpage);
++
+ clean_up:
-@@ -2498,6 +2561,9 @@ static int do_rename(int olddfd, const c
- error = -EINVAL;
- if (old_dentry == trap)
- goto exit4;
-+ error = -EROFS;
-+ if (MNT_IS_RDONLY(newnd.mnt))
-+ goto exit4;
- new_dentry = lookup_hash(&newnd);
- error = PTR_ERR(new_dentry);
- if (IS_ERR(new_dentry))
---- linux-2.6.18.5/fs/namespace.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/namespace.c 2006-09-20 17:01:44 +0200
-@@ -22,6 +22,8 @@
- #include <linux/namei.h>
- #include <linux/security.h>
- #include <linux/mount.h>
-+#include <linux/vserver/namespace.h>
-+#include <linux/vserver/xid.h>
- #include <asm/uaccess.h>
- #include <asm/unistd.h>
- #include "pnode.h"
-@@ -249,6 +251,7 @@ static struct vfsmount *clone_mnt(struct
- mnt->mnt_root = dget(root);
- mnt->mnt_mountpoint = mnt->mnt_root;
- mnt->mnt_parent = mnt;
-+ mnt->mnt_xid = old->mnt_xid;
+ jfs_ip->next_index--;
+@@ -952,6 +959,7 @@ static int dtSplitUp(tid_t tid,
+ struct tlock *tlck;
+ struct lv *lv;
+ int quota_allocation = 0;
++ int dlimit_allocation = 0;
- if (flag & CL_SLAVE) {
- list_add(&mnt->mnt_slave, &old->mnt_slave_list);
-@@ -357,43 +360,85 @@ static inline void mangle(struct seq_fil
- seq_escape(m, s, " \t\n\\");
- }
+ /* get split page */
+ smp = split->mp;
+@@ -1036,6 +1044,12 @@ static int dtSplitUp(tid_t tid,
+ }
+ quota_allocation += n;
-+static int mnt_is_reachable(struct vfsmount *mnt)
-+{
-+ struct vfsmount *root_mnt;
-+ struct dentry *root, *point;
-+ int ret;
-+
-+ if (mnt == mnt->mnt_namespace->root)
-+ return 1;
-+
-+ spin_lock(&dcache_lock);
-+ root_mnt = current->fs->rootmnt;
-+ root = current->fs->root;
-+ point = root;
-+
-+ while ((mnt != mnt->mnt_parent) && (mnt != root_mnt)) {
-+ point = mnt->mnt_mountpoint;
-+ mnt = mnt->mnt_parent;
-+ }
-+
-+ ret = (mnt == root_mnt) && is_subdir(point, root);
-+
-+ spin_unlock(&dcache_lock);
-+
-+ return ret;
-+}
++ if (DLIMIT_ALLOC_BLOCK(ip, n)) {
++ rc = -ENOSPC;
++ goto extendOut;
++ }
++ dlimit_allocation += n;
+
- static int show_vfsmnt(struct seq_file *m, void *v)
- {
- struct vfsmount *mnt = v;
- int err = 0;
- static struct proc_fs_info {
-- int flag;
-- char *str;
-+ int s_flag;
-+ int mnt_flag;
-+ char *set_str;
-+ char *unset_str;
- } fs_info[] = {
-- { MS_SYNCHRONOUS, ",sync" },
-- { MS_DIRSYNC, ",dirsync" },
-- { MS_MANDLOCK, ",mand" },
-- { 0, NULL }
-- };
-- static struct proc_fs_info mnt_info[] = {
-- { MNT_NOSUID, ",nosuid" },
-- { MNT_NODEV, ",nodev" },
-- { MNT_NOEXEC, ",noexec" },
-- { MNT_NOATIME, ",noatime" },
-- { MNT_NODIRATIME, ",nodiratime" },
-- { 0, NULL }
-+ { MS_RDONLY, MNT_RDONLY, "ro", "rw" },
-+ { MS_SYNCHRONOUS, 0, ",sync", NULL },
-+ { MS_DIRSYNC, 0, ",dirsync", NULL },
-+ { MS_MANDLOCK, 0, ",mand", NULL },
-+ { MS_TAGXID, 0, ",tagxid", NULL },
-+ { MS_NOATIME, MNT_NOATIME, ",noatime", NULL },
-+ { MS_NODIRATIME, MNT_NODIRATIME, ",nodiratime", NULL },
-+ { 0, MNT_NOSUID, ",nosuid", NULL },
-+ { 0, MNT_NODEV, ",nodev", NULL },
-+ { 0, MNT_NOEXEC, ",noexec", NULL },
-+ { 0, 0, NULL, NULL }
- };
-- struct proc_fs_info *fs_infop;
-+ struct proc_fs_info *p;
-+ unsigned long s_flags = mnt->mnt_sb->s_flags;
-+ int mnt_flags = mnt->mnt_flags;
+ if ((rc = dbReAlloc(sbi->ipbmap, xaddr, (s64) xlen,
+ (s64) n, &nxaddr)))
+ goto extendOut;
+@@ -1309,6 +1323,9 @@ static int dtSplitUp(tid_t tid,
+ freeKeyName:
+ kfree(key.name);
-- mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none");
-- seq_putc(m, ' ');
-- seq_path(m, mnt, mnt->mnt_root, " \t\n\\");
-- seq_putc(m, ' ');
-- mangle(m, mnt->mnt_sb->s_type->name);
-- seq_puts(m, mnt->mnt_sb->s_flags & MS_RDONLY ? " ro" : " rw");
-- for (fs_infop = fs_info; fs_infop->flag; fs_infop++) {
-- if (mnt->mnt_sb->s_flags & fs_infop->flag)
-- seq_puts(m, fs_infop->str);
-+ if (vx_flags(VXF_HIDE_MOUNT, 0))
-+ return 0;
-+ if (!mnt_is_reachable(mnt))
-+ return 0;
-+
-+ if (!vx_check(0, VX_ADMIN|VX_WATCH) &&
-+ mnt == current->fs->rootmnt) {
-+ seq_puts(m, "/dev/root / ");
-+ } else {
-+ mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none");
-+ seq_putc(m, ' ');
-+ seq_path(m, mnt, mnt->mnt_root, " \t\n\\");
-+ seq_putc(m, ' ');
- }
-- for (fs_infop = mnt_info; fs_infop->flag; fs_infop++) {
-- if (mnt->mnt_flags & fs_infop->flag)
-- seq_puts(m, fs_infop->str);
-+ mangle(m, mnt->mnt_sb->s_type->name);
-+ seq_putc(m, ' ');
-+ for (p = fs_info; (p->s_flag | p->mnt_flag) ; p++) {
-+ if ((s_flags & p->s_flag) || (mnt_flags & p->mnt_flag)) {
-+ if (p->set_str)
-+ seq_puts(m, p->set_str);
-+ } else {
-+ if (p->unset_str)
-+ seq_puts(m, p->unset_str);
-+ }
++ /* 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);
+@@ -1376,6 +1393,12 @@ static int dtSplitPage(tid_t tid, struct
+ release_metapage(rmp);
+ return -EDQUOT;
}
-+ if (mnt->mnt_flags & MNT_XID)
-+ seq_printf(m, ",xid=%d", mnt->mnt_xid);
- if (mnt->mnt_sb->s_op->show_options)
- err = mnt->mnt_sb->s_op->show_options(m, mnt);
- seq_puts(m, " 0 0\n");
-@@ -412,17 +457,27 @@ static int show_vfsstat(struct seq_file
- struct vfsmount *mnt = v;
- int err = 0;
++ /* Allocate blocks to dlimit. */
++ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) {
++ DQUOT_FREE_BLOCK(ip, lengthPXD(pxd));
++ release_metapage(rmp);
++ return -ENOSPC;
++ }
-- /* device */
-- if (mnt->mnt_devname) {
-- seq_puts(m, "device ");
-- mangle(m, mnt->mnt_devname);
-- } else
-- seq_puts(m, "no device");
-+ if (vx_flags(VXF_HIDE_MOUNT, 0))
-+ return 0;
-+ if (!mnt_is_reachable(mnt) && !vx_check(0, VX_WATCH))
-+ return 0;
+ jfs_info("dtSplitPage: ip:0x%p smp:0x%p rmp:0x%p", ip, smp, rmp);
-- /* mount point */
-- seq_puts(m, " mounted on ");
-- seq_path(m, mnt, mnt->mnt_root, " \t\n\\");
-- seq_putc(m, ' ');
-+ if (!vx_check(0, VX_ADMIN|VX_WATCH) &&
-+ mnt == current->fs->rootmnt) {
-+ seq_puts(m, "device /dev/root mounted on / ");
-+ } else {
-+ /* device */
-+ if (mnt->mnt_devname) {
-+ seq_puts(m, "device ");
-+ mangle(m, mnt->mnt_devname);
-+ } else
-+ seq_puts(m, "no device");
-+
-+ /* mount point */
-+ seq_puts(m, " mounted on ");
-+ seq_path(m, mnt, mnt->mnt_root, " \t\n\\");
-+ seq_putc(m, ' ');
+@@ -1926,6 +1949,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;
+ }
- /* file system type */
- seq_puts(m, "with fstype ");
-@@ -652,7 +707,7 @@ asmlinkage long sys_umount(char __user *
- goto dput_and_out;
+ BT_MARK_DIRTY(rmp, ip);
+ /*
+@@ -2292,6 +2321,8 @@ static int dtDeleteUp(tid_t tid, struct
- retval = -EPERM;
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
- goto dput_and_out;
+ xlen = lengthPXD(&fp->header.self);
- retval = do_umount(nd.mnt, flags);
-@@ -676,7 +731,7 @@ asmlinkage long sys_oldumount(char __use
++ /* Free dlimit allocation. */
++ DLIMIT_FREE_BLOCK(ip, xlen);
+ /* Free quota allocation. */
+ DQUOT_FREE_BLOCK(ip, xlen);
- static int mount_is_safe(struct nameidata *nd)
- {
-- if (capable(CAP_SYS_ADMIN))
-+ if (vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
- return 0;
- return -EPERM;
- #ifdef notyet
-@@ -905,11 +960,13 @@ static int do_change_type(struct nameida
- /*
- * do loopback mount.
- */
--static int do_loopback(struct nameidata *nd, char *old_name, int recurse)
-+static int do_loopback(struct nameidata *nd, char *old_name, xid_t xid,
-+ unsigned long flags, int mnt_flags)
- {
- struct nameidata old_nd;
- struct vfsmount *mnt = NULL;
- int err = mount_is_safe(nd);
-+ int recurse = flags & MS_REC;
- if (err)
- return err;
- if (!old_name || !*old_name)
-@@ -935,6 +992,12 @@ static int do_loopback(struct nameidata
- if (!mnt)
- goto out;
-
-+ mnt->mnt_flags = mnt_flags;
-+ if (flags & MS_XID) {
-+ mnt->mnt_xid = xid;
-+ mnt->mnt_flags |= MNT_XID;
-+ }
-+
- err = graft_tree(mnt, nd);
- if (err) {
- LIST_HEAD(umount_list);
-@@ -943,6 +1006,7 @@ static int do_loopback(struct nameidata
- spin_unlock(&vfsmount_lock);
- release_mounts(&umount_list);
- }
-+ mnt->mnt_flags = mnt_flags;
+@@ -2368,6 +2399,8 @@ static int dtDeleteUp(tid_t tid, struct
- out:
- up_write(&namespace_sem);
-@@ -956,12 +1020,12 @@ out:
- * on it - tough luck.
- */
- static int do_remount(struct nameidata *nd, int flags, int mnt_flags,
-- void *data)
-+ void *data, xid_t xid)
- {
- int err;
- struct super_block *sb = nd->mnt->mnt_sb;
-
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_REMOUNT))
- return -EPERM;
-
- if (!check_mnt(nd->mnt))
-@@ -995,7 +1059,7 @@ static int do_move_mount(struct nameidat
- struct nameidata old_nd, parent_nd;
- struct vfsmount *p;
- int err = 0;
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
- return -EPERM;
- if (!old_name || !*old_name)
- return -EINVAL;
-@@ -1075,7 +1139,7 @@ static int do_new_mount(struct nameidata
- return -EINVAL;
+ xlen = lengthPXD(&p->header.self);
- /* we need capabilities... */
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
- return -EPERM;
++ /* Free dlimit allocation */
++ DLIMIT_FREE_BLOCK(ip, xlen);
+ /* Free quota allocation */
+ DQUOT_FREE_BLOCK(ip, xlen);
- mnt = do_kern_mount(type, flags, name, data);
-@@ -1387,6 +1451,7 @@ long do_mount(char *dev_name, char *dir_
- struct nameidata nd;
- int retval = 0;
- int mnt_flags = 0;
-+ xid_t xid = 0;
+--- linux-2.6.20/fs/jfs/jfs_extent.c 2006-11-30 21:19:25 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/jfs/jfs_extent.c 2007-02-06 03:05:22 +0100
+@@ -18,6 +18,7 @@
- /* Discard magic */
- if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-@@ -1402,7 +1467,17 @@ long do_mount(char *dev_name, char *dir_
- if (data_page)
- ((char *)data_page)[PAGE_SIZE - 1] = 0;
+ #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;
+ }
-+ retval = vx_parse_xid(data_page, &xid, 1);
-+ if (retval) {
-+ mnt_flags |= MNT_XID;
-+ /* bind and re-mounts get xid flag */
-+ if (flags & (MS_BIND|MS_REMOUNT))
-+ flags |= MS_XID;
++ /* 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;
+ }
+
- /* Separate the per-mountpoint flags */
-+ if (flags & MS_RDONLY)
-+ mnt_flags |= MNT_RDONLY;
- if (flags & MS_NOSUID)
- mnt_flags |= MNT_NOSUID;
- if (flags & MS_NODEV)
-@@ -1414,6 +1489,8 @@ long do_mount(char *dev_name, char *dir_
- if (flags & MS_NODIRATIME)
- mnt_flags |= MNT_NODIRATIME;
-
-+ if (!capable(CAP_SYS_ADMIN))
-+ mnt_flags |= MNT_NODEV;
- flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE |
- MS_NOATIME | MS_NODIRATIME);
-
-@@ -1428,9 +1505,9 @@ long do_mount(char *dev_name, char *dir_
-
- if (flags & MS_REMOUNT)
- retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
-- data_page);
-+ data_page, xid);
- else if (flags & MS_BIND)
-- retval = do_loopback(&nd, dev_name, flags & MS_REC);
-+ retval = do_loopback(&nd, dev_name, xid, flags, mnt_flags);
- else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
- retval = do_change_type(&nd, flags);
- else if (flags & MS_MOVE)
-@@ -1528,7 +1605,7 @@ int copy_namespace(int flags, struct tas
- if (!(flags & CLONE_NEWNS))
- return 0;
+ /* determine the value of the extent flag */
+ xflag = abnr ? XAD_NOTRECORDED : 0;
-- if (!capable(CAP_SYS_ADMIN)) {
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT)) {
- err = -EPERM;
- goto out;
+@@ -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;
}
---- linux-2.6.18.5/fs/nfs/dir.c 2006-12-04 06:13:51 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/nfs/dir.c 2006-11-06 04:47:17 +0100
-@@ -28,9 +28,11 @@
- #include <linux/sunrpc/clnt.h>
- #include <linux/nfs_fs.h>
- #include <linux/nfs_mount.h>
-+#include <linux/mount.h>
- #include <linux/pagemap.h>
- #include <linux/smp_lock.h>
- #include <linux/namei.h>
-+#include <linux/vserver/xid.h>
-
- #include "nfs4_fs.h"
- #include "delegation.h"
-@@ -928,6 +930,7 @@ static struct dentry *nfs_lookup(struct
- res = (struct dentry *)inode;
- if (IS_ERR(res))
- goto out_unlock;
-+ vx_propagate_xid(nd, inode);
- no_entry:
- res = d_add_unique(dentry, inode);
- if (res != NULL)
-@@ -961,7 +964,8 @@ static int is_atomic_open(struct inode *
- if (nd->flags & LOOKUP_DIRECTORY)
- return 0;
- /* Are we trying to write to a read only partition? */
-- if (IS_RDONLY(dir) && (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE)))
-+ if ((IS_RDONLY(dir) || MNT_IS_RDONLY(nd->mnt)) &&
-+ (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE)))
- return 0;
- return 1;
- }
---- linux-2.6.18.5/fs/nfs/inode.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/nfs/inode.c 2006-09-21 01:31:36 +0200
-@@ -37,6 +37,7 @@
- #include <linux/vfs.h>
- #include <linux/inet.h>
- #include <linux/nfs_xdr.h>
-+#include <linux/vserver/xid.h>
++ /* 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;
++ }
- #include <asm/system.h>
- #include <asm/uaccess.h>
-@@ -275,8 +276,10 @@ nfs_fhget(struct super_block *sb, struct
- nfsi->change_attr = fattr->change_attr;
- inode->i_size = nfs_size_to_loff_t(fattr->size);
- inode->i_nlink = fattr->nlink;
-- inode->i_uid = fattr->uid;
-- inode->i_gid = fattr->gid;
-+ inode->i_uid = INOXID_UID(XID_TAG(inode), fattr->uid, fattr->gid);
-+ inode->i_gid = INOXID_GID(XID_TAG(inode), fattr->uid, fattr->gid);
-+ inode->i_xid = INOXID_XID(XID_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
-@@ -367,6 +370,8 @@ void nfs_setattr_update_inode(struct ino
- inode->i_uid = attr->ia_uid;
- if ((attr->ia_valid & ATTR_GID) != 0)
- inode->i_gid = attr->ia_gid;
-+ if ((attr->ia_valid & ATTR_XID) && IS_TAGXID(inode))
-+ inode->i_xid = attr->ia_xid;
- spin_lock(&inode->i_lock);
- NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
- spin_unlock(&inode->i_lock);
-@@ -769,6 +774,9 @@ static int nfs_check_inode_attributes(st
- struct nfs_inode *nfsi = NFS_I(inode);
- loff_t cur_size, new_isize;
- int data_unstable;
-+ uid_t uid;
-+ gid_t gid;
-+ xid_t xid;
+ 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;
+ }
+--- linux-2.6.20/fs/jfs/jfs_filsys.h 2007-02-06 03:01:24 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/jfs/jfs_filsys.h 2007-02-06 03:05:22 +0100
+@@ -264,6 +264,7 @@
+ #define JFS_NAME_MAX 255
+ #define JFS_PATH_MAX BPSIZE
- /* Has the inode gone and changed behind our back? */
-@@ -796,10 +804,15 @@ static int nfs_check_inode_attributes(st
- if (cur_size != new_isize && nfsi->npages == 0)
- nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
++#define JFS_TAGGED 0x00800000 /* Context Tagging */
-+ uid = INOXID_UID(XID_TAG(inode), fattr->uid, fattr->gid);
-+ gid = INOXID_GID(XID_TAG(inode), fattr->uid, fattr->gid);
-+ xid = INOXID_XID(XID_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_xid != xid)
- nfsi->cache_validity |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
+ /*
+ * file system state (superblock state)
+--- linux-2.6.20/fs/jfs/jfs_imap.c 2007-02-06 03:01:24 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/jfs/jfs_imap.c 2007-02-06 03:05:22 +0100
+@@ -45,6 +45,7 @@
+ #include <linux/buffer_head.h>
+ #include <linux/pagemap.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
- /* Has the link count changed? */
-@@ -883,6 +896,9 @@ static int nfs_update_inode(struct inode
- loff_t cur_isize, new_isize;
- unsigned int invalid = 0;
- int data_stable;
+ #include "jfs_incore.h"
+ #include "jfs_inode.h"
+@@ -3075,6 +3076,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);
+ uid_t uid;
+ gid_t gid;
-+ xid_t xid;
- dfprintk(VFS, "NFS: %s(%s/%ld ct=%d info=0x%x)\n",
- __FUNCTION__, inode->i_sb->s_id, inode->i_ino,
-@@ -955,15 +971,21 @@ static int nfs_update_inode(struct inode
+ jfs_ip->fileset = le32_to_cpu(dip->di_fileset);
+ jfs_ip->mode2 = le32_to_cpu(dip->di_mode);
+@@ -3094,14 +3097,18 @@ static int copy_from_dinode(struct dinod
}
- memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
+ ip->i_nlink = le32_to_cpu(dip->di_nlink);
-+ uid = INOXID_UID(XID_TAG(inode), fattr->uid, fattr->gid);
-+ gid = INOXID_GID(XID_TAG(inode), fattr->uid, fattr->gid);
-+ xid = INOXID_XID(XID_TAG(inode), fattr->uid, fattr->gid, 0);
+- jfs_ip->saved_uid = le32_to_cpu(dip->di_uid);
++ uid = le32_to_cpu(dip->di_uid);
++ gid = le32_to_cpu(dip->di_gid);
++ ip->i_tag = INOTAG_TAG(DX_TAG(ip), uid, 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_xid != xid)
- invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
-
- 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_xid = xid;
++ jfs_ip->saved_uid = INOTAG_UID(DX_TAG(ip), uid, gid);
+ if (sbi->uid == -1)
+ ip->i_uid = jfs_ip->saved_uid;
+ else {
+ ip->i_uid = sbi->uid;
+ }
- if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
- /*
---- linux-2.6.18.5/fs/nfs/nfs3xdr.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/nfs/nfs3xdr.c 2006-09-20 19:47:41 +0200
-@@ -22,6 +22,7 @@
- #include <linux/nfs3.h>
- #include <linux/nfs_fs.h>
- #include <linux/nfsacl.h>
-+#include <linux/vserver/xid.h>
- #include "internal.h"
-
- #define NFSDBG_FACILITY NFSDBG_XDR
-@@ -178,7 +179,7 @@ xdr_decode_fattr(u32 *p, struct nfs_fatt
- }
+- jfs_ip->saved_gid = le32_to_cpu(dip->di_gid);
++ jfs_ip->saved_gid = INOTAG_GID(DX_TAG(ip), uid, gid);
+ if (sbi->gid == -1)
+ ip->i_gid = jfs_ip->saved_gid;
+ else {
+@@ -3166,14 +3173,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);
+- if (sbi->uid == -1)
+- dip->di_uid = cpu_to_le32(ip->i_uid);
+- else
+- dip->di_uid = cpu_to_le32(jfs_ip->saved_uid);
+- if (sbi->gid == -1)
+- dip->di_gid = cpu_to_le32(ip->i_gid);
+- else
+- dip->di_gid = cpu_to_le32(jfs_ip->saved_gid);
++
++ dip->di_uid = cpu_to_le32(TAGINO_UID(DX_TAG(ip),
++ (sbi->uid == -1) ? ip->i_uid : jfs_ip->saved_uid, ip->i_tag));
++ dip->di_gid = cpu_to_le32(TAGINO_GID(DX_TAG(ip),
++ (sbi->gid == -1) ? ip->i_gid : jfs_ip->saved_gid, ip->i_tag));
++
+ /*
+ * mode2 is only needed for storing the higher order bits.
+ * Trust i_mode for the lower order ones
+--- linux-2.6.20/fs/jfs/jfs_inode.c 2006-11-30 21:19:25 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/jfs/jfs_inode.c 2007-02-06 03:05:22 +0100
+@@ -18,6 +18,8 @@
- static inline u32 *
--xdr_encode_sattr(u32 *p, struct iattr *attr)
-+xdr_encode_sattr(u32 *p, struct iattr *attr, int tagxid)
- {
- if (attr->ia_valid & ATTR_MODE) {
- *p++ = xdr_one;
-@@ -186,15 +187,17 @@ xdr_encode_sattr(u32 *p, struct iattr *a
- } else {
- *p++ = xdr_zero;
- }
-- if (attr->ia_valid & ATTR_UID) {
-+ if (attr->ia_valid & ATTR_UID ||
-+ (tagxid && (attr->ia_valid & ATTR_XID))) {
- *p++ = xdr_one;
-- *p++ = htonl(attr->ia_uid);
-+ *p++ = htonl(XIDINO_UID(tagxid, attr->ia_uid, attr->ia_xid));
- } else {
- *p++ = xdr_zero;
- }
-- if (attr->ia_valid & ATTR_GID) {
-+ if (attr->ia_valid & ATTR_GID ||
-+ (tagxid && (attr->ia_valid & ATTR_XID))) {
- *p++ = xdr_one;
-- *p++ = htonl(attr->ia_gid);
-+ *p++ = htonl(XIDINO_GID(tagxid, attr->ia_gid, attr->ia_xid));
- } else {
- *p++ = xdr_zero;
- }
-@@ -279,7 +282,8 @@ static int
- nfs3_xdr_sattrargs(struct rpc_rqst *req, u32 *p, struct nfs3_sattrargs *args)
+ #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,19 +32,47 @@ void jfs_set_inode_flags(struct inode *i
{
- p = xdr_encode_fhandle(p, args->fh);
-- p = xdr_encode_sattr(p, args->sattr);
-+ p = xdr_encode_sattr(p, args->sattr,
-+ req->rq_task->tk_client->cl_tagxid);
- *p++ = htonl(args->guard);
- if (args->guard)
- p = xdr_encode_time3(p, &args->guardtime);
-@@ -370,7 +374,8 @@ nfs3_xdr_createargs(struct rpc_rqst *req
- *p++ = args->verifier[0];
- *p++ = args->verifier[1];
- } else
-- p = xdr_encode_sattr(p, args->sattr);
-+ p = xdr_encode_sattr(p, args->sattr,
-+ req->rq_task->tk_client->cl_tagxid);
+ unsigned int flags = JFS_IP(inode)->mode2;
- req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
- return 0;
-@@ -384,7 +389,8 @@ nfs3_xdr_mkdirargs(struct rpc_rqst *req,
- {
- p = xdr_encode_fhandle(p, args->fh);
- p = xdr_encode_array(p, args->name, args->len);
-- p = xdr_encode_sattr(p, args->sattr);
-+ p = xdr_encode_sattr(p, args->sattr,
-+ req->rq_task->tk_client->cl_tagxid);
- req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
- return 0;
- }
-@@ -397,7 +403,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 = xdr_encode_sattr(p, args->sattr);
-+ p = xdr_encode_sattr(p, args->sattr,
-+ req->rq_task->tk_client->cl_tagxid);
- p = xdr_encode_array(p, args->topath, args->tolen);
- req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
- return 0;
-@@ -412,7 +419,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);
-- p = xdr_encode_sattr(p, args->sattr);
-+ p = xdr_encode_sattr(p, args->sattr,
-+ req->rq_task->tk_client->cl_tagxid);
- if (args->type == NF3CHR || args->type == NF3BLK) {
- *p++ = htonl(MAJOR(args->rdev));
- *p++ = htonl(MINOR(args->rdev));
---- linux-2.6.18.5/fs/nfs/nfsroot.c 2006-02-18 14:40:23 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/nfs/nfsroot.c 2006-09-20 17:01:44 +0200
-@@ -87,6 +87,7 @@
- #include <linux/root_dev.h>
- #include <net/ipconfig.h>
- #include <linux/parser.h>
-+#include <linux/vs_cvirt.h>
+- inode->i_flags &= ~(S_IMMUTABLE | S_APPEND |
+- S_NOATIME | S_DIRSYNC | S_SYNC);
++ inode->i_flags &= ~(S_IMMUTABLE | S_IUNLINK | S_BARRIER |
++ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
- /* Define this to allow debugging output */
- #undef NFSROOT_DEBUG
-@@ -124,7 +125,7 @@ enum {
- Opt_soft, Opt_hard, Opt_intr,
- Opt_nointr, Opt_posix, Opt_noposix, Opt_cto, Opt_nocto, Opt_ac,
- Opt_noac, Opt_lock, Opt_nolock, Opt_v2, Opt_v3, Opt_udp, Opt_tcp,
-- Opt_acl, Opt_noacl,
-+ Opt_acl, Opt_noacl, Opt_tagxid,
- /* Error token */
- Opt_err
- };
-@@ -161,6 +162,7 @@ static match_table_t __initdata tokens =
- {Opt_tcp, "tcp"},
- {Opt_acl, "acl"},
- {Opt_noacl, "noacl"},
-+ {Opt_tagxid, "tagxid"},
- {Opt_err, NULL}
-
- };
-@@ -275,6 +277,11 @@ static int __init root_nfs_parse(char *n
- case Opt_noacl:
- nfs_data.flags |= NFS_MOUNT_NOACL;
- break;
-+#ifndef CONFIG_INOXID_NONE
-+ case Opt_tagxid:
-+ nfs_data.flags |= NFS_MOUNT_TAGXID;
-+ break;
-+#endif
- default:
- printk(KERN_WARNING "Root-NFS: unknown "
- "option: %s\n", p);
-@@ -312,7 +319,7 @@ static int __init root_nfs_name(char *na
- /* Override them by options set on kernel command-line */
- root_nfs_parse(name, buf);
-
-- cp = system_utsname.nodename;
-+ cp = vx_new_uts(nodename);
- if (strlen(buf) + strlen(cp) > NFS_MAXPATHLEN) {
- printk(KERN_ERR "Root-NFS: Pathname for remote directory too long.\n");
- return -1;
---- linux-2.6.18.5/fs/nfs/super.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/nfs/super.c 2006-09-20 20:28:12 +0200
-@@ -40,6 +40,7 @@
- #include <linux/vfs.h>
- #include <linux/inet.h>
- #include <linux/nfs_xdr.h>
-+#include <linux/vserver/xid.h>
+ if (flags & JFS_IMMUTABLE_FL)
+ inode->i_flags |= S_IMMUTABLE;
++ if (flags & JFS_IUNLINK_FL)
++ inode->i_flags |= S_IUNLINK;
++ if (flags & JFS_BARRIER_FL)
++ inode->i_flags |= S_BARRIER;
++
++ if (flags & JFS_SYNC_FL)
++ inode->i_flags |= S_SYNC;
+ if (flags & JFS_APPEND_FL)
+ inode->i_flags |= S_APPEND;
+ if (flags & JFS_NOATIME_FL)
+ inode->i_flags |= S_NOATIME;
+ if (flags & JFS_DIRSYNC_FL)
+ inode->i_flags |= S_DIRSYNC;
+- if (flags & JFS_SYNC_FL)
+- inode->i_flags |= S_SYNC;
++}
++
++int jfs_sync_flags(struct inode *inode)
++{
++ unsigned int oldflags, newflags;
++
++ oldflags = JFS_IP(inode)->mode2;
++ newflags = oldflags & ~(JFS_IMMUTABLE_FL |
++ JFS_IUNLINK_FL | JFS_BARRIER_FL);
++
++ if (IS_IMMUTABLE(inode))
++ newflags |= JFS_IMMUTABLE_FL;
++ if (IS_IUNLINK(inode))
++ newflags |= JFS_IUNLINK_FL;
++ if (IS_BARRIER(inode))
++ newflags |= JFS_BARRIER_FL;
++
++ if (oldflags ^ newflags) {
++ JFS_IP(inode)->mode2 = newflags;
++ inode->i_ctime = CURRENT_TIME;
++ mark_inode_dirty(inode);
++ }
++ return 0;
+ }
- #include <asm/system.h>
- #include <asm/uaccess.h>
-@@ -367,6 +368,7 @@ static void nfs_show_mount_options(struc
- { NFS_MOUNT_NOAC, ",noac", "" },
- { NFS_MOUNT_NONLM, ",nolock", "" },
- { NFS_MOUNT_NOACL, ",noacl", "" },
-+ { NFS_MOUNT_TAGXID, ",tagxid", "" },
- { 0, NULL, NULL }
- };
- struct proc_nfs_info *nfs_infop;
-@@ -631,10 +633,14 @@ nfs_sb_init(struct super_block *sb, rpc_
- }
- server->backing_dev_info.ra_pages = server->rpages * NFS_MAX_READAHEAD;
+ /*
+@@ -90,10 +120,17 @@ struct inode *ialloc(struct inode *paren
+ jfs_inode->saved_uid = inode->i_uid;
+ jfs_inode->saved_gid = inode->i_gid;
-+ if (server->flags & NFS_MOUNT_TAGXID)
-+ sb->s_flags |= MS_TAGXID;
++ inode->i_tag = dx_current_fstag(sb);
++ if (DLIMIT_ALLOC_INODE(inode)) {
++ iput(inode);
++ return NULL;
++ }
+
- nfs_super_set_maxbytes(sb, fsinfo.maxfilesize);
-
- server->client->cl_intr = (server->flags & NFS_MOUNT_INTR) ? 1 : 0;
- server->client->cl_softrtry = (server->flags & NFS_MOUNT_SOFT) ? 1 : 0;
-+ server->client->cl_tagxid = (server->flags & NFS_MOUNT_TAGXID) ? 1 : 0;
+ /*
+ * Allocate inode to quota.
+ */
+ if (DQUOT_ALLOC_INODE(inode)) {
++ DLIMIT_FREE_INODE(inode);
+ DQUOT_DROP(inode);
+ inode->i_flags |= S_NOQUOTA;
+ inode->i_nlink = 0;
+--- linux-2.6.20/fs/jfs/jfs_inode.h 2006-11-30 21:19:25 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/jfs/jfs_inode.h 2007-02-06 03:05:22 +0100
+@@ -31,6 +31,7 @@ extern void jfs_truncate(struct inode *)
+ extern void jfs_truncate_nolock(struct inode *, loff_t);
+ extern void jfs_free_zero_link(struct inode *);
+ extern struct dentry *jfs_get_parent(struct dentry *dentry);
++extern int jfs_sync_flags(struct inode *);
+ extern void jfs_set_inode_flags(struct inode *);
+ extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
- /* We're airborne Set socket buffersize */
- rpc_setbufsize(server->client, server->wsize + 100, server->rsize + 100);
-@@ -712,6 +718,7 @@ nfs_create_client(struct nfs_server *ser
+--- linux-2.6.20/fs/jfs/jfs_xtree.c 2006-11-30 21:19:26 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/jfs/jfs_xtree.c 2007-02-06 03:05:22 +0100
+@@ -21,6 +21,7 @@
- clnt->cl_intr = 1;
- clnt->cl_softrtry = 1;
-+ clnt->cl_tagxid = 1;
+ #include <linux/fs.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_dlimit.h>
+ #include "jfs_incore.h"
+ #include "jfs_filsys.h"
+ #include "jfs_metapage.h"
+@@ -841,7 +842,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;
+ }
+@@ -871,6 +877,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;
+@@ -1231,6 +1238,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;
- return clnt;
+ smp = split->mp;
+ sp = XT_PAGE(ip, smp);
+@@ -1250,6 +1258,13 @@ xtSplitPage(tid_t tid, struct inode *ip,
---- linux-2.6.18.5/fs/nfsd/auth.c 2006-06-18 04:54:42 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/nfsd/auth.c 2006-09-20 17:01:44 +0200
-@@ -9,6 +9,7 @@
- #include <linux/sunrpc/svc.h>
- #include <linux/sunrpc/svcauth.h>
- #include <linux/nfsd/nfsd.h>
-+#include <linux/vserver/xid.h>
+ quota_allocation += lengthPXD(pxd);
- #define CAP_NFSD_MASK (CAP_FS_MASK|CAP_TO_MASK(CAP_SYS_RESOURCE))
++ /* 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
+ */
+@@ -1451,6 +1466,9 @@ xtSplitPage(tid_t tid, struct inode *ip,
-@@ -41,19 +42,22 @@ int nfsd_setuser(struct svc_rqst *rqstp,
- get_group_info(cred.cr_group_info);
+ clean_up:
- if (cred.cr_uid != (uid_t) -1)
-- current->fsuid = cred.cr_uid;
-+ current->fsuid = INOXID_UID(XID_TAG_NFSD, cred.cr_uid, cred.cr_gid);
- else
- current->fsuid = exp->ex_anon_uid;
- if (cred.cr_gid != (gid_t) -1)
-- current->fsgid = cred.cr_gid;
-+ current->fsgid = INOXID_GID(XID_TAG_NFSD, cred.cr_uid, cred.cr_gid);
++ /* Rollback dlimit allocation. */
++ if (dlimit_allocation)
++ DLIMIT_FREE_BLOCK(ip, dlimit_allocation);
+ /* Rollback quota allocation. */
+ if (quota_allocation)
+ DQUOT_FREE_BLOCK(ip, quota_allocation);
+@@ -1515,6 +1533,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);
+
+@@ -3941,6 +3965,8 @@ s64 xtTruncate(tid_t tid, struct inode *
else
- current->fsgid = exp->ex_anon_gid;
+ ip->i_size = newsize;
-+ /* this desperately needs a tag :) */
-+ current->xid = INOXID_XID(XID_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0);
-+
- if (!cred.cr_group_info)
- return -ENOMEM;
- ret = set_current_groups(cred.cr_group_info);
- put_group_info(cred.cr_group_info);
-- if ((cred.cr_uid)) {
-+ if (INOXID_UID(XID_TAG_NFSD, cred.cr_uid, cred.cr_gid)) {
- cap_t(current->cap_effective) &= ~CAP_NFSD_MASK;
- } else {
- cap_t(current->cap_effective) |= (CAP_NFSD_MASK &
---- linux-2.6.18.5/fs/nfsd/nfs3xdr.c 2006-04-09 13:49:54 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/nfsd/nfs3xdr.c 2006-09-20 17:01:44 +0200
-@@ -21,6 +21,7 @@
- #include <linux/sunrpc/svc.h>
- #include <linux/nfsd/nfsd.h>
- #include <linux/nfsd/xdr3.h>
-+#include <linux/vserver/xid.h>
++ /* update dlimit allocation to reflect freed blocks */
++ DLIMIT_FREE_BLOCK(ip, nfreed);
+ /* update quota allocation to reflect freed blocks */
+ DQUOT_FREE_BLOCK(ip, nfreed);
- #define NFSDDBG_FACILITY NFSDDBG_XDR
+--- linux-2.6.20/fs/jfs/namei.c 2006-11-30 21:19:26 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/jfs/namei.c 2007-02-06 03:05:22 +0100
+@@ -20,6 +20,7 @@
+ #include <linux/fs.h>
+ #include <linux/ctype.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
+ #include "jfs_incore.h"
+ #include "jfs_superblock.h"
+ #include "jfs_inode.h"
+@@ -1461,6 +1462,7 @@ static struct dentry *jfs_lookup(struct
+ return ERR_PTR(-EACCES);
+ }
-@@ -111,6 +112,8 @@ static inline u32 *
- decode_sattr3(u32 *p, struct iattr *iap)
- {
- u32 tmp;
-+ uid_t uid = 0;
-+ gid_t gid = 0;
++ dx_propagate_tag(nd, ip);
+ dentry = d_splice_alias(ip, dentry);
- iap->ia_valid = 0;
+ if (dentry && (JFS_SBI(dip->i_sb)->mntflag & JFS_OS2))
+@@ -1513,6 +1515,7 @@ struct inode_operations jfs_dir_inode_op
+ .setattr = jfs_setattr,
+ .permission = jfs_permission,
+ #endif
++ .sync_flags = jfs_sync_flags,
+ };
-@@ -120,12 +123,15 @@ decode_sattr3(u32 *p, struct iattr *iap)
- }
- if (*p++) {
- iap->ia_valid |= ATTR_UID;
-- iap->ia_uid = ntohl(*p++);
-+ uid = ntohl(*p++);
- }
- if (*p++) {
- iap->ia_valid |= ATTR_GID;
-- iap->ia_gid = ntohl(*p++);
-+ gid = ntohl(*p++);
- }
-+ iap->ia_uid = INOXID_UID(XID_TAG_NFSD, uid, gid);
-+ iap->ia_gid = INOXID_GID(XID_TAG_NFSD, uid, gid);
-+ iap->ia_xid = INOXID_XID(XID_TAG_NFSD, uid, gid, 0);
- if (*p++) {
- u64 newsize;
+ const struct file_operations jfs_dir_operations = {
+--- linux-2.6.20/fs/jfs/super.c 2007-02-06 03:01:24 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/jfs/super.c 2007-02-06 03:05:22 +0100
+@@ -194,7 +194,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,
+- Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask
++ Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask,
++ Opt_tag, Opt_notag, Opt_tagid
+ };
-@@ -163,8 +169,10 @@ encode_fattr3(struct svc_rqst *rqstp, u3
- *p++ = htonl(nfs3_ftypes[(stat->mode & S_IFMT) >> 12]);
- *p++ = htonl((u32) stat->mode);
- *p++ = htonl((u32) stat->nlink);
-- *p++ = htonl((u32) nfsd_ruid(rqstp, stat->uid));
-- *p++ = htonl((u32) nfsd_rgid(rqstp, stat->gid));
-+ *p++ = htonl((u32) nfsd_ruid(rqstp,
-+ XIDINO_UID(XID_TAG(dentry->d_inode), stat->uid, stat->xid)));
-+ *p++ = htonl((u32) nfsd_rgid(rqstp,
-+ XIDINO_GID(XID_TAG(dentry->d_inode), stat->gid, stat->xid)));
- if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
- p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
- } else {
---- linux-2.6.18.5/fs/nfsd/nfs4recover.c 2006-02-18 14:40:23 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/nfsd/nfs4recover.c 2006-09-20 17:01:44 +0200
-@@ -155,7 +155,7 @@ nfsd4_create_clid_dir(struct nfs4_client
- dprintk("NFSD: nfsd4_create_clid_dir: DIRECTORY EXISTS\n");
- goto out_put;
- }
-- status = vfs_mkdir(rec_dir.dentry->d_inode, dentry, S_IRWXU);
-+ status = vfs_mkdir(rec_dir.dentry->d_inode, dentry, S_IRWXU, NULL);
- out_put:
- dput(dentry);
- out_unlock:
-@@ -259,7 +259,7 @@ nfsd4_remove_clid_file(struct dentry *di
+ static match_table_t tokens = {
+@@ -204,6 +205,10 @@ static match_table_t tokens = {
+ {Opt_resize, "resize=%u"},
+ {Opt_resize_nosize, "resize"},
+ {Opt_errors, "errors=%s"},
++ {Opt_tag, "tag"},
++ {Opt_notag, "notag"},
++ {Opt_tagid, "tagid=%u"},
++ {Opt_tag, "tagxid"},
+ {Opt_ignore, "noquota"},
+ {Opt_ignore, "quota"},
+ {Opt_usrquota, "usrquota"},
+@@ -338,6 +343,20 @@ static int parse_options(char *options,
+ }
+ break;
+ }
++#ifndef CONFIG_TAGGING_NONE
++ case Opt_tag:
++ *flag |= JFS_TAGGED;
++ break;
++ case Opt_notag:
++ *flag &= JFS_TAGGED;
++ break;
++#endif
++#ifdef CONFIG_PROPAGATE
++ case Opt_tagid:
++ /* use args[0] */
++ *flag |= JFS_TAGGED;
++ break;
++#endif
+ default:
+ printk("jfs: Unrecognized mount option \"%s\" "
+ " or missing value\n", p);
+@@ -368,6 +387,13 @@ static int jfs_remount(struct super_bloc
+ if (!parse_options(data, sb, &newLVSize, &flag)) {
return -EINVAL;
}
- mutex_lock(&dir->d_inode->i_mutex);
-- status = vfs_unlink(dir->d_inode, dentry);
-+ status = vfs_unlink(dir->d_inode, dentry, NULL);
- mutex_unlock(&dir->d_inode->i_mutex);
- return status;
- }
-@@ -274,7 +274,7 @@ nfsd4_clear_clid_dir(struct dentry *dir,
- * a kernel from the future.... */
- nfsd4_list_rec_dir(dentry, nfsd4_remove_clid_file);
- mutex_lock(&dir->d_inode->i_mutex);
-- status = vfs_rmdir(dir->d_inode, dentry);
-+ status = vfs_rmdir(dir->d_inode, dentry, NULL);
- mutex_unlock(&dir->d_inode->i_mutex);
- return status;
- }
---- linux-2.6.18.5/fs/nfsd/nfs4xdr.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/nfsd/nfs4xdr.c 2006-09-20 17:01:44 +0200
-@@ -57,6 +57,7 @@
- #include <linux/nfsd_idmap.h>
- #include <linux/nfs4.h>
- #include <linux/nfs4_acl.h>
-+#include <linux/vserver/xid.h>
-
- #define NFSDDBG_FACILITY NFSDDBG_XDR
++
++ 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;
++ }
++
+ if (newLVSize) {
+ if (sb->s_flags & MS_RDONLY) {
+ printk(KERN_ERR
+@@ -439,6 +465,9 @@ static int jfs_fill_super(struct super_b
+ #ifdef CONFIG_JFS_POSIX_ACL
+ sb->s_flags |= MS_POSIXACL;
+ #endif
++ /* map mount option tagxid */
++ if (sbi->flag & JFS_TAGGED)
++ sb->s_flags |= MS_TAGGED;
-@@ -1560,14 +1561,18 @@ out_acl:
- WRITE32(stat.nlink);
- }
- if (bmval1 & FATTR4_WORD1_OWNER) {
-- status = nfsd4_encode_user(rqstp, stat.uid, &p, &buflen);
-+ status = nfsd4_encode_user(rqstp,
-+ XIDINO_UID(XID_TAG(dentry->d_inode),
-+ stat.uid, stat.xid), &p, &buflen);
- if (status == nfserr_resource)
- goto out_resource;
- if (status)
- goto out;
+ if (newLVSize) {
+ printk(KERN_ERR "resize option for remount only\n");
+--- linux-2.6.20/fs/jfs/xattr.c 2006-11-30 21:19:26 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/jfs/xattr.c 2007-02-06 03:05:22 +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;
}
- if (bmval1 & FATTR4_WORD1_OWNER_GROUP) {
-- status = nfsd4_encode_group(rqstp, stat.gid, &p, &buflen);
-+ status = nfsd4_encode_group(rqstp,
-+ XIDINO_GID(XID_TAG(dentry->d_inode),
-+ stat.gid, stat.xid), &p, &buflen);
- if (status == nfserr_resource)
- goto out_resource;
- if (status)
---- linux-2.6.18.5/fs/nfsd/nfsxdr.c 2006-04-09 13:49:54 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/nfsd/nfsxdr.c 2006-09-20 17:01:44 +0200
-@@ -15,6 +15,7 @@
- #include <linux/nfsd/nfsd.h>
- #include <linux/nfsd/xdr.h>
- #include <linux/mm.h>
-+#include <linux/vserver/xid.h>
++ /* Allocate new blocks to dlimit. */
++ if (DLIMIT_ALLOC_BLOCK(ip, nblocks)) {
++ DQUOT_FREE_BLOCK(ip, nblocks);
++ return -ENOSPC;
++ }
- #define NFSDDBG_FACILITY NFSDDBG_XDR
+ 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
-@@ -102,6 +103,8 @@ static inline u32 *
- decode_sattr(u32 *p, struct iattr *iap)
- {
- u32 tmp, tmp1;
-+ uid_t uid = 0;
-+ gid_t gid = 0;
+ failed:
+ /* Rollback quota allocation. */
++ DLIMIT_FREE_BLOCK(ip, nblocks);
++ /* Rollback quota allocation. */
+ DQUOT_FREE_BLOCK(ip, nblocks);
- iap->ia_valid = 0;
+ 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;
-@@ -115,12 +118,15 @@ decode_sattr(u32 *p, struct iattr *iap)
- }
- if ((tmp = ntohl(*p++)) != (u32)-1) {
- iap->ia_valid |= ATTR_UID;
-- iap->ia_uid = tmp;
-+ uid = tmp;
- }
- if ((tmp = ntohl(*p++)) != (u32)-1) {
- iap->ia_valid |= ATTR_GID;
-- iap->ia_gid = tmp;
-+ gid = tmp;
- }
-+ iap->ia_uid = INOXID_UID(XID_TAG_NFSD, uid, gid);
-+ iap->ia_gid = INOXID_GID(XID_TAG_NFSD, uid, gid);
-+ iap->ia_xid = INOXID_XID(XID_TAG_NFSD, uid, gid, 0);
- if ((tmp = ntohl(*p++)) != (u32)-1) {
- iap->ia_valid |= ATTR_SIZE;
- iap->ia_size = tmp;
-@@ -164,8 +170,10 @@ encode_fattr(struct svc_rqst *rqstp, u32
- *p++ = htonl(nfs_ftypes[type >> 12]);
- *p++ = htonl((u32) stat->mode);
- *p++ = htonl((u32) stat->nlink);
-- *p++ = htonl((u32) nfsd_ruid(rqstp, stat->uid));
-- *p++ = htonl((u32) nfsd_rgid(rqstp, stat->gid));
-+ *p++ = htonl((u32) nfsd_ruid(rqstp,
-+ XIDINO_UID(XID_TAG(dentry->d_inode), stat->uid, stat->xid)));
-+ *p++ = htonl((u32) nfsd_rgid(rqstp,
-+ XIDINO_GID(XID_TAG(dentry->d_inode), stat->gid, stat->xid)));
+ /* 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
- if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
- *p++ = htonl(NFS_MAXPATHLEN);
---- linux-2.6.18.5/fs/nfsd/vfs.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/nfsd/vfs.c 2006-09-20 17:01:44 +0200
-@@ -1158,13 +1158,13 @@ nfsd_create(struct svc_rqst *rqstp, stru
- err = vfs_create(dirp, dchild, iap->ia_mode, NULL);
- break;
- case S_IFDIR:
-- err = vfs_mkdir(dirp, dchild, iap->ia_mode);
-+ err = vfs_mkdir(dirp, dchild, iap->ia_mode, NULL);
- break;
- case S_IFCHR:
- case S_IFBLK:
- case S_IFIFO:
- case S_IFSOCK:
-- err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev);
-+ err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev, NULL);
- break;
- default:
- printk("nfsd: bad file type %o in nfsd_create\n", type);
-@@ -1444,11 +1444,13 @@ nfsd_symlink(struct svc_rqst *rqstp, str
- else {
- strncpy(path_alloced, path, plen);
- path_alloced[plen] = 0;
-- err = vfs_symlink(dentry->d_inode, dnew, path_alloced, mode);
-+ err = vfs_symlink(dentry->d_inode, dnew,
-+ path_alloced, mode, NULL);
- kfree(path_alloced);
- }
- } else
-- err = vfs_symlink(dentry->d_inode, dnew, path, mode);
-+ err = vfs_symlink(dentry->d_inode, dnew,
-+ path, mode, NULL);
+ quota_allocation = blocks_needed;
- if (!err)
- if (EX_ISSYNC(fhp->fh_export))
-@@ -1506,7 +1508,7 @@ nfsd_link(struct svc_rqst *rqstp, struct
- dold = tfhp->fh_dentry;
- dest = dold->d_inode;
++ /* 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)
+@@ -599,6 +616,9 @@ static int ea_get(struct inode *inode, s
+ return ea_size;
-- err = vfs_link(dold, dirp, dnew);
-+ err = vfs_link(dold, dirp, dnew, NULL);
- if (!err) {
- if (EX_ISSYNC(ffhp->fh_export)) {
- err = nfserrno(nfsd_sync_dir(ddir));
-@@ -1669,9 +1671,9 @@ nfsd_unlink(struct svc_rqst *rqstp, stru
- err = -EPERM;
- } else
- #endif
-- err = vfs_unlink(dirp, rdentry);
-+ err = vfs_unlink(dirp, rdentry, NULL);
- } else { /* It's RMDIR */
-- err = vfs_rmdir(dirp, rdentry);
-+ err = vfs_rmdir(dirp, rdentry, NULL);
+ 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);
+@@ -675,8 +695,10 @@ static int ea_put(tid_t tid, struct inod
}
- dput(rdentry);
-@@ -1780,7 +1782,8 @@ nfsd_permission(struct svc_export *exp,
- */
- if (!(acc & MAY_LOCAL_ACCESS))
- if (acc & (MAY_WRITE | MAY_SATTR | MAY_TRUNC)) {
-- if (EX_RDONLY(exp) || IS_RDONLY(inode))
-+ if (EX_RDONLY(exp) || IS_RDONLY(inode)
-+ || MNT_IS_RDONLY(exp->ex_mnt))
- return nfserr_rofs;
- if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE(inode))
- return nfserr_perm;
---- linux-2.6.18.5/fs/open.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/open.c 2006-09-20 21:05:31 +0200
-@@ -28,6 +28,9 @@
- #include <linux/syscalls.h>
- #include <linux/rcupdate.h>
- #include <linux/audit.h>
-+#include <linux/vs_limit.h>
-+#include <linux/vs_dlimit.h>
-+#include <linux/vserver/xid.h>
+ /* 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);
++ }
- #include <asm/unistd.h>
+ inode->i_ctime = CURRENT_TIME;
-@@ -36,16 +39,20 @@ int vfs_statfs(struct dentry *dentry, st
- int retval = -ENODEV;
+--- linux-2.6.20/fs/libfs.c 2007-02-06 03:01:24 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/libfs.c 2007-02-06 03:05:22 +0100
+@@ -124,7 +124,8 @@ static inline unsigned char dt_type(stru
+ * both impossible due to the lock on directory.
+ */
- if (dentry) {
-+ struct super_block *sb = dentry->d_sb;
-+
- retval = -ENOSYS;
-- if (dentry->d_sb->s_op->statfs) {
-+ if (sb->s_op->statfs) {
- memset(buf, 0, sizeof(*buf));
- retval = security_sb_statfs(dentry);
- if (retval)
- return retval;
-- retval = dentry->d_sb->s_op->statfs(dentry, buf);
-+ retval = sb->s_op->statfs(dentry, buf);
- if (retval == 0 && buf->f_frsize == 0)
- buf->f_frsize = buf->f_bsize;
- }
-+ if (!vx_check(0, VX_ADMIN|VX_WATCH))
-+ vx_vsi_statfs(sb, buf);
- }
- return retval;
+-int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
++static inline int do_dcache_readdir_filter(struct file * filp,
++ void * dirent, filldir_t filldir, int (*filter)(struct dentry *dentry))
+ {
+ struct dentry *dentry = filp->f_path.dentry;
+ struct dentry *cursor = filp->private_data;
+@@ -157,6 +158,8 @@ int dcache_readdir(struct file * filp, v
+ next = list_entry(p, struct dentry, d_u.d_child);
+ if (d_unhashed(next) || !next->d_inode)
+ continue;
++ if (filter && !filter(next))
++ continue;
+
+ spin_unlock(&dcache_lock);
+ if (filldir(dirent, next->d_name.name, next->d_name.len, filp->f_pos, next->d_inode->i_ino, dt_type(next->d_inode)) < 0)
+@@ -172,6 +175,18 @@ int dcache_readdir(struct file * filp, v
+ return 0;
}
-@@ -249,7 +256,7 @@ static long do_sys_truncate(const char _
- goto dput_and_out;
- error = -EROFS;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt))
- goto dput_and_out;
++int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
++{
++ return do_dcache_readdir_filter(filp, dirent, filldir, NULL);
++}
++
++int dcache_readdir_filter(struct file * filp, void * dirent, filldir_t filldir,
++ int (*filter)(struct dentry *))
++{
++ return do_dcache_readdir_filter(filp, dirent, filldir, filter);
++}
++
++
+ ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
+ {
+ return -EISDIR;
+@@ -611,6 +626,7 @@ EXPORT_SYMBOL(dcache_dir_close);
+ EXPORT_SYMBOL(dcache_dir_lseek);
+ EXPORT_SYMBOL(dcache_dir_open);
+ EXPORT_SYMBOL(dcache_readdir);
++EXPORT_SYMBOL(dcache_readdir_filter);
+ EXPORT_SYMBOL(generic_read_dir);
+ EXPORT_SYMBOL(get_sb_pseudo);
+ EXPORT_SYMBOL(simple_commit_write);
+--- linux-2.6.20/fs/locks.c 2007-02-06 03:01:24 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/locks.c 2007-02-06 03:25:47 +0100
+@@ -125,6 +125,8 @@
+ #include <linux/syscalls.h>
+ #include <linux/time.h>
+ #include <linux/rcupdate.h>
++#include <linux/vs_base.h>
++#include <linux/vs_limit.h>
- error = -EPERM;
-@@ -379,7 +386,7 @@ asmlinkage long sys_utime(char __user *
- inode = nd.dentry->d_inode;
+ #include <asm/semaphore.h>
+ #include <asm/uaccess.h>
+@@ -147,6 +149,8 @@ static struct kmem_cache *filelock_cache
+ /* Allocate an empty lock structure. */
+ static struct file_lock *locks_alloc_lock(void)
+ {
++ if (!vx_locks_avail(1))
++ return NULL;
+ return kmem_cache_alloc(filelock_cache, GFP_KERNEL);
+ }
- error = -EROFS;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt))
- goto dput_and_out;
+@@ -172,6 +176,7 @@ static void locks_free_lock(struct file_
+ BUG_ON(!list_empty(&fl->fl_block));
+ BUG_ON(!list_empty(&fl->fl_link));
- /* Don't worry, the checks are done in inode_change_ok() */
-@@ -436,7 +443,7 @@ long do_utimes(int dfd, char __user *fil
- inode = nd.dentry->d_inode;
++ vx_locks_dec(fl);
+ locks_release_private(fl);
+ kmem_cache_free(filelock_cache, fl);
+ }
+@@ -191,6 +196,7 @@ void locks_init_lock(struct file_lock *f
+ fl->fl_start = fl->fl_end = 0;
+ fl->fl_ops = NULL;
+ fl->fl_lmops = NULL;
++ fl->fl_xid = -1;
+ }
- error = -EROFS;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt))
- goto dput_and_out;
+ EXPORT_SYMBOL(locks_init_lock);
+@@ -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;
++ new->fl_xid = fl->fl_xid;
- /* Don't worry, the checks are done in inode_change_ok() */
-@@ -523,7 +530,8 @@ asmlinkage long sys_faccessat(int dfd, c
- if (!res) {
- res = vfs_permission(&nd, mode);
- /* SuS v2 requires we report a read only fs too */
-- if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode)
-+ if(!res && (mode & S_IWOTH)
-+ && (IS_RDONLY(nd.dentry->d_inode) || MNT_IS_RDONLY(nd.mnt))
- && !special_file(nd.dentry->d_inode->i_mode))
- res = -EROFS;
- path_release(&nd);
-@@ -636,7 +644,7 @@ asmlinkage long sys_fchmod(unsigned int
- audit_inode(NULL, inode);
+ locks_copy_private(new, fl);
+ }
+@@ -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;
++
++ vxd_assert(filp->f_xid == vx_current_xid(),
++ "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
++ fl->fl_xid = filp->f_xid;
++ vx_locks_inc(fl);
+
+ *lock = fl;
+ return 0;
+@@ -451,6 +463,7 @@ static int lease_init(struct file *filp,
- err = -EROFS;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) || MNT_IS_RDONLY(file->f_vfsmnt))
- goto out_putf;
- err = -EPERM;
- if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
-@@ -669,7 +677,7 @@ asmlinkage long sys_fchmodat(int dfd, co
- inode = nd.dentry->d_inode;
+ fl->fl_owner = current->files;
+ fl->fl_pid = current->tgid;
++ fl->fl_xid = vx_current_xid();
- error = -EROFS;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt))
- goto dput_and_out;
+ fl->fl_file = filp;
+ fl->fl_flags = FL_LEASE;
+@@ -470,6 +483,11 @@ static int lease_alloc(struct file *filp
+ if (fl == NULL)
+ goto out;
- error = -EPERM;
-@@ -695,7 +703,8 @@ asmlinkage long sys_chmod(const char __u
- return sys_fchmodat(AT_FDCWD, filename, mode);
++ fl->fl_xid = vx_current_xid();
++ if (filp)
++ vxd_assert(filp->f_xid == fl->fl_xid,
++ "f_xid(%d) == fl_xid(%d)", filp->f_xid, fl->fl_xid);
++ vx_locks_inc(fl);
+ error = lease_init(filp, type, fl);
+ if (error) {
+ locks_free_lock(fl);
+@@ -790,6 +808,7 @@ find_conflict:
+ if (request->fl_flags & FL_ACCESS)
+ goto out;
+ locks_copy_lock(new_fl, request);
++ vx_locks_inc(new_fl);
+ locks_insert_lock(&inode->i_flock, new_fl);
+ new_fl = NULL;
+ error = 0;
+@@ -801,7 +820,8 @@ out:
+ return error;
}
--static int chown_common(struct dentry * dentry, uid_t user, gid_t group)
-+static int chown_common(struct dentry *dentry, struct vfsmount *mnt,
-+ uid_t user, gid_t group)
+-static int __posix_lock_file_conf(struct inode *inode, struct file_lock *request, struct file_lock *conflock)
++static int __posix_lock_file_conf(struct inode *inode, struct file_lock *request,
++ struct file_lock *conflock, xid_t xid)
{
- struct inode * inode;
- int error;
-@@ -707,7 +716,7 @@ static int chown_common(struct dentry *
- goto out;
- }
- error = -EROFS;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) || MNT_IS_RDONLY(mnt))
- goto out;
- error = -EPERM;
- if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
-@@ -715,11 +724,11 @@ static int chown_common(struct dentry *
- newattrs.ia_valid = ATTR_CTIME;
- if (user != (uid_t) -1) {
- newattrs.ia_valid |= ATTR_UID;
-- newattrs.ia_uid = user;
-+ newattrs.ia_uid = vx_map_uid(user);
- }
- if (group != (gid_t) -1) {
- newattrs.ia_valid |= ATTR_GID;
-- newattrs.ia_gid = group;
-+ newattrs.ia_gid = vx_map_gid(group);
- }
- if (!S_ISDIR(inode->i_mode))
- newattrs.ia_valid |= ATTR_KILL_SUID|ATTR_KILL_SGID;
-@@ -737,7 +746,7 @@ asmlinkage long sys_chown(const char __u
+ struct file_lock *fl;
+ struct file_lock *new_fl = NULL;
+@@ -811,6 +831,8 @@ static int __posix_lock_file_conf(struct
+ struct file_lock **before;
+ int error, added = 0;
- error = user_path_walk(filename, &nd);
- if (!error) {
-- error = chown_common(nd.dentry, user, group);
-+ error = chown_common(nd.dentry, nd.mnt, user, group);
- path_release(&nd);
- }
- return error;
-@@ -756,7 +765,7 @@ asmlinkage long sys_fchownat(int dfd, co
- follow = (flag & AT_SYMLINK_NOFOLLOW) ? 0 : LOOKUP_FOLLOW;
- error = __user_walk_fd(dfd, filename, follow, &nd);
- if (!error) {
-- error = chown_common(nd.dentry, user, group);
-+ error = chown_common(nd.dentry, nd.mnt, user, group);
- path_release(&nd);
++ vxd_assert(xid == vx_current_xid(),
++ "xid(%d) == current(%d)", xid, vx_current_xid());
+ /*
+ * We may need two file_lock structures for this operation,
+ * so we get them in advance to avoid races.
+@@ -821,7 +843,11 @@ static int __posix_lock_file_conf(struct
+ (request->fl_type != F_UNLCK ||
+ request->fl_start != 0 || request->fl_end != OFFSET_MAX)) {
+ new_fl = locks_alloc_lock();
++ new_fl->fl_xid = xid;
++ vx_locks_inc(new_fl);
+ new_fl2 = locks_alloc_lock();
++ new_fl2->fl_xid = xid;
++ vx_locks_inc(new_fl2);
}
- out:
-@@ -770,7 +779,7 @@ asmlinkage long sys_lchown(const char __
- error = user_path_walk_link(filename, &nd);
- if (!error) {
-- error = chown_common(nd.dentry, user, group);
-+ error = chown_common(nd.dentry, nd.mnt, user, group);
- path_release(&nd);
- }
- return error;
-@@ -787,7 +796,7 @@ asmlinkage long sys_fchown(unsigned int
- struct dentry * dentry;
- dentry = file->f_dentry;
- audit_inode(NULL, dentry->d_inode);
-- error = chown_common(dentry, user, group);
-+ error = chown_common(dentry, file->f_vfsmnt, user, group);
- fput(file);
- }
- return error;
-@@ -1015,6 +1024,7 @@ repeat:
- FD_SET(fd, fdt->open_fds);
- FD_CLR(fd, fdt->close_on_exec);
- files->next_fd = fd + 1;
-+ vx_openfd_inc(fd);
- #if 1
- /* Sanity check */
- if (fdt->fd[fd] != NULL) {
-@@ -1037,6 +1047,7 @@ static void __put_unused_fd(struct files
- __FD_CLR(fd, fdt->open_fds);
- if (fd < files->next_fd)
- files->next_fd = fd;
-+ vx_openfd_dec(fd);
+ lock_kernel();
+@@ -1018,7 +1044,8 @@ static int __posix_lock_file_conf(struct
+ */
+ int posix_lock_file(struct file *filp, struct file_lock *fl)
+ {
+- return __posix_lock_file_conf(filp->f_path.dentry->d_inode, fl, NULL);
++ return __posix_lock_file_conf(filp->f_path.dentry->d_inode,
++ fl, NULL, filp->f_xid);
}
+ EXPORT_SYMBOL(posix_lock_file);
- void fastcall put_unused_fd(unsigned int fd)
---- linux-2.6.18.5/fs/proc/array.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/proc/array.c 2006-10-25 03:43:38 +0200
-@@ -75,6 +75,8 @@
- #include <linux/cpuset.h>
- #include <linux/rcupdate.h>
- #include <linux/delayacct.h>
-+#include <linux/vs_context.h>
-+#include <linux/vs_network.h>
+@@ -1033,7 +1060,8 @@ EXPORT_SYMBOL(posix_lock_file);
+ int posix_lock_file_conf(struct file *filp, struct file_lock *fl,
+ struct file_lock *conflock)
+ {
+- return __posix_lock_file_conf(filp->f_path.dentry->d_inode, fl, conflock);
++ return __posix_lock_file_conf(filp->f_path.dentry->d_inode,
++ fl, conflock, filp->f_xid);
+ }
+ EXPORT_SYMBOL(posix_lock_file_conf);
- #include <asm/uaccess.h>
- #include <asm/pgtable.h>
-@@ -135,7 +137,9 @@ static const char *task_state_array[] =
- "T (stopped)", /* 4 */
- "T (tracing stop)", /* 8 */
- "Z (zombie)", /* 16 */
-- "X (dead)" /* 32 */
-+ "X (dead)", /* 32 */
-+ "N (noninteractive)", /* 64 */
-+ "H (on hold)" /* 128 */
- };
+@@ -1123,7 +1151,7 @@ int locks_mandatory_area(int read_write,
+ fl.fl_end = offset + count - 1;
- static inline const char * get_task_state(struct task_struct *tsk)
-@@ -144,7 +148,8 @@ static inline const char * get_task_stat
- TASK_INTERRUPTIBLE |
- TASK_UNINTERRUPTIBLE |
- TASK_STOPPED |
-- TASK_TRACED)) |
-+ TASK_TRACED |
-+ TASK_ONHOLD)) |
- (tsk->exit_state & (EXIT_ZOMBIE |
- EXIT_DEAD));
- const char **p = &task_state_array[0];
-@@ -161,8 +166,13 @@ static inline char * task_state(struct t
- struct group_info *group_info;
- int g;
- struct fdtable *fdt = NULL;
-+ pid_t pid, ptgid, tppid, tgid;
+ for (;;) {
+- error = __posix_lock_file_conf(inode, &fl, NULL);
++ error = __posix_lock_file_conf(inode, &fl, NULL, filp->f_xid);
+ if (error != -EAGAIN)
+ break;
+ if (!(fl.fl_flags & FL_SLEEP))
+@@ -1685,6 +1713,11 @@ int fcntl_setlk(unsigned int fd, struct
+ if (file_lock == NULL)
+ return -ENOLCK;
- read_lock(&tasklist_lock);
-+ tgid = vx_map_tgid(p->tgid);
-+ pid = vx_map_pid(p->pid);
-+ ptgid = vx_map_pid(p->group_leader->real_parent->tgid);
-+ tppid = vx_map_pid(p->parent->pid);
- buffer += sprintf(buffer,
- "State:\t%s\n"
- "SleepAVG:\t%lu%%\n"
-@@ -174,9 +184,8 @@ static inline char * task_state(struct t
- "Gid:\t%d\t%d\t%d\t%d\n",
- get_task_state(p),
- (p->sleep_avg/1024)*100/(1020000000/1024),
-- p->tgid,
-- p->pid, pid_alive(p) ? p->group_leader->real_parent->tgid : 0,
-- pid_alive(p) && p->ptrace ? p->parent->pid : 0,
-+ tgid, pid, (pid > 1) ? ptgid : 0,
-+ pid_alive(p) && p->ptrace ? tppid : 0,
- p->uid, p->euid, p->suid, p->fsuid,
- p->gid, p->egid, p->sgid, p->fsgid);
- read_unlock(&tasklist_lock);
-@@ -296,6 +305,12 @@ static inline char *task_cap(struct task
- int proc_pid_status(struct task_struct *task, char * buffer)
- {
- char * orig = buffer;
-+#ifdef CONFIG_VSERVER_LEGACY
-+ struct vx_info *vxi;
-+#endif
-+#ifdef CONFIG_VSERVER_LEGACYNET
-+ struct nx_info *nxi;
-+#endif
- struct mm_struct *mm = get_task_mm(task);
++ vxd_assert(filp->f_xid == vx_current_xid(),
++ "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
++ file_lock->fl_xid = filp->f_xid;
++ vx_locks_inc(file_lock);
++
+ /*
+ * This might block, so we do it before checking the inode.
+ */
+@@ -1828,6 +1861,11 @@ int fcntl_setlk64(unsigned int fd, struc
+ if (file_lock == NULL)
+ return -ENOLCK;
- buffer = task_name(task, buffer);
-@@ -308,6 +323,46 @@ int proc_pid_status(struct task_struct *
- buffer = task_sig(task, buffer);
- buffer = task_cap(task, buffer);
- buffer = cpuset_task_status_allowed(task, buffer);
++ vxd_assert(filp->f_xid == vx_current_xid(),
++ "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
++ file_lock->fl_xid = filp->f_xid;
++ vx_locks_inc(file_lock);
+
-+ if (task_vx_flags(task, VXF_INFO_HIDE, 0))
-+ goto skip;
-+#ifdef CONFIG_VSERVER_LEGACY
-+ buffer += sprintf (buffer,"s_context: %d\n", vx_task_xid(task));
-+ vxi = task_get_vx_info(task);
-+ if (vxi) {
-+ buffer += sprintf (buffer,"ctxflags: %08llx\n"
-+ ,(unsigned long long)vxi->vx_flags);
-+ buffer += sprintf (buffer,"initpid: %d\n"
-+ ,vxi->vx_initpid);
-+ } else {
-+ buffer += sprintf (buffer,"ctxflags: none\n");
-+ buffer += sprintf (buffer,"initpid: none\n");
-+ }
-+ put_vx_info(vxi);
-+#else
-+ buffer += sprintf (buffer,"VxID: %d\n", vx_task_xid(task));
-+#endif
-+#ifdef CONFIG_VSERVER_LEGACYNET
-+ nxi = task_get_nx_info(task);
-+ if (nxi) {
-+ int i;
+ /*
+ * This might block, so we do it before checking the inode.
+ */
+@@ -2123,6 +2161,10 @@ int get_locks_status(char *buffer, char
+ list_for_each(tmp, &file_lock_list) {
+ struct list_head *btmp;
+ struct file_lock *fl = list_entry(tmp, struct file_lock, fl_link);
+
-+ buffer += sprintf (buffer,"ipv4root:");
-+ for (i=0; i<nxi->nbipv4; i++){
-+ buffer += sprintf (buffer," %08x/%08x"
-+ ,nxi->ipv4[i]
-+ ,nxi->mask[i]);
-+ }
-+ *buffer++ = '\n';
-+ buffer += sprintf (buffer,"ipv4root_bcast: %08x\n"
-+ ,nxi->v4_bcast);
-+ } else {
-+ buffer += sprintf (buffer,"ipv4root: 0\n");
-+ buffer += sprintf (buffer,"ipv4root_bcast: 0\n");
-+ }
-+ put_nx_info(nxi);
-+#endif
-+skip:
- #if defined(CONFIG_S390)
- buffer = task_show_regs(task, buffer);
- #endif
-@@ -322,7 +377,7 @@ static int do_task_stat(struct task_stru
- sigset_t sigign, sigcatch;
- char state;
- int res;
-- pid_t ppid, pgid = -1, sid = -1;
-+ pid_t pid, ppid, pgid = -1, sid = -1;
- int num_threads = 0;
- struct mm_struct *mm;
- unsigned long long start_time;
-@@ -386,7 +441,11 @@ static int do_task_stat(struct task_stru
- stime = cputime_add(stime, task->signal->stime);
- }
- }
-- ppid = pid_alive(task) ? task->group_leader->real_parent->tgid : 0;
-+ pid = vx_info_map_pid(task->vx_info, pid_alive(task) ? task->pid : 0);
-+ ppid = (!(pid > 1)) ? 0 : vx_info_map_tgid(task->vx_info,
-+ task->group_leader->real_parent->tgid);
-+ pgid = vx_info_map_pid(task->vx_info, pgid);
++ if (!vx_check(fl->fl_xid, VS_WATCH_P|VS_IDENT))
++ continue;
+
- read_unlock(&tasklist_lock);
+ lock_get_status(q, fl, ++i, "");
+ move_lock_status(&q, &pos, offset);
- if (!whole || num_threads<2)
-@@ -410,10 +469,21 @@ static int do_task_stat(struct task_stru
- /* convert nsec -> ticks */
- start_time = nsec_to_clock_t(start_time);
+--- linux-2.6.20/fs/namei.c 2007-02-06 03:01:24 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/namei.c 2007-02-06 03:05:22 +0100
+@@ -32,6 +32,11 @@
+ #include <linux/file.h>
+ #include <linux/fcntl.h>
+ #include <linux/namei.h>
++#include <linux/proc_fs.h>
++#include <linux/vserver/inode.h>
++#include <linux/vs_base.h>
++#include <linux/vs_tag.h>
++#include <linux/vs_cowbl.h>
+ #include <asm/namei.h>
+ #include <asm/uaccess.h>
-+ /* fixup start time for virt uptime */
-+ if (vx_flags(VXF_VIRT_UPTIME, 0)) {
-+ unsigned long long bias =
-+ current->vx_info->cvirt.bias_clock;
-+
-+ if (start_time > bias)
-+ start_time -= bias;
-+ else
-+ start_time = 0;
+@@ -225,6 +230,31 @@ int generic_permission(struct inode *ino
+ return -EACCES;
+ }
+
++static inline int dx_barrier(struct inode *inode)
++{
++ if (IS_BARRIER(inode) && !vx_check(0, VS_ADMIN)) {
++ vxwprintk(1, "xid=%d did hit the barrier.",
++ vx_current_xid());
++ return 1;
+ }
++ return 0;
++}
+
- res = sprintf(buffer,"%d (%s) %c %d %d %d %d %d %lu %lu \
- %lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
- %lu %lu %lu %lu %lu %lu %lu %lu %d %d %lu %lu %llu\n",
-- task->pid,
-+ pid,
- tcomm,
- state,
- ppid,
---- linux-2.6.18.5/fs/proc/base.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/proc/base.c 2006-11-06 05:36:38 +0100
-@@ -71,6 +71,9 @@
- #include <linux/cpuset.h>
- #include <linux/audit.h>
- #include <linux/poll.h>
-+#include <linux/vs_context.h>
-+#include <linux/vs_network.h>
++static inline int dx_permission(struct inode *inode, int mask, struct nameidata *nd)
++{
++ if (dx_barrier(inode))
++ return -EACCES;
++ if (inode->i_tag == 0)
++ return 0;
++ if (dx_check(inode->i_tag, DX_ADMIN|DX_WATCH|DX_IDENT))
++ return 0;
+
- #include "internal.h"
-
- /* NOTE:
-@@ -133,6 +136,8 @@ enum pid_directory_inos {
- PROC_TGID_ATTR_KEYCREATE,
- PROC_TGID_ATTR_SOCKCREATE,
- #endif
-+ PROC_TGID_VX_INFO,
-+ PROC_TGID_IP_INFO,
- #ifdef CONFIG_AUDITSYSCALL
- PROC_TGID_LOGINUID,
- #endif
-@@ -176,6 +181,8 @@ enum pid_directory_inos {
- PROC_TID_ATTR_KEYCREATE,
- PROC_TID_ATTR_SOCKCREATE,
- #endif
-+ PROC_TID_VX_INFO,
-+ PROC_TID_IP_INFO,
- #ifdef CONFIG_AUDITSYSCALL
- PROC_TID_LOGINUID,
- #endif
-@@ -235,6 +242,8 @@ static struct pid_entry tgid_base_stuff[
- #ifdef CONFIG_CPUSETS
- E(PROC_TGID_CPUSET, "cpuset", S_IFREG|S_IRUGO),
- #endif
-+ E(PROC_TGID_VX_INFO, "vinfo", S_IFREG|S_IRUGO),
-+ E(PROC_TGID_IP_INFO, "ninfo", S_IFREG|S_IRUGO),
- E(PROC_TGID_OOM_SCORE, "oom_score",S_IFREG|S_IRUGO),
- E(PROC_TGID_OOM_ADJUST,"oom_adj", S_IFREG|S_IRUGO|S_IWUSR),
- #ifdef CONFIG_AUDITSYSCALL
-@@ -277,6 +286,8 @@ static struct pid_entry tid_base_stuff[]
- #ifdef CONFIG_CPUSETS
- E(PROC_TID_CPUSET, "cpuset", S_IFREG|S_IRUGO),
- #endif
-+ E(PROC_TID_VX_INFO, "vinfo", S_IFREG|S_IRUGO),
-+ E(PROC_TID_IP_INFO, "ninfo", S_IFREG|S_IRUGO),
- E(PROC_TID_OOM_SCORE, "oom_score",S_IFREG|S_IRUGO),
- E(PROC_TID_OOM_ADJUST, "oom_adj", S_IFREG|S_IRUGO|S_IWUSR),
- #ifdef CONFIG_AUDITSYSCALL
-@@ -1214,7 +1225,7 @@ static int proc_pident_readdir(struct fi
- struct task_struct *task = get_proc_task(inode);
- struct pid_entry *p;
- ino_t ino;
-- int ret;
-+ int ret, hide;
++ vxwprintk(1, "xid=%d denied access to %p[#%d,%lu] »%s«.",
++ vx_current_xid(), inode, inode->i_tag, inode->i_ino,
++ vxd_cond_path(nd));
++ return -EACCES;
++}
++
+ int permission(struct inode *inode, int mask, struct nameidata *nd)
+ {
+ umode_t mode = inode->i_mode;
+@@ -235,14 +265,14 @@ int permission(struct inode *inode, int
+ /*
+ * Nobody gets write access to a read-only fs.
+ */
+- if (IS_RDONLY(inode) &&
++ if ((IS_RDONLY(inode) || (nd && MNT_IS_RDONLY(nd->mnt))) &&
+ (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)))
+ return -EROFS;
- ret = -ENOENT;
- if (!task)
-@@ -1246,11 +1257,20 @@ static int proc_pident_readdir(struct fi
- goto out;
- }
- p = ents + i;
-+ hide = vx_flags(VXF_INFO_HIDE, 0);
- while (p->name) {
-+ if (hide) {
-+ switch (p->type) {
-+ case PROC_TGID_VX_INFO:
-+ case PROC_TGID_IP_INFO:
-+ goto skip;
-+ }
-+ }
- if (filldir(dirent, p->name, p->len, filp->f_pos,
- fake_ino(pid, p->type), p->mode >> 12) < 0)
- goto out;
- filp->f_pos++;
-+ skip:
- p++;
- }
- }
-@@ -1322,6 +1342,7 @@ static struct inode *proc_pid_make_inode
- inode->i_uid = task->euid;
- inode->i_gid = task->egid;
+ /*
+ * Nobody gets write access to an immutable file.
+ */
+- if (IS_IMMUTABLE(inode))
++ if (IS_IMMUTABLE(inode) && !IS_COW(inode))
+ return -EACCES;
}
-+ inode->i_xid = vx_task_xid(task);
- security_task_to_inode(task, inode);
- out:
-@@ -1353,7 +1374,15 @@ static int pid_revalidate(struct dentry
+@@ -258,6 +288,8 @@ int permission(struct inode *inode, int
+
+ /* Ordinary permission routines do not understand MAY_APPEND. */
+ submask = mask & ~MAY_APPEND;
++ if ((retval = dx_permission(inode, mask, nd)))
++ return retval;
+ if (inode->i_op && inode->i_op->permission)
+ retval = inode->i_op->permission(inode, submask, nd);
+ else
+@@ -433,6 +465,8 @@ static int exec_permission_lite(struct i
{
- struct inode *inode = dentry->d_inode;
- struct task_struct *task = get_proc_task(inode);
-+ int ret = 0;
-+
- if (task) {
-+ int pid = (inode->i_ino >> 16) & 0xFFFF;
-+
-+ if (!proc_pid_visible(task, pid))
-+ goto out_drop;
-+
-+ ret = 1;
- if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
- task_dumpable(task)) {
- inode->i_uid = task->euid;
-@@ -1364,11 +1393,14 @@ static int pid_revalidate(struct dentry
- }
- inode->i_mode &= ~(S_ISUID | S_ISGID);
- security_task_to_inode(task, inode);
-- put_task_struct(task);
-- return 1;
-+ goto out_put;
- }
-+out_drop:
- d_drop(dentry);
-- return 0;
-+out_put:
-+ if (task)
-+ put_task_struct(task);
-+ return ret;
- }
+ umode_t mode = inode->i_mode;
- static int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
-@@ -1642,6 +1674,9 @@ static struct file_operations proc_tgid_
- static struct inode_operations proc_tgid_attr_inode_operations;
- #endif
++ if (dx_barrier(inode))
++ return -EACCES;
+ if (inode->i_op && inode->i_op->permission)
+ return -EAGAIN;
-+extern int proc_pid_vx_info(struct task_struct *, char *);
-+extern int proc_pid_nx_info(struct task_struct *, char *);
+@@ -733,7 +767,8 @@ static __always_inline void follow_dotdo
+ if (nd->dentry == fs->root &&
+ nd->mnt == fs->rootmnt) {
+ read_unlock(&fs->lock);
+- break;
++ /* FIXME: for sane '/' avoid follow_mount() */
++ return;
+ }
+ read_unlock(&fs->lock);
+ spin_lock(&dcache_lock);
+@@ -770,16 +805,34 @@ static int do_lookup(struct nameidata *n
+ {
+ struct vfsmount *mnt = nd->mnt;
+ struct dentry *dentry = __d_lookup(nd->dentry, name);
++ struct inode *inode;
+
+ if (!dentry)
+ goto need_lookup;
+ if (dentry->d_op && dentry->d_op->d_revalidate)
+ goto need_revalidate;
++ inode = dentry->d_inode;
++ if (!inode)
++ goto done;
++ if (inode->i_sb->s_magic == PROC_SUPER_MAGIC) {
++ struct proc_dir_entry *de = PDE(inode);
+
- /* SMP-safe */
- static struct dentry *proc_pident_lookup(struct inode *dir,
- struct dentry *dentry,
-@@ -1668,6 +1703,17 @@ static struct dentry *proc_pident_lookup
- if (!p->name)
- goto out;
++ if (de && !vx_hide_check(0, de->vx_flags))
++ goto hidden;
++ }
++ if (!dx_check(inode->i_tag, DX_WATCH|DX_ADMIN|DX_HOSTID|DX_IDENT))
++ goto hidden;
+ done:
+ path->mnt = mnt;
+ path->dentry = dentry;
+ __follow_mount(path);
+ return 0;
++hidden:
++ vxwprintk(1, "xid=%d did lookup hidden %p[#%d,%lu] »%s«.",
++ vx_current_xid(), inode, inode->i_tag, inode->i_ino,
++ vxd_path(dentry, mnt));
++ dput(dentry);
++ return -ENOENT;
-+ switch(p->type) {
-+ case PROC_TID_VX_INFO:
-+ case PROC_TGID_VX_INFO:
-+ case PROC_TID_IP_INFO:
-+ case PROC_TGID_IP_INFO:
-+ if (task_vx_flags(task, VXF_INFO_HIDE, 0))
-+ goto out;
-+ default:
-+ break;
+ need_lookup:
+ dentry = real_lookup(nd->dentry, name, nd);
+@@ -1381,7 +1434,8 @@ static inline int check_sticky(struct in
+ * 10. We don't allow removal of NFS sillyrenamed files; it's handled by
+ * nfs_async_unlink().
+ */
+-static int may_delete(struct inode *dir,struct dentry *victim,int isdir)
++static int may_delete(struct inode *dir, struct dentry *victim,
++ int isdir, struct nameidata *nd)
+ {
+ int error;
+
+@@ -1391,13 +1445,13 @@ static int may_delete(struct inode *dir,
+ BUG_ON(victim->d_parent->d_inode != dir);
+ audit_inode_child(victim->d_name.name, victim->d_inode, dir);
+
+- error = permission(dir,MAY_WRITE | MAY_EXEC, NULL);
++ error = permission(dir,MAY_WRITE | MAY_EXEC, nd);
+ if (error)
+ return error;
+ if (IS_APPEND(dir))
+ return -EPERM;
+ if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)||
+- IS_IMMUTABLE(victim->d_inode))
++ IS_IXORUNLINK(victim->d_inode))
+ return -EPERM;
+ if (isdir) {
+ if (!S_ISDIR(victim->d_inode->i_mode))
+@@ -1528,6 +1582,14 @@ int may_open(struct nameidata *nd, int a
+ if (S_ISDIR(inode->i_mode) && (flag & FMODE_WRITE))
+ return -EISDIR;
+
++#ifdef CONFIG_VSERVER_COWBL
++ if (IS_COW(inode) && (flag & FMODE_WRITE)) {
++ if (IS_COW_LINK(inode))
++ return -EMLINK;
++ inode->i_flags &= ~(S_IUNLINK|S_IMMUTABLE);
++ mark_inode_dirty(inode);
+ }
-+
- error = ERR_PTR(-EINVAL);
- inode = proc_pid_make_inode(dir->i_sb, task, p->type);
- if (!inode)
-@@ -1834,6 +1880,16 @@ static struct dentry *proc_pident_lookup
- inode->i_fop = &proc_loginuid_operations;
++#endif
+ error = vfs_permission(nd, acc_mode);
+ if (error)
+ return error;
+@@ -1544,7 +1606,8 @@ int may_open(struct nameidata *nd, int a
+ return -EACCES;
+
+ flag &= ~O_TRUNC;
+- } else if (IS_RDONLY(inode) && (flag & FMODE_WRITE))
++ } else if ((IS_RDONLY(inode) || MNT_IS_RDONLY(nd->mnt))
++ && (flag & FMODE_WRITE))
+ return -EROFS;
+ /*
+ * An append-only file must be opened in append mode for writing.
+@@ -1632,6 +1695,11 @@ int open_namei(int dfd, const char *path
+ struct dentry *dir;
+ int count = 0;
+
++#ifdef CONFIG_VSERVER_COWBL
++ int rflag = flag;
++ int rmode = mode;
++restart:
++#endif
+ acc_mode = ACC_MODE(flag);
+
+ /* O_TRUNC implies we need access checks for write permissions */
+@@ -1725,6 +1793,22 @@ do_last:
+ goto exit;
+ ok:
+ error = may_open(nd, acc_mode, flag);
++#ifdef CONFIG_VSERVER_COWBL
++ if (error == -EMLINK) {
++ struct dentry *dentry;
++ dentry = cow_break_link(pathname);
++ if (IS_ERR(dentry)) {
++ error = PTR_ERR(dentry);
++ goto exit;
++ }
++ dput(dentry);
++ release_open_intent(nd);
++ path_release(nd);
++ flag = rflag;
++ mode = rmode;
++ goto restart;
++ }
++#endif
+ if (error)
+ goto exit;
+ return 0;
+@@ -1836,9 +1920,10 @@ fail:
+ }
+ EXPORT_SYMBOL_GPL(lookup_create);
+
+-int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
++int vfs_mknod(struct inode *dir, struct dentry *dentry,
++ int mode, dev_t dev, struct nameidata *nd)
+ {
+- int error = may_create(dir, dentry, NULL);
++ int error = may_create(dir, dentry, nd);
+
+ if (error)
+ return error;
+@@ -1888,11 +1973,12 @@ asmlinkage long sys_mknodat(int dfd, con
+ error = vfs_create(nd.dentry->d_inode,dentry,mode,&nd);
break;
- #endif
-+ case PROC_TID_VX_INFO:
-+ case PROC_TGID_VX_INFO:
-+ inode->i_fop = &proc_info_file_operations;
-+ ei->op.proc_read = proc_pid_vx_info;
-+ break;
-+ case PROC_TID_IP_INFO:
-+ case PROC_TGID_IP_INFO:
-+ inode->i_fop = &proc_info_file_operations;
-+ ei->op.proc_read = proc_pid_nx_info;
-+ break;
- default:
- printk("procfs: impossible type (%d)",p->type);
- iput(inode);
-@@ -1938,14 +1994,14 @@ static int proc_self_readlink(struct den
- int buflen)
+ case S_IFCHR: case S_IFBLK:
+- error = vfs_mknod(nd.dentry->d_inode,dentry,mode,
+- new_decode_dev(dev));
++ error = vfs_mknod(nd.dentry->d_inode, dentry, mode,
++ new_decode_dev(dev), &nd);
+ break;
+ case S_IFIFO: case S_IFSOCK:
+- error = vfs_mknod(nd.dentry->d_inode,dentry,mode,0);
++ error = vfs_mknod(nd.dentry->d_inode, dentry, mode,
++ 0, &nd);
+ break;
+ case S_IFDIR:
+ error = -EPERM;
+@@ -1915,9 +2001,10 @@ asmlinkage long sys_mknod(const char __u
+ return sys_mknodat(AT_FDCWD, filename, mode, dev);
+ }
+
+-int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
++int vfs_mkdir(struct inode *dir, struct dentry *dentry,
++ int mode, struct nameidata *nd)
{
- char tmp[PROC_NUMBUF];
-- sprintf(tmp, "%d", current->tgid);
-+ sprintf(tmp, "%d", vx_map_tgid(current->tgid));
- return vfs_readlink(dentry,buffer,buflen,tmp);
+- int error = may_create(dir, dentry, NULL);
++ int error = may_create(dir, dentry, nd);
+
+ if (error)
+ return error;
+@@ -1959,7 +2046,7 @@ asmlinkage long sys_mkdirat(int dfd, con
+
+ if (!IS_POSIXACL(nd.dentry->d_inode))
+ mode &= ~current->fs->umask;
+- error = vfs_mkdir(nd.dentry->d_inode, dentry, mode);
++ error = vfs_mkdir(nd.dentry->d_inode, dentry, mode, &nd);
+ dput(dentry);
+ out_unlock:
+ mutex_unlock(&nd.dentry->d_inode->i_mutex);
+@@ -2002,9 +2089,10 @@ void dentry_unhash(struct dentry *dentry
+ spin_unlock(&dcache_lock);
}
- static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
+-int vfs_rmdir(struct inode *dir, struct dentry *dentry)
++int vfs_rmdir(struct inode *dir, struct dentry *dentry,
++ struct nameidata *nd)
{
- char tmp[PROC_NUMBUF];
-- sprintf(tmp, "%d", current->tgid);
-+ sprintf(tmp, "%d", vx_map_tgid(current->tgid));
- return ERR_PTR(vfs_follow_link(nd,tmp));
- }
+- int error = may_delete(dir, dentry, 1);
++ int error = may_delete(dir, dentry, 1, nd);
-@@ -2050,7 +2106,7 @@ struct dentry *proc_pid_lookup(struct in
- goto out;
+ if (error)
+ return error;
+@@ -2066,7 +2154,7 @@ static long do_rmdir(int dfd, const char
+ error = PTR_ERR(dentry);
+ if (IS_ERR(dentry))
+ goto exit2;
+- error = vfs_rmdir(nd.dentry->d_inode, dentry);
++ error = vfs_rmdir(nd.dentry->d_inode, dentry, &nd);
+ dput(dentry);
+ exit2:
+ mutex_unlock(&nd.dentry->d_inode->i_mutex);
+@@ -2082,9 +2170,10 @@ asmlinkage long sys_rmdir(const char __u
+ return do_rmdir(AT_FDCWD, pathname);
+ }
- rcu_read_lock();
-- task = find_task_by_pid(tgid);
-+ task = find_proc_task_by_pid(tgid);
- if (task)
- get_task_struct(task);
- rcu_read_unlock();
-@@ -2060,7 +2116,7 @@ struct dentry *proc_pid_lookup(struct in
- inode = proc_pid_make_inode(dir->i_sb, task, PROC_TGID_INO);
- if (!inode)
- goto out_put_task;
--
-+
- inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
- inode->i_op = &proc_tgid_base_inode_operations;
- inode->i_fop = &proc_tgid_base_operations;
-@@ -2099,9 +2155,11 @@ static struct dentry *proc_task_lookup(s
- tid = name_to_int(dentry);
- if (tid == ~0U)
- goto out;
-+ if (vx_current_initpid(tid))
-+ goto out;
+-int vfs_unlink(struct inode *dir, struct dentry *dentry)
++int vfs_unlink(struct inode *dir, struct dentry *dentry,
++ struct nameidata *nd)
+ {
+- int error = may_delete(dir, dentry, 0);
++ int error = may_delete(dir, dentry, 0, nd);
- rcu_read_lock();
-- task = find_task_by_pid(tid);
-+ task = find_proc_task_by_pid(tid);
- if (task)
- get_task_struct(task);
- rcu_read_unlock();
-@@ -2157,7 +2215,7 @@ static struct task_struct *first_tgid(in
- struct task_struct *pos;
- rcu_read_lock();
- if (tgid && nr) {
-- pos = find_task_by_pid(tgid);
-+ pos = find_proc_task_by_pid(tgid);
- if (pos && thread_group_leader(pos))
- goto found;
- }
-@@ -2234,7 +2292,10 @@ int proc_pid_readdir(struct file * filp,
- task = next_tgid(task), filp->f_pos++) {
- int len;
- ino_t ino;
-- tgid = task->pid;
-+ tgid = vx_map_tgid(task->pid);
-+ if (!proc_pid_visible(task, tgid))
-+ continue;
-+
- len = snprintf(buf, sizeof(buf), "%d", tgid);
- ino = fake_ino(tgid, PROC_TGID_INO);
- if (filldir(dirent, buf, len, filp->f_pos, ino, DT_DIR) < 0) {
-@@ -2268,7 +2329,7 @@ static struct task_struct *first_tid(str
- rcu_read_lock();
- /* Attempt to start with the pid of a thread */
- if (tid && (nr > 0)) {
-- pos = find_task_by_pid(tid);
-+ pos = find_proc_task_by_pid(tid);
- if (pos && (pos->group_leader == leader))
- goto found;
+ if (error)
+ return error;
+@@ -2146,7 +2235,7 @@ static long do_unlinkat(int dfd, const c
+ inode = dentry->d_inode;
+ if (inode)
+ atomic_inc(&inode->i_count);
+- error = vfs_unlink(nd.dentry->d_inode, dentry);
++ error = vfs_unlink(nd.dentry->d_inode, dentry, &nd);
+ exit2:
+ dput(dentry);
}
-@@ -2358,7 +2419,10 @@ static int proc_task_readdir(struct file
- task;
- task = next_tid(task), pos++) {
- int len;
-- tid = task->pid;
-+ tid = vx_map_pid(task->pid);
-+ if (!proc_pid_visible(task, tid))
-+ continue;
-+
- len = snprintf(buf, sizeof(buf), "%d", tid);
- ino = fake_ino(tid, PROC_TID_INO);
- if (filldir(dirent, buf, len, pos, ino, DT_DIR < 0)) {
---- linux-2.6.18.5/fs/proc/generic.c 2006-06-18 04:54:45 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/proc/generic.c 2006-09-20 17:01:44 +0200
-@@ -20,6 +20,7 @@
- #include <linux/namei.h>
- #include <linux/bitops.h>
- #include <linux/spinlock.h>
-+#include <linux/vserver/inode.h>
- #include <asm/uaccess.h>
+@@ -2181,9 +2270,10 @@ asmlinkage long sys_unlink(const char __
+ return do_unlinkat(AT_FDCWD, pathname);
+ }
- #include "internal.h"
-@@ -395,12 +396,16 @@ struct dentry *proc_lookup(struct inode
- for (de = de->subdir; de ; de = de->next) {
- if (de->namelen != dentry->d_name.len)
- continue;
-+ if (!vx_hide_check(0, de->vx_flags))
-+ continue;
- if (!memcmp(dentry->d_name.name, de->name, de->namelen)) {
- unsigned int ino = de->low_ino;
+-int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname, int mode)
++int vfs_symlink(struct inode *dir, struct dentry *dentry,
++ const char *oldname, int mode, struct nameidata *nd)
+ {
+- int error = may_create(dir, dentry, NULL);
++ int error = may_create(dir, dentry, nd);
- spin_unlock(&proc_subdir_lock);
- error = -EINVAL;
- inode = proc_get_inode(dir->i_sb, ino, de);
-+ /* generic proc entries belong to the host */
-+ inode->i_xid = 0;
- spin_lock(&proc_subdir_lock);
- break;
- }
-@@ -476,12 +481,15 @@ int proc_readdir(struct file * filp,
- }
+ if (error)
+ return error;
+@@ -2227,7 +2317,7 @@ asmlinkage long sys_symlinkat(const char
+ if (IS_ERR(dentry))
+ goto out_unlock;
- do {
-+ if (!vx_hide_check(0, de->vx_flags))
-+ goto skip;
- /* filldir passes info to user space */
- spin_unlock(&proc_subdir_lock);
- if (filldir(dirent, de->name, de->namelen, filp->f_pos,
- de->low_ino, de->mode >> 12) < 0)
- goto out;
- spin_lock(&proc_subdir_lock);
-+ skip:
- filp->f_pos++;
- de = de->next;
- } while (de);
-@@ -604,6 +612,7 @@ static struct proc_dir_entry *proc_creat
- ent->namelen = len;
- ent->mode = mode;
- ent->nlink = nlink;
-+ ent->vx_flags = IATTR_PROC_DEFAULT;
- out:
- return ent;
+- error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO);
++ error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO, &nd);
+ dput(dentry);
+ out_unlock:
+ mutex_unlock(&nd.dentry->d_inode->i_mutex);
+@@ -2244,7 +2334,8 @@ asmlinkage long sys_symlink(const char _
+ return sys_symlinkat(oldname, AT_FDCWD, newname);
}
-@@ -624,7 +633,8 @@ struct proc_dir_entry *proc_symlink(cons
- kfree(ent->data);
- kfree(ent);
- ent = NULL;
-- }
-+ } else
-+ ent->vx_flags = IATTR_PROC_SYMLINK;
- } else {
- kfree(ent);
- ent = NULL;
---- linux-2.6.18.5/fs/proc/inode.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/proc/inode.c 2006-09-20 17:01:44 +0200
-@@ -168,6 +168,8 @@ struct inode *proc_get_inode(struct supe
- inode->i_uid = de->uid;
- inode->i_gid = de->gid;
- }
-+ if (de->vx_flags)
-+ PROC_I(inode)->vx_flags = de->vx_flags;
- if (de->size)
- inode->i_size = de->size;
- if (de->nlink)
---- linux-2.6.18.5/fs/proc/internal.h 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/proc/internal.h 2006-11-06 05:08:58 +0100
-@@ -10,6 +10,7 @@
- */
- #include <linux/proc_fs.h>
-+#include <linux/vs_cvirt.h>
+-int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_dentry)
++int vfs_link(struct dentry *old_dentry, struct inode *dir,
++ struct dentry *new_dentry, struct nameidata *nd)
+ {
+ struct inode *inode = old_dentry->d_inode;
+ int error;
+@@ -2252,7 +2343,7 @@ int vfs_link(struct dentry *old_dentry,
+ if (!inode)
+ return -ENOENT;
- struct vmalloc_info {
- unsigned long used;
-@@ -57,7 +58,7 @@ static inline struct pid *proc_pid(struc
+- error = may_create(dir, new_dentry, NULL);
++ error = may_create(dir, new_dentry, nd);
+ if (error)
+ return error;
- static inline struct task_struct *get_proc_task(struct inode *inode)
- {
-- return get_pid_task(proc_pid(inode), PIDTYPE_PID);
-+ return vx_get_proc_task(inode, proc_pid(inode));
- }
+@@ -2262,7 +2353,7 @@ int vfs_link(struct dentry *old_dentry,
+ /*
+ * A link to an append-only or immutable file cannot be created.
+ */
+- if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
++ if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
+ return -EPERM;
+ if (!dir->i_op || !dir->i_op->link)
+ return -EPERM;
+@@ -2322,7 +2413,7 @@ asmlinkage long sys_linkat(int olddfd, c
+ error = PTR_ERR(new_dentry);
+ if (IS_ERR(new_dentry))
+ goto out_unlock;
+- error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
++ error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry, &nd);
+ dput(new_dentry);
+ out_unlock:
+ mutex_unlock(&nd.dentry->d_inode->i_mutex);
+@@ -2454,14 +2545,14 @@ int vfs_rename(struct inode *old_dir, st
+ if (old_dentry->d_inode == new_dentry->d_inode)
+ return 0;
+
+- error = may_delete(old_dir, old_dentry, is_dir);
++ error = may_delete(old_dir, old_dentry, is_dir, NULL);
+ if (error)
+ return error;
- static inline int proc_fd(struct inode *inode)
---- linux-2.6.18.5/fs/proc/proc_misc.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/proc/proc_misc.c 2006-10-25 03:50:01 +0200
-@@ -81,17 +81,32 @@ static int proc_calc_metrics(char *page,
- static int loadavg_read_proc(char *page, char **start, off_t off,
- int count, int *eof, void *data)
- {
-+ unsigned int running, threads;
- int a, b, c;
- int len;
+ if (!new_dentry->d_inode)
+ error = may_create(new_dir, new_dentry, NULL);
+ else
+- error = may_delete(new_dir, new_dentry, is_dir);
++ error = may_delete(new_dir, new_dentry, is_dir, NULL);
+ if (error)
+ return error;
+
+@@ -2539,6 +2630,9 @@ static int do_rename(int olddfd, const c
+ error = -EINVAL;
+ if (old_dentry == trap)
+ goto exit4;
++ error = -EROFS;
++ if (MNT_IS_RDONLY(newnd.mnt))
++ goto exit4;
+ new_dentry = lookup_hash(&newnd);
+ error = PTR_ERR(new_dentry);
+ if (IS_ERR(new_dentry))
+@@ -2632,6 +2726,126 @@ int vfs_follow_link(struct nameidata *nd
+ return __vfs_follow_link(nd, link);
+ }
-- a = avenrun[0] + (FIXED_1/200);
-- b = avenrun[1] + (FIXED_1/200);
-- c = avenrun[2] + (FIXED_1/200);
-- len = sprintf(page,"%d.%02d %d.%02d %d.%02d %ld/%d %d\n",
-+ if (vx_flags(VXF_VIRT_LOAD, 0)) {
-+ struct vx_info *vxi = current->vx_info;
+
-+ a = vxi->cvirt.load[0] + (FIXED_1/200);
-+ b = vxi->cvirt.load[1] + (FIXED_1/200);
-+ c = vxi->cvirt.load[2] + (FIXED_1/200);
++#ifdef CONFIG_VSERVER_COWBL
+
-+ running = atomic_read(&vxi->cvirt.nr_running);
-+ threads = atomic_read(&vxi->cvirt.nr_threads);
-+ } else {
-+ a = avenrun[0] + (FIXED_1/200);
-+ b = avenrun[1] + (FIXED_1/200);
-+ c = avenrun[2] + (FIXED_1/200);
++#include <linux/file.h>
+
-+ running = nr_running();
-+ threads = nr_threads;
++struct dentry *cow_break_link(const char *pathname)
++{
++ int ret, mode, pathlen;
++ struct nameidata old_nd, dir_nd;
++ struct dentry *old_dentry, *new_dentry;
++ struct dentry *res = ERR_PTR(-EMLINK);
++ struct vfsmount *old_mnt, *new_mnt;
++ struct file *old_file;
++ struct file *new_file;
++ char *to, *path, pad='\251';
++ loff_t size;
++
++ vxdprintk(VXD_CBIT(misc, 1), "cow_break_link(»%s«)", pathname);
++ path = kmalloc(PATH_MAX, GFP_KERNEL);
++
++ ret = path_lookup(pathname, LOOKUP_FOLLOW, &old_nd);
++ vxdprintk(VXD_CBIT(misc, 2), "path_lookup(old): %d", ret);
++ old_dentry = old_nd.dentry;
++ old_mnt = old_nd.mnt;
++ mode = old_dentry->d_inode->i_mode;
++
++ to = d_path(old_dentry, old_mnt, path, PATH_MAX-2);
++ pathlen = strlen(to);
++ vxdprintk(VXD_CBIT(misc, 2), "old path »%s«", to);
++
++ to[pathlen+1] = 0;
++retry:
++ to[pathlen] = pad--;
++ if (pad <= '\240')
++ goto out_rel_old;
++
++ vxdprintk(VXD_CBIT(misc, 1), "temp copy »%s«", to);
++ ret = path_lookup(to,
++ LOOKUP_PARENT|LOOKUP_OPEN|LOOKUP_CREATE, &dir_nd);
++
++ /* this puppy downs the inode sem */
++ new_dentry = lookup_create(&dir_nd, 0);
++ vxdprintk(VXD_CBIT(misc, 2),
++ "lookup_create(new): %p", new_dentry);
++ if (!new_dentry) {
++ path_release(&dir_nd);
++ goto retry;
++ }
++
++ ret = vfs_create(dir_nd.dentry->d_inode, new_dentry, mode, &dir_nd);
++ vxdprintk(VXD_CBIT(misc, 2),
++ "vfs_create(new): %d", ret);
++ if (ret == -EEXIST) {
++
++ mutex_unlock(&dir_nd.dentry->d_inode->i_mutex);
++ dput(new_dentry);
++ path_release(&dir_nd);
++ goto retry;
++ }
++
++ new_mnt = dir_nd.mnt;
++
++ dget(old_dentry);
++ mntget(old_mnt);
++ /* this one cleans up the dentry in case of failure */
++ old_file = dentry_open(old_dentry, old_mnt, O_RDONLY);
++ vxdprintk(VXD_CBIT(misc, 2),
++ "dentry_open(old): %p", old_file);
++ if (!old_file)
++ goto out_rel_both;
++
++ dget(new_dentry);
++ mntget(new_mnt);
++ /* this one cleans up the dentry in case of failure */
++ new_file = dentry_open(new_dentry, new_mnt, O_WRONLY);
++ vxdprintk(VXD_CBIT(misc, 2),
++ "dentry_open(new): %p", new_file);
++ if (!new_file)
++ goto out_fput_old;
++
++ size = i_size_read(old_file->f_dentry->d_inode);
++ ret = vfs_sendfile(new_file, old_file, NULL, size, 0);
++ vxdprintk(VXD_CBIT(misc, 2), "vfs_sendfile: %d", ret);
++
++ if (ret < 0)
++ goto out_fput_both;
++
++ ret = vfs_rename(dir_nd.dentry->d_inode, new_dentry,
++ old_nd.dentry->d_parent->d_inode, old_dentry);
++ vxdprintk(VXD_CBIT(misc, 2), "vfs_rename: %d", ret);
++ if (!ret) {
++ res = new_dentry;
++ dget(new_dentry);
+ }
-+ len = sprintf(page,"%d.%02d %d.%02d %d.%02d %d/%d %d\n",
- LOAD_INT(a), LOAD_FRAC(a),
- LOAD_INT(b), LOAD_FRAC(b),
- LOAD_INT(c), LOAD_FRAC(c),
-- nr_running(), nr_threads, last_pid);
-+ running, threads, last_pid);
- return proc_calc_metrics(page, start, off, count, eof, len);
- }
-
-@@ -105,6 +120,9 @@ static int uptime_read_proc(char *page,
-
- do_posix_clock_monotonic_gettime(&uptime);
- cputime_to_timespec(idletime, &idle);
-+ if (vx_flags(VXF_VIRT_UPTIME, 0))
-+ vx_vsi_uptime(&uptime, &idle);
+
- len = sprintf(page,"%lu.%02lu %lu.%02lu\n",
- (unsigned long) uptime.tv_sec,
- (uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-@@ -141,7 +159,7 @@ static int meminfo_read_proc(char *page,
-
- cached = global_page_state(NR_FILE_PAGES) -
- total_swapcache_pages - i.bufferram;
-- if (cached < 0)
-+ if (cached < 0 || vx_flags(VXF_VIRT_MEM, 0))
- cached = 0;
-
- get_vmalloc_info(&vmi);
-@@ -242,8 +260,9 @@ static int version_read_proc(char *page,
++out_fput_both:
++ vxdprintk(VXD_CBIT(misc, 3),
++ "fput(new_file=%p[#%d])", new_file,
++ atomic_read(&new_file->f_count));
++ fput(new_file);
++
++out_fput_old:
++ vxdprintk(VXD_CBIT(misc, 3),
++ "fput(old_file=%p[#%d])", old_file,
++ atomic_read(&old_file->f_count));
++ fput(old_file);
++
++out_rel_both:
++ mutex_unlock(&dir_nd.dentry->d_inode->i_mutex);
++ dput(new_dentry);
++
++ path_release(&dir_nd);
++out_rel_old:
++ path_release(&old_nd);
++ kfree(path);
++ return res;
++}
++
++#endif
++
+ /* get the link contents into pagecache */
+ static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
- int len;
+--- linux-2.6.20/fs/namespace.c 2007-02-06 03:01:24 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/namespace.c 2007-02-06 05:58:26 +0100
+@@ -25,6 +25,11 @@
+ #include <linux/security.h>
+ #include <linux/mount.h>
+ #include <linux/ramfs.h>
++#include <linux/vs_base.h>
++#include <linux/vs_context.h>
++#include <linux/vs_tag.h>
++#include <linux/vserver/space.h>
++#include <linux/vserver/global.h>
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+ #include "pnode.h"
+@@ -241,6 +246,7 @@ static struct vfsmount *clone_mnt(struct
+ mnt->mnt_root = dget(root);
+ mnt->mnt_mountpoint = mnt->mnt_root;
+ mnt->mnt_parent = mnt;
++ mnt->mnt_tag = old->mnt_tag;
-- strcpy(page, linux_banner);
-- len = strlen(page);
-+ len = sprintf(page, vx_linux_banner,
-+ vx_new_uts(release),
-+ vx_new_uts(version));
- return proc_calc_metrics(page, start, off, count, eof, len);
+ if (flag & CL_SLAVE) {
+ list_add(&mnt->mnt_slave, &old->mnt_slave_list);
+@@ -349,44 +355,86 @@ static inline void mangle(struct seq_fil
+ seq_escape(m, s, " \t\n\\");
}
---- linux-2.6.18.5/fs/proc/root.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/proc/root.c 2006-09-20 17:01:44 +0200
-@@ -24,6 +24,9 @@ struct proc_dir_entry *proc_net, *proc_n
- #ifdef CONFIG_SYSCTL
- struct proc_dir_entry *proc_sys_root;
- #endif
-+struct proc_dir_entry *proc_virtual;
++static int mnt_is_reachable(struct vfsmount *mnt)
++{
++ struct vfsmount *root_mnt;
++ struct dentry *root, *point;
++ int ret;
+
-+extern void proc_vx_init(void);
-
- static int proc_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data, struct vfsmount *mnt)
-@@ -77,6 +80,7 @@ void __init proc_root_init(void)
- proc_device_tree_init();
- #endif
- proc_bus = proc_mkdir("bus", NULL);
-+ proc_vx_init();
- }
-
- static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
---- linux-2.6.18.5/fs/quota.c 2006-06-18 04:54:47 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/quota.c 2006-09-20 17:01:44 +0200
-@@ -17,6 +17,9 @@
- #include <linux/buffer_head.h>
- #include <linux/capability.h>
- #include <linux/quotaops.h>
-+#include <linux/major.h>
-+#include <linux/blkdev.h>
-+#include <linux/vserver/debug.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 +84,11 @@ static int generic_quotactl_valid(struct
- if (cmd == Q_GETQUOTA) {
- if (((type == USRQUOTA && current->euid != id) ||
- (type == GRPQUOTA && !in_egroup_p(id))) &&
-- !capable(CAP_SYS_ADMIN))
-+ !vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
- return -EPERM;
- }
- else if (cmd != Q_GETFMT && cmd != Q_SYNC && cmd != Q_GETINFO)
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
- return -EPERM;
-
- return 0;
-@@ -132,10 +135,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))) &&
-- !capable(CAP_SYS_ADMIN))
-+ !vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
- return -EPERM;
- } else if (cmd != Q_XGETQSTAT && cmd != Q_XQUOTASYNC) {
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
- return -EPERM;
- }
-
-@@ -337,6 +340,43 @@ static int do_quotactl(struct super_bloc
- return 0;
- }
-
-+#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
++ if (mnt == mnt->mnt_ns->root)
++ return 1;
+
-+#include <linux/vroot.h>
-+#include <linux/kallsyms.h>
++ spin_lock(&vfsmount_lock);
++ root_mnt = current->fs->rootmnt;
++ root = current->fs->root;
++ point = root;
+
-+static vroot_grb_func *vroot_get_real_bdev = NULL;
++ while ((mnt != mnt->mnt_parent) && (mnt != root_mnt)) {
++ point = mnt->mnt_mountpoint;
++ mnt = mnt->mnt_parent;
++ }
+
-+static spinlock_t vroot_grb_lock = SPIN_LOCK_UNLOCKED;
++ ret = (mnt == root_mnt) && is_subdir(point, root);
+
-+int register_vroot_grb(vroot_grb_func *func) {
-+ int ret = -EBUSY;
++ spin_unlock(&vfsmount_lock);
+
-+ spin_lock(&vroot_grb_lock);
-+ if (!vroot_get_real_bdev) {
-+ vroot_get_real_bdev = func;
-+ ret = 0;
-+ }
-+ spin_unlock(&vroot_grb_lock);
-+ return ret;
-+}
-+EXPORT_SYMBOL(register_vroot_grb);
-+
-+int unregister_vroot_grb(vroot_grb_func *func) {
-+ int ret = -EINVAL;
-+
-+ spin_lock(&vroot_grb_lock);
-+ if (vroot_get_real_bdev) {
-+ vroot_get_real_bdev = NULL;
-+ ret = 0;
-+ }
-+ spin_unlock(&vroot_grb_lock);
+ return ret;
+}
-+EXPORT_SYMBOL(unregister_vroot_grb);
+
-+#endif
-+
- /*
- * This is the system call interface. This communicates with
- * the user-level programs. Currently this only supports diskquota
-@@ -362,6 +402,23 @@ asmlinkage long sys_quotactl(unsigned in
- putname(tmp);
- if (IS_ERR(bdev))
- return PTR_ERR(bdev);
-+#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
-+ if (bdev && bdev->bd_inode &&
-+ imajor(bdev->bd_inode) == VROOT_MAJOR) {
-+ struct block_device *bdnew = (void *)-EINVAL;
-+
-+ if (vroot_get_real_bdev)
-+ bdnew = vroot_get_real_bdev(bdev);
-+ else
-+ vxdprintk(VXD_CBIT(misc, 0),
-+ "vroot_get_real_bdev not set");
+ static int show_vfsmnt(struct seq_file *m, void *v)
+ {
+ struct vfsmount *mnt = v;
+ int err = 0;
+ static struct proc_fs_info {
+- int flag;
+- char *str;
++ int s_flag;
++ int mnt_flag;
++ char *set_str;
++ char *unset_str;
+ } fs_info[] = {
+- { MS_SYNCHRONOUS, ",sync" },
+- { MS_DIRSYNC, ",dirsync" },
+- { MS_MANDLOCK, ",mand" },
+- { 0, NULL }
+- };
+- static struct proc_fs_info mnt_info[] = {
+- { MNT_NOSUID, ",nosuid" },
+- { MNT_NODEV, ",nodev" },
+- { MNT_NOEXEC, ",noexec" },
+- { MNT_NOATIME, ",noatime" },
+- { MNT_NODIRATIME, ",nodiratime" },
+- { MNT_RELATIME, ",relatime" },
+- { 0, NULL }
++ { MS_RDONLY, MNT_RDONLY, "ro", "rw" },
++ { MS_SYNCHRONOUS, 0, ",sync", NULL },
++ { MS_DIRSYNC, 0, ",dirsync", NULL },
++ { MS_MANDLOCK, 0, ",mand", NULL },
++ { MS_TAGGED, 0, ",tag", NULL },
++ { MS_NOATIME, MNT_NOATIME, ",noatime", NULL },
++ { MS_NODIRATIME, MNT_NODIRATIME, ",nodiratime", NULL },
++ { MS_RELATIME, MNT_RELATIME, ",relatime", NULL },
++ { 0, MNT_NOSUID, ",nosuid", NULL },
++ { 0, MNT_NODEV, ",nodev", NULL },
++ { 0, MNT_NOEXEC, ",noexec", NULL },
++ { 0, 0, NULL, NULL }
+ };
+- struct proc_fs_info *fs_infop;
++ struct proc_fs_info *p;
++ unsigned long s_flags = mnt->mnt_sb->s_flags;
++ int mnt_flags = mnt->mnt_flags;
+
+- mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none");
+- seq_putc(m, ' ');
+- seq_path(m, mnt, mnt->mnt_root, " \t\n\\");
+- seq_putc(m, ' ');
+- mangle(m, mnt->mnt_sb->s_type->name);
+- seq_puts(m, mnt->mnt_sb->s_flags & MS_RDONLY ? " ro" : " rw");
+- for (fs_infop = fs_info; fs_infop->flag; fs_infop++) {
+- if (mnt->mnt_sb->s_flags & fs_infop->flag)
+- seq_puts(m, fs_infop->str);
++ if (vx_flags(VXF_HIDE_MOUNT, 0))
++ return 0;
++ if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
++ return 0;
+
-+ bdput(bdev);
-+ if (IS_ERR(bdnew))
-+ return PTR_ERR(bdnew);
-+ bdev = bdnew;
++ if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
++ mnt == current->fs->rootmnt) {
++ seq_puts(m, "/dev/root / ");
++ } else {
++ mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none");
++ seq_putc(m, ' ');
++ seq_path(m, mnt, mnt->mnt_root, " \t\n\\");
++ seq_putc(m, ' ');
+ }
+- for (fs_infop = mnt_info; fs_infop->flag; fs_infop++) {
+- if (mnt->mnt_flags & fs_infop->flag)
+- seq_puts(m, fs_infop->str);
++ mangle(m, mnt->mnt_sb->s_type->name);
++ seq_putc(m, ' ');
++ for (p = fs_info; (p->s_flag | p->mnt_flag) ; p++) {
++ if ((s_flags & p->s_flag) || (mnt_flags & p->mnt_flag)) {
++ if (p->set_str)
++ seq_puts(m, p->set_str);
++ } else {
++ if (p->unset_str)
++ seq_puts(m, p->unset_str);
+ }
-+#endif
- sb = get_super(bdev);
- bdput(bdev);
- if (!sb)
---- linux-2.6.18.5/fs/reiserfs/bitmap.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/reiserfs/bitmap.c 2006-09-20 17:01:44 +0200
-@@ -12,6 +12,7 @@
- #include <linux/reiserfs_fs_sb.h>
- #include <linux/reiserfs_fs_i.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
-
- #define PREALLOCATION_SIZE 9
+ }
++ if (mnt->mnt_flags & MNT_TAGID)
++ seq_printf(m, ",tag=%d", mnt->mnt_tag);
+ if (mnt->mnt_sb->s_op->show_options)
+ err = mnt->mnt_sb->s_op->show_options(m, mnt);
+ seq_puts(m, " 0 0\n");
+@@ -405,17 +453,27 @@ static int show_vfsstat(struct seq_file
+ struct vfsmount *mnt = v;
+ int err = 0;
-@@ -410,8 +411,10 @@ static void _reiserfs_free_block(struct
- set_sb_free_blocks(rs, sb_free_blocks(rs) + 1);
+- /* device */
+- if (mnt->mnt_devname) {
+- seq_puts(m, "device ");
+- mangle(m, mnt->mnt_devname);
+- } else
+- seq_puts(m, "no device");
++ if (vx_flags(VXF_HIDE_MOUNT, 0))
++ return 0;
++ if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
++ return 0;
- journal_mark_dirty(th, s, sbh);
-- if (for_unformatted)
-+ if (for_unformatted) {
-+ DLIMIT_FREE_BLOCK(inode, 1);
- DQUOT_FREE_BLOCK_NODIRTY(inode, 1);
+- /* mount point */
+- seq_puts(m, " mounted on ");
+- seq_path(m, mnt, mnt->mnt_root, " \t\n\\");
+- seq_putc(m, ' ');
++ if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
++ mnt == current->fs->rootmnt) {
++ seq_puts(m, "device /dev/root mounted on / ");
++ } else {
++ /* device */
++ if (mnt->mnt_devname) {
++ seq_puts(m, "device ");
++ mangle(m, mnt->mnt_devname);
++ } else
++ seq_puts(m, "no device");
++
++ /* mount point */
++ seq_puts(m, " mounted on ");
++ seq_path(m, mnt, mnt->mnt_root, " \t\n\\");
++ seq_putc(m, ' ');
+ }
- }
- void reiserfs_free_block(struct reiserfs_transaction_handle *th,
-@@ -1020,6 +1023,7 @@ static inline int blocknrs_and_prealloc_
- int passno = 0;
- int nr_allocated = 0;
- int bigalloc = 0;
-+ int blocks;
-
- determine_prealloc_size(hint);
- if (!hint->formatted_node) {
-@@ -1029,19 +1033,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;
- }
-@@ -1092,7 +1107,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,
-@@ -1124,10 +1142,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);
- }
+ /* file system type */
+ seq_puts(m, "with fstype ");
+@@ -645,7 +703,7 @@ asmlinkage long sys_umount(char __user *
+ goto dput_and_out;
- return CARRY_ON;
---- linux-2.6.18.5/fs/reiserfs/file.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/reiserfs/file.c 2006-09-20 17:01:44 +0200
-@@ -1586,4 +1586,5 @@ struct inode_operations reiserfs_file_in
- .listxattr = reiserfs_listxattr,
- .removexattr = reiserfs_removexattr,
- .permission = reiserfs_permission,
-+ .sync_flags = reiserfs_sync_flags,
- };
---- linux-2.6.18.5/fs/reiserfs/inode.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/reiserfs/inode.c 2006-09-20 17:01:44 +0200
-@@ -16,6 +16,8 @@
- #include <linux/mpage.h>
- #include <linux/writeback.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
-+#include <linux/vserver/xid.h>
+ retval = -EPERM;
+- if (!capable(CAP_SYS_ADMIN))
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ goto dput_and_out;
- extern int reiserfs_default_io_size; /* default io size devuned in super.c */
+ retval = do_umount(nd.mnt, flags);
+@@ -669,7 +727,7 @@ asmlinkage long sys_oldumount(char __use
-@@ -52,6 +54,7 @@ void reiserfs_delete_inode(struct inode
- * stat data deletion */
- if (!err)
- DQUOT_FREE_INODE(inode);
-+ DLIMIT_FREE_INODE(inode);
+ static int mount_is_safe(struct nameidata *nd)
+ {
+- if (capable(CAP_SYS_ADMIN))
++ if (vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ return 0;
+ return -EPERM;
+ #ifdef notyet
+@@ -898,11 +956,13 @@ static int do_change_type(struct nameida
+ /*
+ * do loopback mount.
+ */
+-static int do_loopback(struct nameidata *nd, char *old_name, int recurse)
++static int do_loopback(struct nameidata *nd, char *old_name, tag_t tag,
++ unsigned long flags, int mnt_flags)
+ {
+ struct nameidata old_nd;
+ struct vfsmount *mnt = NULL;
+ int err = mount_is_safe(nd);
++ int recurse = flags & MS_REC;
+ if (err)
+ return err;
+ if (!old_name || !*old_name)
+@@ -928,6 +988,12 @@ static int do_loopback(struct nameidata
+ if (!mnt)
+ goto out;
- if (journal_end(&th, inode->i_sb, jbegin_count))
- goto out;
-@@ -1116,6 +1119,8 @@ static void init_inode(struct inode *ino
- struct buffer_head *bh;
- struct item_head *ih;
- __u32 rdev;
-+ uid_t uid;
-+ gid_t gid;
- //int version = ITEM_VERSION_1;
-
- bh = PATH_PLAST_BUFFER(path);
-@@ -1139,12 +1144,13 @@ static void init_inode(struct inode *ino
- (struct stat_data_v1 *)B_I_PITEM(bh, ih);
- unsigned long blocks;
-
-+ uid = sd_v1_uid(sd);
-+ gid = sd_v1_gid(sd);
-+
- set_inode_item_key_version(inode, KEY_FORMAT_3_5);
- set_inode_sd_version(inode, STAT_DATA_V1);
- inode->i_mode = sd_v1_mode(sd);
- inode->i_nlink = sd_v1_nlink(sd);
-- inode->i_uid = sd_v1_uid(sd);
-- inode->i_gid = sd_v1_gid(sd);
- 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
- // (directories and symlinks)
- struct stat_data *sd = (struct stat_data *)B_I_PITEM(bh, ih);
-
-+ uid = sd_v2_uid(sd);
-+ gid = sd_v2_gid(sd);
++ mnt->mnt_flags = mnt_flags;
++ if (flags & MS_TAGID) {
++ mnt->mnt_tag = tag;
++ mnt->mnt_flags |= MNT_TAGID;
++ }
+
- inode->i_mode = sd_v2_mode(sd);
- inode->i_nlink = sd_v2_nlink(sd);
-- inode->i_uid = sd_v2_uid(sd);
- inode->i_size = sd_v2_size(sd);
-- inode->i_gid = sd_v2_gid(sd);
- 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
- sd_attrs_to_i_attrs(sd_v2_attrs(sd), inode);
+ err = graft_tree(mnt, nd);
+ if (err) {
+ LIST_HEAD(umount_list);
+@@ -936,6 +1002,7 @@ static int do_loopback(struct nameidata
+ spin_unlock(&vfsmount_lock);
+ release_mounts(&umount_list);
}
++ mnt->mnt_flags = mnt_flags;
-+ inode->i_uid = INOXID_UID(XID_TAG(inode), uid, gid);
-+ inode->i_gid = INOXID_GID(XID_TAG(inode), uid, gid);
-+ inode->i_xid = INOXID_XID(XID_TAG(inode), uid, gid, 0);
-+
- 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
- static void inode2sd(void *sd, struct inode *inode, loff_t size)
+ out:
+ up_write(&namespace_sem);
+@@ -949,12 +1016,12 @@ out:
+ * on it - tough luck.
+ */
+ static int do_remount(struct nameidata *nd, int flags, int mnt_flags,
+- void *data)
++ void *data, xid_t xid)
{
- struct stat_data *sd_v2 = (struct stat_data *)sd;
-+ uid_t uid = XIDINO_UID(XID_TAG(inode), inode->i_uid, inode->i_xid);
-+ gid_t gid = XIDINO_GID(XID_TAG(inode), inode->i_gid, inode->i_xid);
- __u16 flags;
+ int err;
+ struct super_block *sb = nd->mnt->mnt_sb;
-+ set_sd_v2_uid(sd_v2, uid);
-+ set_sd_v2_gid(sd_v2, gid);
- set_sd_v2_mode(sd_v2, inode->i_mode);
- set_sd_v2_nlink(sd_v2, inode->i_nlink);
-- set_sd_v2_uid(sd_v2, inode->i_uid);
- set_sd_v2_size(sd_v2, size);
-- set_sd_v2_gid(sd_v2, inode->i_gid);
- 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);
-@@ -1779,6 +1792,10 @@ int reiserfs_new_inode(struct reiserfs_t
+- if (!capable(CAP_SYS_ADMIN))
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_REMOUNT))
+ return -EPERM;
- BUG_ON(!th->t_trans_id);
+ if (!check_mnt(nd->mnt))
+@@ -988,7 +1055,7 @@ static int do_move_mount(struct nameidat
+ struct nameidata old_nd, parent_nd;
+ struct vfsmount *p;
+ int err = 0;
+- if (!capable(CAP_SYS_ADMIN))
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ return -EPERM;
+ if (!old_name || !*old_name)
+ return -EINVAL;
+@@ -1068,7 +1135,7 @@ static int do_new_mount(struct nameidata
+ return -EINVAL;
-+ if (DLIMIT_ALLOC_INODE(inode)) {
-+ err = -ENOSPC;
-+ goto out_bad_dlimit;
-+ }
- if (DQUOT_ALLOC_INODE(inode)) {
- err = -EDQUOT;
- goto out_end_trans;
-@@ -1964,6 +1981,9 @@ int reiserfs_new_inode(struct reiserfs_t
- DQUOT_FREE_INODE(inode);
+ /* we need capabilities... */
+- if (!capable(CAP_SYS_ADMIN))
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ return -EPERM;
- 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);
-@@ -2701,6 +2721,14 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs,
- inode->i_flags |= S_IMMUTABLE;
- else
- inode->i_flags &= ~S_IMMUTABLE;
-+ if (sd_attrs & REISERFS_IUNLINK_FL)
-+ inode->i_flags |= S_IUNLINK;
-+ else
-+ inode->i_flags &= ~S_IUNLINK;
-+ if (sd_attrs & REISERFS_BARRIER_FL)
-+ inode->i_flags |= S_BARRIER;
-+ else
-+ inode->i_flags &= ~S_BARRIER;
- if (sd_attrs & REISERFS_APPEND_FL)
- inode->i_flags |= S_APPEND;
- else
-@@ -2723,6 +2751,14 @@ 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_IUNLINK)
-+ *sd_attrs |= REISERFS_IUNLINK_FL;
-+ else
-+ *sd_attrs &= ~REISERFS_IUNLINK_FL;
-+ if (inode->i_flags & S_BARRIER)
-+ *sd_attrs |= REISERFS_BARRIER_FL;
-+ else
-+ *sd_attrs &= ~REISERFS_BARRIER_FL;
- if (inode->i_flags & S_SYNC)
- *sd_attrs |= REISERFS_SYNC_FL;
- else
-@@ -2902,6 +2938,22 @@ static ssize_t reiserfs_direct_IO(int rw
- reiserfs_get_blocks_direct_io, NULL);
- }
+ mnt = do_kern_mount(type, flags, name, data);
+@@ -1380,6 +1447,7 @@ long do_mount(char *dev_name, char *dir_
+ struct nameidata nd;
+ int retval = 0;
+ int mnt_flags = 0;
++ tag_t tag = 0;
-+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);
+ /* Discard magic */
+ if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
+@@ -1395,7 +1463,19 @@ long do_mount(char *dev_name, char *dir_
+ if (data_page)
+ ((char *)data_page)[PAGE_SIZE - 1] = 0;
+
++#ifdef CONFIG_PROPAGATE
++ retval = dx_parse_tag(data_page, &tag, 1);
++ if (retval) {
++ mnt_flags |= MNT_TAGID;
++ /* bind and re-mounts get the tag flag */
++ if (flags & (MS_BIND|MS_REMOUNT))
++ flags |= MS_TAGID;
+ }
-+ return 0;
-+}
++#endif
+
- int reiserfs_setattr(struct dentry *dentry, struct iattr *attr)
- {
- struct inode *inode = dentry->d_inode;
-@@ -2951,9 +3003,11 @@ int reiserfs_setattr(struct dentry *dent
- }
+ /* Separate the per-mountpoint flags */
++ if (flags & MS_RDONLY)
++ mnt_flags |= MNT_RDONLY;
+ if (flags & MS_NOSUID)
+ mnt_flags |= MNT_NOSUID;
+ if (flags & MS_NODEV)
+@@ -1409,6 +1489,8 @@ long do_mount(char *dev_name, char *dir_
+ if (flags & MS_RELATIME)
+ mnt_flags |= MNT_RELATIME;
- 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_XID && attr->ia_xid != inode->i_xid)) {
- error = reiserfs_chown_xattrs(inode, attr);
++ if (!capable(CAP_SYS_ADMIN))
++ mnt_flags |= MNT_NODEV;
+ flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE |
+ MS_NOATIME | MS_NODIRATIME | MS_RELATIME);
- if (!error) {
-@@ -2983,6 +3037,9 @@ int reiserfs_setattr(struct dentry *dent
- inode->i_uid = attr->ia_uid;
- if (attr->ia_valid & ATTR_GID)
- inode->i_gid = attr->ia_gid;
-+ if ((attr->ia_valid & ATTR_XID) &&
-+ IS_TAGXID(inode))
-+ inode->i_xid = attr->ia_xid;
- mark_inode_dirty(inode);
- error =
- journal_end(&th, inode->i_sb, jbegin_count);
---- linux-2.6.18.5/fs/reiserfs/ioctl.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/reiserfs/ioctl.c 2006-09-20 17:01:44 +0200
-@@ -4,6 +4,7 @@
+@@ -1423,9 +1505,9 @@ long do_mount(char *dev_name, char *dir_
- #include <linux/capability.h>
- #include <linux/fs.h>
-+#include <linux/mount.h>
- #include <linux/reiserfs_fs.h>
- #include <linux/time.h>
- #include <asm/uaccess.h>
-@@ -23,7 +24,7 @@ static int reiserfs_unpack(struct inode
- int reiserfs_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
- unsigned long arg)
- {
-- unsigned int flags;
-+ unsigned int flags, oldflags;
+ if (flags & MS_REMOUNT)
+ retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
+- data_page);
++ data_page, tag);
+ else if (flags & MS_BIND)
+- retval = do_loopback(&nd, dev_name, flags & MS_REC);
++ retval = do_loopback(&nd, dev_name, tag, flags, mnt_flags);
+ else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
+ retval = do_change_type(&nd, flags);
+ else if (flags & MS_MOVE)
+@@ -1499,6 +1581,7 @@ struct mnt_namespace *dup_mnt_ns(struct
+ q = next_mnt(q, new_ns->root);
+ }
+ up_write(&namespace_sem);
++ atomic_inc(&vs_global_mnt_ns);
- switch (cmd) {
- case REISERFS_IOC_UNPACK:
-@@ -42,12 +43,14 @@ int reiserfs_ioctl(struct inode *inode,
+ if (rootmnt)
+ mntput(rootmnt);
+@@ -1524,7 +1607,7 @@ int copy_mnt_ns(int flags, struct task_s
+ if (!(flags & CLONE_NEWNS))
+ return 0;
- flags = REISERFS_I(inode)->i_attrs;
- i_attrs_to_sd_attrs(inode, (__u16 *) & flags);
-+ flags &= REISERFS_FL_USER_VISIBLE;
- return put_user(flags, (int __user *)arg);
- case REISERFS_IOC_SETFLAGS:{
- if (!reiserfs_attrs(inode->i_sb))
- return -ENOTTY;
+- if (!capable(CAP_SYS_ADMIN)) {
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT)) {
+ err = -EPERM;
+ goto out;
+ }
+@@ -1876,5 +1959,6 @@ void __put_mnt_ns(struct mnt_namespace *
+ spin_unlock(&vfsmount_lock);
+ up_write(&namespace_sem);
+ release_mounts(&umount_list);
++ atomic_dec(&vs_global_mnt_ns);
+ kfree(ns);
+ }
+--- linux-2.6.20/fs/nfs/client.c 2007-02-06 03:01:24 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/nfs/client.c 2007-02-06 03:05:22 +0100
+@@ -520,6 +520,9 @@ static int nfs_init_server_rpcclient(str
+ if (server->flags & NFS4_MOUNT_INTR)
+ server->client->cl_intr = 1;
+
++ server->client->cl_tag = 0;
++ if (server->flags & NFS_MOUNT_TAGGED)
++ server->client->cl_tag = 1;
+ return 0;
+ }
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
+@@ -676,6 +679,10 @@ static void nfs_server_set_fsinfo(struct
+ server->acdirmin = server->acdirmax = 0;
+ }
- if ((current->fsuid != inode->i_uid)
-@@ -57,10 +60,12 @@ int reiserfs_ioctl(struct inode *inode,
- if (get_user(flags, (int __user *)arg))
- return -EFAULT;
++ /* FIXME: needs fsinfo
++ if (server->flags & NFS_MOUNT_TAGGED)
++ sb->s_flags |= MS_TAGGED; */
++
+ server->maxfilesize = fsinfo->maxfilesize;
-- if (((flags ^ REISERFS_I(inode)->
-- i_attrs) & (REISERFS_IMMUTABLE_FL |
-- REISERFS_APPEND_FL))
-- && !capable(CAP_LINUX_IMMUTABLE))
-+ oldflags = REISERFS_I(inode) -> i_attrs;
-+ if (((oldflags & REISERFS_IMMUTABLE_FL) ||
-+ ((flags ^ oldflags) &
-+ (REISERFS_IMMUTABLE_FL | REISERFS_IUNLINK_FL |
-+ REISERFS_APPEND_FL))) &&
-+ !capable(CAP_LINUX_IMMUTABLE))
- return -EPERM;
+ /* We're airborne Set socket buffersize */
+--- linux-2.6.20/fs/nfs/dir.c 2007-02-06 03:01:24 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/nfs/dir.c 2007-02-06 03:05:22 +0100
+@@ -33,6 +33,7 @@
+ #include <linux/pagevec.h>
+ #include <linux/namei.h>
+ #include <linux/mount.h>
++#include <linux/vs_tag.h>
- if ((flags & REISERFS_NOTAIL_FL) &&
-@@ -71,6 +76,9 @@ int reiserfs_ioctl(struct inode *inode,
- if (result)
- return result;
- }
-+
-+ flags = 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;
-@@ -82,7 +90,8 @@ int reiserfs_ioctl(struct inode *inode,
- case REISERFS_IOC_SETVERSION:
- if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
- return -EPERM;
-- if (IS_RDONLY(inode))
-+ if (IS_RDONLY(inode) ||
-+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
- return -EROFS;
- if (get_user(inode->i_generation, (int __user *)arg))
- return -EFAULT;
---- linux-2.6.18.5/fs/reiserfs/namei.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/reiserfs/namei.c 2006-09-20 17:01:44 +0200
-@@ -18,6 +18,7 @@
- #include <linux/reiserfs_xattr.h>
- #include <linux/smp_lock.h>
- #include <linux/quotaops.h>
-+#include <linux/vserver/xid.h>
-
- #define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { i->i_nlink++; if (i->i_nlink >= REISERFS_LINK_MAX) i->i_nlink=1; }
- #define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) i->i_nlink--;
-@@ -364,6 +365,7 @@ static struct dentry *reiserfs_lookup(st
- reiserfs_write_unlock(dir->i_sb);
- return ERR_PTR(-EACCES);
- }
-+ vx_propagate_xid(nd, inode);
+ #include "nfs4_fs.h"
+ #include "delegation.h"
+@@ -933,6 +934,7 @@ static struct dentry *nfs_lookup(struct
+ if (IS_ERR(res))
+ goto out_unlock;
- /* Propogate the priv_object flag so we know we're in the priv tree */
- if (is_reiserfs_priv_object(dir))
-@@ -599,6 +601,7 @@ static int new_inode_init(struct inode *
- } else {
- inode->i_gid = current->fsgid;
- }
-+ inode->i_xid = vx_current_fsxid(inode->i_sb);
- DQUOT_INIT(inode);
- return 0;
++ dx_propagate_tag(nd, inode);
+ no_entry:
+ res = d_materialise_unique(dentry, inode);
+ if (res != NULL) {
+@@ -975,7 +977,8 @@ static int is_atomic_open(struct inode *
+ if (nd->flags & LOOKUP_DIRECTORY)
+ return 0;
+ /* Are we trying to write to a read only partition? */
+- if (IS_RDONLY(dir) && (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE)))
++ if ((IS_RDONLY(dir) || MNT_IS_RDONLY(nd->mnt)) &&
++ (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE)))
+ return 0;
+ return 1;
}
-@@ -1545,6 +1548,7 @@ struct inode_operations reiserfs_dir_ino
- .listxattr = reiserfs_listxattr,
- .removexattr = reiserfs_removexattr,
- .permission = reiserfs_permission,
-+ .sync_flags = reiserfs_sync_flags,
- };
+--- linux-2.6.20/fs/nfs/inode.c 2007-02-06 03:01:24 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/nfs/inode.c 2007-02-06 03:05:22 +0100
+@@ -37,6 +37,7 @@
+ #include <linux/vfs.h>
+ #include <linux/inet.h>
+ #include <linux/nfs_xdr.h>
++#include <linux/vs_tag.h>
- /*
-@@ -1561,6 +1565,7 @@ struct inode_operations reiserfs_symlink
- .listxattr = reiserfs_listxattr,
- .removexattr = reiserfs_removexattr,
- .permission = reiserfs_permission,
-+ .sync_flags = reiserfs_sync_flags,
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+@@ -279,8 +280,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
+@@ -369,6 +372,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;
++ if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode))
++ inode->i_tag = attr->ia_tag;
+ spin_lock(&inode->i_lock);
+ NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
+ spin_unlock(&inode->i_lock);
+@@ -815,6 +820,9 @@ static int nfs_check_inode_attributes(st
+ struct nfs_inode *nfsi = NFS_I(inode);
+ loff_t cur_size, new_isize;
+ int data_unstable;
++ uid_t uid;
++ gid_t gid;
++ tag_t tag;
- };
-@@ -1574,5 +1579,6 @@ struct inode_operations reiserfs_special
- .listxattr = reiserfs_listxattr,
- .removexattr = reiserfs_removexattr,
- .permission = reiserfs_permission,
-+ .sync_flags = reiserfs_sync_flags,
+ /* Has the inode gone and changed behind our back? */
+@@ -842,10 +850,15 @@ static int nfs_check_inode_attributes(st
+ if (cur_size != new_isize && nfsi->npages == 0)
+ nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
- };
---- linux-2.6.18.5/fs/reiserfs/stree.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/reiserfs/stree.c 2006-09-20 17:01:44 +0200
-@@ -56,6 +56,7 @@
- #include <linux/smp_lock.h>
- #include <linux/buffer_head.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_dlimit.h>
++ 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)
+ nfsi->cache_validity |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
- /* 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);
+ /* Has the link count changed? */
+@@ -935,6 +948,9 @@ static int nfs_update_inode(struct inode
+ loff_t cur_isize, new_isize;
+ unsigned int invalid = 0;
+ int data_stable;
++ uid_t uid;
++ gid_t gid;
++ tag_t tag;
- /* Return deleted body length */
-@@ -1383,6 +1385,7 @@ void reiserfs_delete_solid_item(struct r
- quota_cut_bytes, inode->i_uid,
- key2type(key));
- #endif
-+ DLIMIT_FREE_SPACE(inode, quota_cut_bytes);
- DQUOT_FREE_SPACE_NODIRTY(inode,
- quota_cut_bytes);
- }
-@@ -1740,6 +1743,7 @@ int reiserfs_cut_from_item(struct reiser
- "reiserquota cut_from_item(): freeing %u id=%u type=%c",
- quota_cut_bytes, p_s_inode->i_uid, '?');
- #endif
-+ DLIMIT_FREE_SPACE(p_s_inode, quota_cut_bytes);
- DQUOT_FREE_SPACE_NODIRTY(p_s_inode, quota_cut_bytes);
- return n_ret_value;
- }
-@@ -1981,6 +1985,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
-@@ -2033,6 +2042,7 @@ int reiserfs_paste_into_item(struct reis
- n_pasted_size, inode->i_uid,
- key2type(&(p_s_key->on_disk_key)));
- #endif
-+ DLIMIT_FREE_SPACE(inode, n_pasted_size);
- DQUOT_FREE_SPACE_NODIRTY(inode, n_pasted_size);
- return retval;
- }
-@@ -2070,6 +2080,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));
-@@ -2117,7 +2132,9 @@ int reiserfs_insert_item(struct reiserfs
- "reiserquota insert_item(): freeing %u id=%u type=%c",
- quota_bytes, inode->i_uid, head2type(p_s_ih));
- #endif
-- if (inode)
-+ if (inode) {
-+ DLIMIT_FREE_SPACE(inode, quota_bytes);
- DQUOT_FREE_SPACE_NODIRTY(inode, quota_bytes);
-+ }
- return retval;
- }
---- linux-2.6.18.5/fs/reiserfs/super.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/reiserfs/super.c 2006-09-20 17:01:44 +0200
-@@ -882,6 +882,9 @@ static int reiserfs_parse_options(struct
- {"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
- {"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
- #endif
-+#ifndef CONFIG_INOXID_NONE
-+ {"tagxid",.setmask = 1 << REISERFS_TAGXID},
-+#endif
- #ifdef CONFIG_REISERFS_FS_POSIX_ACL
- {"acl",.setmask = 1 << REISERFS_POSIXACL},
- {"noacl",.clrmask = 1 << REISERFS_POSIXACL},
-@@ -1154,6 +1157,12 @@ static int reiserfs_remount(struct super
- return -EINVAL;
+ dfprintk(VFS, "NFS: %s(%s/%ld ct=%d info=0x%x)\n",
+ __FUNCTION__, inode->i_sb->s_id, inode->i_ino,
+@@ -1007,15 +1023,21 @@ static int nfs_update_inode(struct inode
}
+ memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
-+ if ((mount_options & (1 << REISERFS_TAGXID)) &&
-+ !(s->s_flags & MS_TAGXID)) {
-+ reiserfs_warning(s, "reiserfs: tagxid not permitted on remount.");
-+ return -EINVAL;
-+ }
++ 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);
+
- handle_attrs(s);
+ 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;
- /* Add options that are safe here */
-@@ -1729,6 +1738,10 @@ static int reiserfs_fill_super(struct su
- goto error;
- }
+ 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;
-+ /* map mount option tagxid */
-+ if (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_TAGXID))
-+ s->s_flags |= MS_TAGXID;
-+
- 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,
---- linux-2.6.18.5/fs/reiserfs/xattr.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/reiserfs/xattr.c 2006-09-20 17:01:44 +0200
-@@ -35,6 +35,7 @@
- #include <linux/namei.h>
- #include <linux/errno.h>
- #include <linux/fs.h>
-+#include <linux/mount.h>
- #include <linux/file.h>
- #include <linux/pagemap.h>
- #include <linux/xattr.h>
-@@ -823,7 +824,7 @@ int reiserfs_delete_xattrs(struct inode
- if (dir->d_inode->i_nlink <= 2) {
- root = get_xa_root(inode->i_sb);
- reiserfs_write_lock_xattrs(inode->i_sb);
-- err = vfs_rmdir(root->d_inode, dir);
-+ err = vfs_rmdir(root->d_inode, dir, NULL);
- reiserfs_write_unlock_xattrs(inode->i_sb);
- dput(root);
- } else {
---- linux-2.6.18.5/fs/stat.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/stat.c 2006-09-20 17:01:44 +0200
-@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
- stat->nlink = inode->i_nlink;
- stat->uid = inode->i_uid;
- stat->gid = inode->i_gid;
-+ stat->xid = inode->i_xid;
- stat->rdev = inode->i_rdev;
- stat->atime = inode->i_atime;
- stat->mtime = inode->i_mtime;
---- linux-2.6.18.5/fs/super.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/super.c 2006-09-20 17:59:47 +0200
-@@ -37,6 +37,8 @@
- #include <linux/idr.h>
- #include <linux/kobject.h>
- #include <linux/mutex.h>
-+#include <linux/devpts_fs.h>
-+#include <linux/proc_fs.h>
- #include <asm/uaccess.h>
+ if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
+ /*
+--- linux-2.6.20/fs/nfs/nfs3xdr.c 2006-11-30 21:19:26 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/nfs/nfs3xdr.c 2007-02-06 03:05:22 +0100
+@@ -22,6 +22,7 @@
+ #include <linux/nfs3.h>
+ #include <linux/nfs_fs.h>
+ #include <linux/nfsacl.h>
++#include <linux/vs_tag.h>
+ #include "internal.h"
+ #define NFSDBG_FACILITY NFSDBG_XDR
+@@ -178,7 +179,7 @@ xdr_decode_fattr(__be32 *p, struct nfs_f
+ }
-@@ -818,6 +820,7 @@ struct vfsmount *
- vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void *data)
+ static inline __be32 *
+-xdr_encode_sattr(__be32 *p, struct iattr *attr)
++xdr_encode_sattr(__be32 *p, struct iattr *attr, int tag)
{
- struct vfsmount *mnt;
-+ struct super_block *sb;
- char *secdata = NULL;
- int error;
-
-@@ -843,7 +846,14 @@ vfs_kern_mount(struct file_system_type *
- if (error < 0)
- goto out_free_secdata;
-
-- error = security_sb_kern_mount(mnt->mnt_sb, secdata);
-+ sb = mnt->mnt_sb;
-+ error = -EPERM;
-+ if (!capable(CAP_SYS_ADMIN) && !sb->s_bdev &&
-+ (sb->s_magic != PROC_SUPER_MAGIC) &&
-+ (sb->s_magic != DEVPTS_SUPER_MAGIC))
-+ goto out_sb;
-+
-+ error = security_sb_kern_mount(sb, secdata);
- if (error)
- goto out_sb;
+ if (attr->ia_valid & ATTR_MODE) {
+ *p++ = xdr_one;
+@@ -186,15 +187,17 @@ xdr_encode_sattr(__be32 *p, struct iattr
+ } else {
+ *p++ = xdr_zero;
+ }
+- if (attr->ia_valid & ATTR_UID) {
++ if (attr->ia_valid & ATTR_UID ||
++ (tag && (attr->ia_valid & ATTR_TAG))) {
+ *p++ = xdr_one;
+- *p++ = htonl(attr->ia_uid);
++ *p++ = htonl(TAGINO_UID(tag, attr->ia_uid, attr->ia_tag));
+ } else {
+ *p++ = xdr_zero;
+ }
+- if (attr->ia_valid & ATTR_GID) {
++ if (attr->ia_valid & ATTR_GID ||
++ (tag && (attr->ia_valid & ATTR_TAG))) {
+ *p++ = xdr_one;
+- *p++ = htonl(attr->ia_gid);
++ *p++ = htonl(TAGINO_GID(tag, attr->ia_gid, attr->ia_tag));
+ } else {
+ *p++ = xdr_zero;
+ }
+@@ -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 = xdr_encode_sattr(p, args->sattr);
++ p = xdr_encode_sattr(p, args->sattr,
++ req->rq_task->tk_client->cl_tag);
+ *p++ = htonl(args->guard);
+ if (args->guard)
+ p = xdr_encode_time3(p, &args->guardtime);
+@@ -370,7 +374,8 @@ nfs3_xdr_createargs(struct rpc_rqst *req
+ *p++ = args->verifier[0];
+ *p++ = args->verifier[1];
+ } else
+- p = xdr_encode_sattr(p, args->sattr);
++ p = xdr_encode_sattr(p, args->sattr,
++ req->rq_task->tk_client->cl_tag);
-@@ -871,9 +881,17 @@ do_kern_mount(const char *fstype, int fl
+ req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
+ return 0;
+@@ -384,7 +389,8 @@ nfs3_xdr_mkdirargs(struct rpc_rqst *req,
{
- struct file_system_type *type = get_fs_type(fstype);
- struct vfsmount *mnt;
-+
- if (!type)
- return ERR_PTR(-ENODEV);
-+
-+ mnt = ERR_PTR(-EPERM);
-+ if ((type->fs_flags & FS_BINARY_MOUNTDATA) &&
-+ !vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT))
-+ goto out_put;
-+
- mnt = vfs_kern_mount(type, flags, name, data);
-+out_put:
- put_filesystem(type);
- return mnt;
+ p = xdr_encode_fhandle(p, args->fh);
+ p = xdr_encode_array(p, args->name, args->len);
+- p = xdr_encode_sattr(p, args->sattr);
++ p = xdr_encode_sattr(p, args->sattr,
++ req->rq_task->tk_client->cl_tag);
+ req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
+ return 0;
}
---- linux-2.6.18.5/fs/sysfs/mount.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/sysfs/mount.c 2006-09-20 17:01:44 +0200
-@@ -11,8 +11,6 @@
-
- #include "sysfs.h"
-
--/* Random magic number */
--#define SYSFS_MAGIC 0x62656572
+@@ -397,7 +403,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 = xdr_encode_sattr(p, args->sattr);
++ p = xdr_encode_sattr(p, args->sattr,
++ req->rq_task->tk_client->cl_tag);
+ *p++ = htonl(args->pathlen);
+ req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
- struct vfsmount *sysfs_mount;
- struct super_block * sysfs_sb = NULL;
-@@ -38,7 +36,7 @@ static int sysfs_fill_super(struct super
+@@ -415,7 +422,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);
+- p = xdr_encode_sattr(p, args->sattr);
++ p = xdr_encode_sattr(p, args->sattr,
++ req->rq_task->tk_client->cl_tag);
+ if (args->type == NF3CHR || args->type == NF3BLK) {
+ *p++ = htonl(MAJOR(args->rdev));
+ *p++ = htonl(MINOR(args->rdev));
+--- linux-2.6.20/fs/nfs/nfsroot.c 2007-02-06 03:01:25 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/nfs/nfsroot.c 2007-02-06 03:05:22 +0100
+@@ -118,12 +118,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,
+- Opt_acregmax, Opt_acdirmin, Opt_acdirmax,
++ Opt_acregmax, Opt_acdirmin, Opt_acdirmax, Opt_tagid,
+ /* Options that take no arguments */
+ Opt_soft, Opt_hard, Opt_intr,
+ Opt_nointr, Opt_posix, Opt_noposix, Opt_cto, Opt_nocto, Opt_ac,
+ Opt_noac, Opt_lock, Opt_nolock, Opt_v2, Opt_v3, Opt_udp, Opt_tcp,
+- Opt_acl, Opt_noacl,
++ Opt_acl, Opt_noacl, Opt_tag, Opt_notag,
+ /* Error token */
+ Opt_err
+ };
+@@ -160,6 +160,10 @@ static match_table_t __initdata tokens =
+ {Opt_tcp, "tcp"},
+ {Opt_acl, "acl"},
+ {Opt_noacl, "noacl"},
++ {Opt_tag, "tag"},
++ {Opt_notag, "notag"},
++ {Opt_tagid, "tagid=%u"},
++ {Opt_tag, "tagxid"},
+ {Opt_err, NULL}
+
+ };
+@@ -274,6 +278,20 @@ static int __init root_nfs_parse(char *n
+ case Opt_noacl:
+ nfs_data.flags |= NFS_MOUNT_NOACL;
+ break;
++#ifndef CONFIG_TAGGING_NONE
++ case Opt_tag:
++ nfs_data.flags |= NFS_MOUNT_TAGGED;
++ break;
++ case Opt_notag:
++ nfs_data.flags &= ~NFS_MOUNT_TAGGED;
++ break;
++#endif
++#ifdef CONFIG_PROPAGATE
++ case Opt_tagid:
++ /* use args[0] */
++ nfs_data.flags |= NFS_MOUNT_TAGGED;
++ break;
++#endif
+ default:
+ printk(KERN_WARNING "Root-NFS: unknown "
+ "option: %s\n", p);
+--- linux-2.6.20/fs/nfs/super.c 2006-11-30 21:19:26 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/nfs/super.c 2007-02-06 03:05:22 +0100
+@@ -44,6 +44,7 @@
+ #include <linux/vfs.h>
+ #include <linux/inet.h>
+ #include <linux/nfs_xdr.h>
++#include <linux/vs_tag.h>
- sb->s_blocksize = PAGE_CACHE_SIZE;
- sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
-- sb->s_magic = SYSFS_MAGIC;
-+ sb->s_magic = SYSFS_SUPER_MAGIC;
- sb->s_op = &sysfs_ops;
- sb->s_time_gran = 1;
- sysfs_sb = sb;
---- linux-2.6.18.5/fs/xattr.c 2006-09-20 16:58:37 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/xattr.c 2006-09-20 21:08:52 +0200
-@@ -18,6 +18,7 @@
- #include <linux/module.h>
- #include <linux/fsnotify.h>
- #include <linux/audit.h>
-+#include <linux/mount.h>
+ #include <asm/system.h>
#include <asm/uaccess.h>
+@@ -290,6 +291,7 @@ static void nfs_show_mount_options(struc
+ { NFS_MOUNT_NOAC, ",noac", "" },
+ { NFS_MOUNT_NONLM, ",nolock", "" },
+ { NFS_MOUNT_NOACL, ",noacl", "" },
++ { NFS_MOUNT_TAGGED, ",tag", "" },
+ { 0, NULL, NULL }
+ };
+ const struct proc_nfs_info *nfs_infop;
+--- linux-2.6.20/fs/nfsd/auth.c 2006-06-18 04:54:42 +0200
++++ linux-2.6.20-vs2.2.0-pre1/fs/nfsd/auth.c 2007-02-06 03:05:22 +0100
+@@ -9,6 +9,7 @@
+ #include <linux/sunrpc/svc.h>
+ #include <linux/sunrpc/svcauth.h>
+ #include <linux/nfsd/nfsd.h>
++#include <linux/vs_tag.h>
+ #define CAP_NFSD_MASK (CAP_FS_MASK|CAP_TO_MASK(CAP_SYS_RESOURCE))
-@@ -168,7 +169,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
- */
- static long
- setxattr(struct dentry *d, char __user *name, void __user *value,
-- size_t size, int flags)
-+ size_t size, int flags, struct vfsmount *mnt)
- {
- int error;
- void *kvalue = NULL;
-@@ -195,6 +196,9 @@ setxattr(struct dentry *d, char __user *
- }
- }
+@@ -41,19 +42,22 @@ int nfsd_setuser(struct svc_rqst *rqstp,
+ get_group_info(cred.cr_group_info);
-+ if (MNT_IS_RDONLY(mnt))
-+ return -EROFS;
-+
- error = vfs_setxattr(d, kname, kvalue, size, flags);
- kfree(kvalue);
- return error;
-@@ -210,7 +214,7 @@ sys_setxattr(char __user *path, char __u
- error = user_path_walk(path, &nd);
- if (error)
- return error;
-- error = setxattr(nd.dentry, name, value, size, flags);
-+ error = setxattr(nd.dentry, name, value, size, flags, nd.mnt);
- path_release(&nd);
- return error;
- }
-@@ -225,7 +229,7 @@ sys_lsetxattr(char __user *path, char __
- error = user_path_walk_link(path, &nd);
- if (error)
- return error;
-- error = setxattr(nd.dentry, name, value, size, flags);
-+ error = setxattr(nd.dentry, name, value, size, flags, nd.mnt);
- path_release(&nd);
- return error;
- }
-@@ -243,7 +247,7 @@ sys_fsetxattr(int fd, char __user *name,
- return error;
- dentry = f->f_dentry;
- audit_inode(NULL, dentry->d_inode);
-- error = setxattr(dentry, name, value, size, flags);
-+ error = setxattr(dentry, name, value, size, flags, f->f_vfsmnt);
- fput(f);
- return error;
- }
-@@ -416,7 +420,7 @@ sys_flistxattr(int fd, char __user *list
- * Extended attribute REMOVE operations
- */
- static long
--removexattr(struct dentry *d, char __user *name)
-+removexattr(struct dentry *d, char __user *name, struct vfsmount *mnt)
- {
- int error;
- char kname[XATTR_NAME_MAX + 1];
-@@ -427,6 +431,9 @@ removexattr(struct dentry *d, char __use
- if (error < 0)
- return error;
+ if (cred.cr_uid != (uid_t) -1)
+- current->fsuid = cred.cr_uid;
++ current->fsuid = INOTAG_UID(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid);
+ else
+ current->fsuid = exp->ex_anon_uid;
+ if (cred.cr_gid != (gid_t) -1)
+- current->fsgid = cred.cr_gid;
++ current->fsgid = INOTAG_GID(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid);
+ else
+ current->fsgid = exp->ex_anon_gid;
-+ if (MNT_IS_RDONLY(mnt))
-+ return -EROFS;
++ /* this desperately needs a tag :) */
++ current->xid = (xid_t)INOTAG_TAG(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0);
+
- return vfs_removexattr(d, kname);
- }
+ if (!cred.cr_group_info)
+ return -ENOMEM;
+ ret = set_current_groups(cred.cr_group_info);
+ put_group_info(cred.cr_group_info);
+- if ((cred.cr_uid)) {
++ if (INOTAG_UID(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid)) {
+ cap_t(current->cap_effective) &= ~CAP_NFSD_MASK;
+ } else {
+ cap_t(current->cap_effective) |= (CAP_NFSD_MASK &
+--- linux-2.6.20/fs/nfsd/nfs3xdr.c 2007-02-06 03:01:25 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/nfsd/nfs3xdr.c 2007-02-06 03:05:22 +0100
+@@ -21,6 +21,7 @@
+ #include <linux/sunrpc/svc.h>
+ #include <linux/nfsd/nfsd.h>
+ #include <linux/nfsd/xdr3.h>
++#include <linux/vs_tag.h>
-@@ -439,7 +446,7 @@ sys_removexattr(char __user *path, char
- error = user_path_walk(path, &nd);
- if (error)
- return error;
-- error = removexattr(nd.dentry, name);
-+ error = removexattr(nd.dentry, name, nd.mnt);
- path_release(&nd);
- return error;
- }
-@@ -453,7 +460,7 @@ sys_lremovexattr(char __user *path, char
- error = user_path_walk_link(path, &nd);
- if (error)
- return error;
-- error = removexattr(nd.dentry, name);
-+ error = removexattr(nd.dentry, name, nd.mnt);
- path_release(&nd);
- return error;
- }
-@@ -470,7 +477,7 @@ sys_fremovexattr(int fd, char __user *na
- return error;
- dentry = f->f_dentry;
- audit_inode(NULL, dentry->d_inode);
-- error = removexattr(dentry, name);
-+ error = removexattr(dentry, name, f->f_vfsmnt);
- fput(f);
- return error;
- }
---- linux-2.6.18.5/fs/xfs/linux-2.6/xfs_ioctl.c 2006-09-20 16:58:39 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/xfs/linux-2.6/xfs_ioctl.c 2006-09-20 17:01:44 +0200
-@@ -1095,6 +1095,8 @@ xfs_ioc_fsgeometry(
- #define LINUX_XFLAG_APPEND 0x00000020 /* writes to file may only append */
- #define LINUX_XFLAG_NODUMP 0x00000040 /* do not dump file */
- #define LINUX_XFLAG_NOATIME 0x00000080 /* do not update atime */
-+#define LINUX_XFLAG_BARRIER 0x04000000 /* chroot() barrier */
-+#define LINUX_XFLAG_IUNLINK 0x08000000 /* immutable unlink */
+ #define NFSDDBG_FACILITY NFSDDBG_XDR
- STATIC unsigned int
- xfs_merge_ioc_xflags(
-@@ -1135,6 +1137,10 @@ xfs_di2lxflags(
+@@ -107,6 +108,8 @@ static __be32 *
+ decode_sattr3(__be32 *p, struct iattr *iap)
+ {
+ u32 tmp;
++ uid_t uid = 0;
++ gid_t gid = 0;
- if (di_flags & XFS_DIFLAG_IMMUTABLE)
- flags |= LINUX_XFLAG_IMMUTABLE;
-+ if (di_flags & XFS_DIFLAG_IUNLINK)
-+ flags |= LINUX_XFLAG_IUNLINK;
-+ if (di_flags & XFS_DIFLAG_BARRIER)
-+ flags |= LINUX_XFLAG_BARRIER;
- if (di_flags & XFS_DIFLAG_APPEND)
- flags |= LINUX_XFLAG_APPEND;
- if (di_flags & XFS_DIFLAG_SYNC)
---- linux-2.6.18.5/fs/xfs/linux-2.6/xfs_iops.c 2006-09-20 16:58:39 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/xfs/linux-2.6/xfs_iops.c 2006-09-21 16:42:52 +0200
-@@ -53,6 +53,7 @@
- #include <linux/xattr.h>
- #include <linux/namei.h>
- #include <linux/security.h>
-+#include <linux/vserver/xid.h>
+ iap->ia_valid = 0;
- /*
- * Get a XFS inode from a given vnode.
-@@ -402,6 +403,7 @@ xfs_vn_lookup(
- d_add(dentry, NULL);
- return NULL;
+@@ -116,12 +119,15 @@ decode_sattr3(__be32 *p, struct iattr *i
+ }
+ if (*p++) {
+ iap->ia_valid |= ATTR_UID;
+- iap->ia_uid = ntohl(*p++);
++ uid = ntohl(*p++);
}
-+ vx_propagate_xid(nd, vn_to_inode(cvp));
+ if (*p++) {
+ iap->ia_valid |= ATTR_GID;
+- iap->ia_gid = ntohl(*p++);
++ gid = ntohl(*p++);
+ }
++ iap->ia_uid = INOTAG_UID(DX_TAG_NFSD, uid, gid);
++ iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid);
++ iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0);
+ if (*p++) {
+ u64 newsize;
- return d_splice_alias(vn_to_inode(cvp), dentry);
+@@ -159,8 +165,10 @@ encode_fattr3(struct svc_rqst *rqstp, __
+ *p++ = htonl(nfs3_ftypes[(stat->mode & S_IFMT) >> 12]);
+ *p++ = htonl((u32) stat->mode);
+ *p++ = htonl((u32) stat->nlink);
+- *p++ = htonl((u32) nfsd_ruid(rqstp, stat->uid));
+- *p++ = htonl((u32) nfsd_rgid(rqstp, stat->gid));
++ *p++ = htonl((u32) nfsd_ruid(rqstp,
++ TAGINO_UID(DX_TAG(dentry->d_inode), stat->uid, stat->tag)));
++ *p++ = htonl((u32) nfsd_rgid(rqstp,
++ TAGINO_GID(DX_TAG(dentry->d_inode), stat->gid, stat->tag)));
+ if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
+ p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
+ } else {
+--- linux-2.6.20/fs/nfsd/nfs4recover.c 2007-02-06 03:01:25 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/nfsd/nfs4recover.c 2007-02-06 03:14:20 +0100
+@@ -156,7 +156,7 @@ nfsd4_create_clid_dir(struct nfs4_client
+ dprintk("NFSD: nfsd4_create_clid_dir: DIRECTORY EXISTS\n");
+ goto out_put;
+ }
+- status = vfs_mkdir(rec_dir.dentry->d_inode, dentry, S_IRWXU);
++ status = vfs_mkdir(rec_dir.dentry->d_inode, dentry, S_IRWXU, NULL);
+ out_put:
+ dput(dentry);
+ out_unlock:
+@@ -260,7 +260,7 @@ nfsd4_remove_clid_file(struct dentry *di
+ return -EINVAL;
+ }
+ mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
+- status = vfs_unlink(dir->d_inode, dentry);
++ status = vfs_unlink(dir->d_inode, dentry, NULL);
+ mutex_unlock(&dir->d_inode->i_mutex);
+ return status;
}
-@@ -644,6 +646,10 @@ xfs_vn_setattr(
- int flags = 0;
- int error;
+@@ -275,7 +275,7 @@ nfsd4_clear_clid_dir(struct dentry *dir,
+ * a kernel from the future.... */
+ nfsd4_list_rec_dir(dentry, nfsd4_remove_clid_file);
+ mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
+- status = vfs_rmdir(dir->d_inode, dentry);
++ status = vfs_rmdir(dir->d_inode, dentry, NULL);
+ mutex_unlock(&dir->d_inode->i_mutex);
+ return status;
+ }
+--- linux-2.6.20/fs/nfsd/nfs4xdr.c 2007-02-06 03:01:25 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/nfsd/nfs4xdr.c 2007-02-06 03:05:22 +0100
+@@ -57,6 +57,7 @@
+ #include <linux/nfsd_idmap.h>
+ #include <linux/nfs4.h>
+ #include <linux/nfs4_acl.h>
++#include <linux/vs_tag.h>
-+ error = inode_change_ok(inode, attr);
-+ if (error)
-+ return error;
-+
- if (ia_valid & ATTR_UID) {
- vattr.va_mask |= XFS_AT_UID;
- vattr.va_uid = attr->ia_uid;
-@@ -652,6 +658,10 @@ xfs_vn_setattr(
- vattr.va_mask |= XFS_AT_GID;
- vattr.va_gid = attr->ia_gid;
+ #define NFSDDBG_FACILITY NFSDDBG_XDR
+
+@@ -1727,14 +1728,18 @@ out_acl:
+ WRITE32(stat.nlink);
}
-+ if ((ia_valid & ATTR_XID) && IS_TAGXID(inode)) {
-+ vattr.va_mask |= XFS_AT_XID;
-+ vattr.va_xid = attr->ia_xid;
-+ }
- if (ia_valid & ATTR_SIZE) {
- vattr.va_mask |= XFS_AT_SIZE;
- vattr.va_size = attr->ia_size;
-@@ -697,6 +707,42 @@ xfs_vn_truncate(
+ if (bmval1 & FATTR4_WORD1_OWNER) {
+- status = nfsd4_encode_user(rqstp, stat.uid, &p, &buflen);
++ status = nfsd4_encode_user(rqstp,
++ TAGINO_UID(DX_TAG(dentry->d_inode),
++ stat.uid, stat.tag), &p, &buflen);
+ if (status == nfserr_resource)
+ goto out_resource;
+ if (status)
+ goto out;
+ }
+ if (bmval1 & FATTR4_WORD1_OWNER_GROUP) {
+- status = nfsd4_encode_group(rqstp, stat.gid, &p, &buflen);
++ status = nfsd4_encode_group(rqstp,
++ TAGINO_GID(DX_TAG(dentry->d_inode),
++ stat.gid, stat.tag), &p, &buflen);
+ if (status == nfserr_resource)
+ goto out_resource;
+ if (status)
+--- linux-2.6.20/fs/nfsd/nfsxdr.c 2007-02-06 03:01:25 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/nfsd/nfsxdr.c 2007-02-06 03:05:22 +0100
+@@ -15,6 +15,7 @@
+ #include <linux/nfsd/nfsd.h>
+ #include <linux/nfsd/xdr.h>
+ #include <linux/mm.h>
++#include <linux/vs_tag.h>
+
+ #define NFSDDBG_FACILITY NFSDDBG_XDR
+
+@@ -97,6 +98,8 @@ static __be32 *
+ decode_sattr(__be32 *p, struct iattr *iap)
+ {
+ u32 tmp, tmp1;
++ uid_t uid = 0;
++ gid_t gid = 0;
+
+ iap->ia_valid = 0;
+
+@@ -110,12 +113,15 @@ decode_sattr(__be32 *p, struct iattr *ia
+ }
+ if ((tmp = ntohl(*p++)) != (u32)-1) {
+ iap->ia_valid |= ATTR_UID;
+- iap->ia_uid = tmp;
++ uid = tmp;
+ }
+ if ((tmp = ntohl(*p++)) != (u32)-1) {
+ iap->ia_valid |= ATTR_GID;
+- iap->ia_gid = tmp;
++ gid = tmp;
+ }
++ iap->ia_uid = INOTAG_UID(DX_TAG_NFSD, uid, gid);
++ iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid);
++ iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0);
+ if ((tmp = ntohl(*p++)) != (u32)-1) {
+ iap->ia_valid |= ATTR_SIZE;
+ iap->ia_size = tmp;
+@@ -159,8 +165,10 @@ encode_fattr(struct svc_rqst *rqstp, __b
+ *p++ = htonl(nfs_ftypes[type >> 12]);
+ *p++ = htonl((u32) stat->mode);
+ *p++ = htonl((u32) stat->nlink);
+- *p++ = htonl((u32) nfsd_ruid(rqstp, stat->uid));
+- *p++ = htonl((u32) nfsd_rgid(rqstp, stat->gid));
++ *p++ = htonl((u32) nfsd_ruid(rqstp,
++ TAGINO_UID(DX_TAG(dentry->d_inode), stat->uid, stat->tag)));
++ *p++ = htonl((u32) nfsd_rgid(rqstp,
++ TAGINO_GID(DX_TAG(dentry->d_inode), stat->gid, stat->tag)));
+
+ if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
+ *p++ = htonl(NFS_MAXPATHLEN);
+--- linux-2.6.20/fs/nfsd/vfs.c 2007-02-06 03:01:25 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/nfsd/vfs.c 2007-02-06 03:05:22 +0100
+@@ -1183,13 +1183,13 @@ nfsd_create(struct svc_rqst *rqstp, stru
+ host_err = vfs_create(dirp, dchild, iap->ia_mode, NULL);
+ break;
+ case S_IFDIR:
+- host_err = vfs_mkdir(dirp, dchild, iap->ia_mode);
++ host_err = vfs_mkdir(dirp, dchild, iap->ia_mode, NULL);
+ break;
+ case S_IFCHR:
+ case S_IFBLK:
+ case S_IFIFO:
+ case S_IFSOCK:
+- host_err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev);
++ host_err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev, NULL);
+ break;
+ default:
+ printk("nfsd: bad file type %o in nfsd_create\n", type);
+@@ -1463,11 +1463,13 @@ nfsd_symlink(struct svc_rqst *rqstp, str
+ else {
+ strncpy(path_alloced, path, plen);
+ path_alloced[plen] = 0;
+- host_err = vfs_symlink(dentry->d_inode, dnew, path_alloced, mode);
++ host_err = vfs_symlink(dentry->d_inode, dnew,
++ path_alloced, mode, NULL);
+ kfree(path_alloced);
+ }
+ } else
+- host_err = vfs_symlink(dentry->d_inode, dnew, path, mode);
++ host_err = vfs_symlink(dentry->d_inode, dnew,
++ path, mode, NULL);
+
+ if (!host_err) {
+ if (EX_ISSYNC(fhp->fh_export))
+@@ -1526,7 +1528,7 @@ nfsd_link(struct svc_rqst *rqstp, struct
+ dold = tfhp->fh_dentry;
+ dest = dold->d_inode;
+
+- host_err = vfs_link(dold, dirp, dnew);
++ host_err = vfs_link(dold, dirp, dnew, NULL);
+ if (!host_err) {
+ if (EX_ISSYNC(ffhp->fh_export)) {
+ err = nfserrno(nfsd_sync_dir(ddir));
+@@ -1691,9 +1693,9 @@ nfsd_unlink(struct svc_rqst *rqstp, stru
+ host_err = -EPERM;
+ } else
+ #endif
+- host_err = vfs_unlink(dirp, rdentry);
++ host_err = vfs_unlink(dirp, rdentry, NULL);
+ } else { /* It's RMDIR */
+- host_err = vfs_rmdir(dirp, rdentry);
++ host_err = vfs_rmdir(dirp, rdentry, NULL);
+ }
+
+ dput(rdentry);
+@@ -1804,7 +1806,8 @@ nfsd_permission(struct svc_export *exp,
+ */
+ if (!(acc & MAY_LOCAL_ACCESS))
+ if (acc & (MAY_WRITE | MAY_SATTR | MAY_TRUNC)) {
+- if (EX_RDONLY(exp) || IS_RDONLY(inode))
++ if (EX_RDONLY(exp) || IS_RDONLY(inode)
++ || MNT_IS_RDONLY(exp->ex_mnt))
+ return nfserr_rofs;
+ if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE(inode))
+ return nfserr_perm;
+--- linux-2.6.20/fs/ocfs2/dlm/dlmfs.c 2007-02-06 03:01:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ocfs2/dlm/dlmfs.c 2007-02-06 03:05:22 +0100
+@@ -44,6 +44,7 @@
+ #include <linux/string.h>
+ #include <linux/smp_lock.h>
+ #include <linux/backing-dev.h>
++#include <linux/vs_tag.h>
+
+ #include <asm/uaccess.h>
+
+@@ -335,6 +336,7 @@ static struct inode *dlmfs_get_root_inod
+ inode->i_mode = mode;
+ inode->i_uid = current->fsuid;
+ inode->i_gid = current->fsgid;
++ inode->i_tag = dx_current_fstag(sb);
+ inode->i_blocks = 0;
+ inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
+ inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+@@ -361,6 +363,7 @@ static struct inode *dlmfs_get_inode(str
+ inode->i_mode = mode;
+ inode->i_uid = current->fsuid;
+ inode->i_gid = current->fsgid;
++ inode->i_tag = dx_current_fstag(sb);
+ inode->i_blocks = 0;
+ inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
+ inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+--- linux-2.6.20/fs/ocfs2/dlmglue.c 2007-02-06 03:01:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ocfs2/dlmglue.c 2007-02-06 03:05:22 +0100
+@@ -1339,6 +1339,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_itag = cpu_to_be16(inode->i_tag);
+ lvb->lvb_imode = cpu_to_be16(inode->i_mode);
+ lvb->lvb_inlink = cpu_to_be16(inode->i_nlink);
+ lvb->lvb_iatime_packed =
+@@ -1392,6 +1393,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_tag = be16_to_cpu(lvb->lvb_itag);
+ inode->i_mode = be16_to_cpu(lvb->lvb_imode);
+ inode->i_nlink = be16_to_cpu(lvb->lvb_inlink);
+ ocfs2_unpack_timespec(&inode->i_atime,
+--- linux-2.6.20/fs/ocfs2/dlmglue.h 2007-02-06 03:01:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ocfs2/dlmglue.h 2007-02-06 03:05:22 +0100
+@@ -34,7 +34,7 @@
+ struct ocfs2_meta_lvb {
+ __u8 lvb_version;
+ __u8 lvb_reserved0;
+- __be16 lvb_reserved1;
++ __be16 lvb_itag;
+ __be32 lvb_iclusters;
+ __be32 lvb_iuid;
+ __be32 lvb_igid;
+--- linux-2.6.20/fs/ocfs2/file.c 2007-02-06 03:01:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ocfs2/file.c 2007-02-06 03:20:23 +0100
+@@ -858,13 +858,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 & ATTR_TAG)
++ mlog(0, "tag change: %d\n", attr->ia_tag);
+ if (attr->ia_valid & ATTR_SIZE)
+ mlog(0, "size change...\n");
+ if (attr->ia_valid & (ATTR_ATIME | ATTR_MTIME | ATTR_CTIME))
+ mlog(0, "time change...\n");
+
+ #define OCFS2_VALID_ATTRS (ATTR_ATIME | ATTR_MTIME | ATTR_CTIME | ATTR_SIZE \
+- | ATTR_GID | ATTR_UID | ATTR_MODE)
++ | ATTR_GID | ATTR_UID | ATTR_TAG | ATTR_MODE)
+ if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) {
+ mlog(0, "can't handle attrs: 0x%x\n", attr->ia_valid);
+ return 0;
+@@ -1368,6 +1370,7 @@ bail:
+ struct inode_operations ocfs2_file_iops = {
+ .setattr = ocfs2_setattr,
+ .getattr = ocfs2_getattr,
++ .sync_flags = ocfs2_sync_flags,
+ .permission = ocfs2_permission,
+ };
+
+--- linux-2.6.20/fs/ocfs2/inode.c 2007-02-06 03:01:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ocfs2/inode.c 2007-02-06 03:05:22 +0100
+@@ -29,6 +29,7 @@
+ #include <linux/highmem.h>
+ #include <linux/pagemap.h>
+ #include <linux/smp_lock.h>
++#include <linux/vs_tag.h>
+
+ #include <asm/byteorder.h>
+
+@@ -43,6 +44,7 @@
+ #include "file.h"
+ #include "heartbeat.h"
+ #include "inode.h"
++#include "ioctl.h"
+ #include "journal.h"
+ #include "namei.h"
+ #include "suballoc.h"
+@@ -78,6 +80,10 @@ void ocfs2_set_inode_flags(struct inode
+
+ if (flags & OCFS2_IMMUTABLE_FL)
+ inode->i_flags |= S_IMMUTABLE;
++ if (flags & OCFS2_IUNLINK_FL)
++ inode->i_flags |= S_IUNLINK;
++ if (flags & OCFS2_BARRIER_FL)
++ inode->i_flags |= S_BARRIER;
+
+ if (flags & OCFS2_SYNC_FL)
+ inode->i_flags |= S_SYNC;
+@@ -89,6 +95,27 @@ void ocfs2_set_inode_flags(struct inode
+ inode->i_flags |= S_DIRSYNC;
}
- STATIC int
-+xfs_vn_sync_flags(struct inode *inode)
++int ocfs2_sync_flags(struct inode *inode)
+{
+ unsigned int oldflags, newflags;
-+ int flags = 0;
-+ int error;
-+ bhv_vattr_t vattr;
-+ bhv_vnode_t *vp = vn_from_inode(inode);
+
-+ memset(&vattr, 0, sizeof vattr);
-+
-+ vattr.va_mask = XFS_AT_XFLAGS;
-+ error = bhv_vop_getattr(vp, &vattr, 0, NULL);
-+
-+ if (error)
-+ return error;
-+ oldflags = vattr.va_xflags;
-+ newflags = oldflags & ~(XFS_XFLAG_IMMUTABLE |
-+ XFS_XFLAG_IUNLINK | XFS_XFLAG_BARRIER);
++ oldflags = OCFS2_I(inode)->ip_flags;
++ newflags = oldflags & ~(OCFS2_IMMUTABLE_FL |
++ OCFS2_IUNLINK_FL | OCFS2_BARRIER_FL);
+
+ if (IS_IMMUTABLE(inode))
-+ newflags |= XFS_XFLAG_IMMUTABLE;
++ newflags |= OCFS2_IMMUTABLE_FL;
+ if (IS_IUNLINK(inode))
-+ newflags |= XFS_XFLAG_IUNLINK;
++ newflags |= OCFS2_IUNLINK_FL;
+ if (IS_BARRIER(inode))
-+ newflags |= XFS_XFLAG_BARRIER;
++ newflags |= OCFS2_BARRIER_FL;
+
-+ if (oldflags ^ newflags) {
-+ vattr.va_xflags = newflags;
-+ vattr.va_mask |= XFS_AT_XFLAGS;
-+ error = bhv_vop_setattr(vp, &vattr, flags, NULL);
-+ }
-+ vn_revalidate(vp);
-+ return error;
++ if (oldflags ^ newflags)
++ return ocfs2_set_inode_attr(inode,
++ newflags, OCFS2_FL_MASK);
++ return 0;
+}
+
-+STATIC int
- xfs_vn_setxattr(
- struct dentry *dentry,
- const char *name,
-@@ -809,6 +855,7 @@ struct inode_operations xfs_inode_operat
- .getxattr = xfs_vn_getxattr,
- .listxattr = xfs_vn_listxattr,
- .removexattr = xfs_vn_removexattr,
-+ .sync_flags = xfs_vn_sync_flags,
- };
+ struct inode *ocfs2_ilookup_for_vote(struct ocfs2_super *osb,
+ u64 blkno,
+ int delete_vote)
+@@ -234,6 +261,8 @@ int ocfs2_populate_inode(struct inode *i
+ struct super_block *sb;
+ struct ocfs2_super *osb;
+ int status = -EINVAL;
++ uid_t uid;
++ gid_t gid;
- struct inode_operations xfs_dir_inode_operations = {
-@@ -828,6 +875,7 @@ struct inode_operations xfs_dir_inode_op
- .getxattr = xfs_vn_getxattr,
- .listxattr = xfs_vn_listxattr,
- .removexattr = xfs_vn_removexattr,
-+ .sync_flags = xfs_vn_sync_flags,
- };
+ mlog_entry("(0x%p, size:%llu)\n", inode,
+ (unsigned long long)fe->i_size);
+@@ -265,8 +294,12 @@ int ocfs2_populate_inode(struct inode *i
+ 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);
+- 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);
+
+ /* Fast symlinks will have i_size but no allocated clusters. */
+ if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
+@@ -1217,8 +1250,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);
+@@ -1246,15 +1282,24 @@ 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);
- struct inode_operations xfs_symlink_inode_operations = {
-@@ -841,4 +889,5 @@ struct inode_operations xfs_symlink_inod
- .getxattr = xfs_vn_getxattr,
- .listxattr = xfs_vn_listxattr,
- .removexattr = xfs_vn_removexattr,
-+ .sync_flags = xfs_vn_sync_flags,
- };
---- linux-2.6.18.5/fs/xfs/linux-2.6/xfs_linux.h 2006-09-20 16:58:39 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/xfs/linux-2.6/xfs_linux.h 2006-09-20 18:35:45 +0200
-@@ -139,6 +139,7 @@ BUFFER_FNS(PrivateStart, unwritten);
- #define current_pid() (current->pid)
- #define current_fsuid(cred) (current->fsuid)
- #define current_fsgid(cred) (current->fsgid)
-+#define current_fsxid(cred,vp) (vx_current_fsxid(vn_to_inode(vp)->i_sb))
- #define current_test_flags(f) (current->flags & (f))
- #define current_set_flags_nested(sp, f) \
- (*(sp) = current->flags, current->flags |= (f))
---- linux-2.6.18.5/fs/xfs/linux-2.6/xfs_super.c 2006-09-20 16:58:39 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/xfs/linux-2.6/xfs_super.c 2006-09-20 18:34:48 +0200
-@@ -158,6 +158,7 @@ xfs_revalidate_inode(
- inode->i_nlink = ip->i_d.di_nlink;
- inode->i_uid = ip->i_d.di_uid;
- inode->i_gid = ip->i_d.di_gid;
-+ inode->i_xid = ip->i_d.di_xid;
-
- switch (inode->i_mode & S_IFMT) {
- case S_IFBLK:
-@@ -186,6 +187,14 @@ xfs_revalidate_inode(
- inode->i_flags |= S_IMMUTABLE;
- else
- inode->i_flags &= ~S_IMMUTABLE;
-+ if (ip->i_d.di_flags & XFS_DIFLAG_IUNLINK)
-+ inode->i_flags |= S_IUNLINK;
-+ else
-+ inode->i_flags &= ~S_IUNLINK;
-+ if (ip->i_d.di_flags & XFS_DIFLAG_BARRIER)
-+ inode->i_flags |= S_BARRIER;
-+ else
-+ inode->i_flags &= ~S_BARRIER;
- if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
- inode->i_flags |= S_APPEND;
- else
-@@ -709,6 +718,12 @@ xfs_fs_remount(
- int error;
-
- error = bhv_vfs_parseargs(vfsp, options, args, 1);
-+ if ((args->flags2 & XFSMNT2_TAGXID) &&
-+ !(sb->s_flags & MS_TAGXID)) {
-+ printk("XFS: %s: tagxid not permitted on remount.\n",
-+ sb->s_id);
-+ error = EINVAL;
-+ }
- if (!error)
- error = bhv_vfs_mntupdate(vfsp, flags, args);
- kmem_free(args, sizeof(*args));
---- linux-2.6.18.5/fs/xfs/linux-2.6/xfs_sysctl.c 2006-09-20 16:58:39 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/xfs/linux-2.6/xfs_sysctl.c 2006-09-20 18:32:51 +0200
-@@ -57,79 +57,79 @@ xfs_stats_clear_proc_handler(
- STATIC ctl_table xfs_table[] = {
- {XFS_RESTRICT_CHOWN, "restrict_chown", &xfs_params.restrict_chown.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.restrict_chown.min, &xfs_params.restrict_chown.max},
-
- {XFS_SGID_INHERIT, "irix_sgid_inherit", &xfs_params.sgid_inherit.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.sgid_inherit.min, &xfs_params.sgid_inherit.max},
-
- {XFS_SYMLINK_MODE, "irix_symlink_mode", &xfs_params.symlink_mode.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.symlink_mode.min, &xfs_params.symlink_mode.max},
-
- {XFS_PANIC_MASK, "panic_mask", &xfs_params.panic_mask.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.panic_mask.min, &xfs_params.panic_mask.max},
+ 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_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;
+--- linux-2.6.20/fs/ocfs2/inode.h 2007-02-06 03:01:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ocfs2/inode.h 2007-02-06 03:05:22 +0100
+@@ -143,5 +143,6 @@ int ocfs2_aio_read(struct file *file, st
+ int ocfs2_aio_write(struct file *file, struct kiocb *req, struct iocb *iocb);
+
+ void ocfs2_set_inode_flags(struct inode *inode);
++int ocfs2_sync_flags(struct inode *inode);
+
+ #endif /* OCFS2_INODE_H */
+--- linux-2.6.20/fs/ocfs2/ioctl.c 2007-02-06 03:01:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ocfs2/ioctl.c 2007-02-06 03:05:22 +0100
+@@ -38,7 +38,7 @@ static int ocfs2_get_inode_attr(struct i
+ return status;
+ }
- {XFS_ERRLEVEL, "error_level", &xfs_params.error_level.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.error_level.min, &xfs_params.error_level.max},
+-static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
++int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
+ unsigned mask)
+ {
+ struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode);
+--- linux-2.6.20/fs/ocfs2/ioctl.h 2006-11-30 21:19:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ocfs2/ioctl.h 2007-02-06 03:05:22 +0100
+@@ -10,6 +10,9 @@
+ #ifndef OCFS2_IOCTL_H
+ #define OCFS2_IOCTL_H
- {XFS_SYNCD_TIMER, "xfssyncd_centisecs", &xfs_params.syncd_timer.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.syncd_timer.min, &xfs_params.syncd_timer.max},
++int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
++ unsigned mask);
++
+ int ocfs2_ioctl(struct inode * inode, struct file * filp,
+ unsigned int cmd, unsigned long arg);
- {XFS_INHERIT_SYNC, "inherit_sync", &xfs_params.inherit_sync.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.inherit_sync.min, &xfs_params.inherit_sync.max},
+--- linux-2.6.20/fs/ocfs2/namei.c 2007-02-06 03:01:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ocfs2/namei.c 2007-02-06 03:21:17 +0100
+@@ -40,6 +40,7 @@
+ #include <linux/types.h>
+ #include <linux/slab.h>
+ #include <linux/highmem.h>
++#include <linux/vs_tag.h>
- {XFS_INHERIT_NODUMP, "inherit_nodump", &xfs_params.inherit_nodump.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.inherit_nodump.min, &xfs_params.inherit_nodump.max},
+ #define MLOG_MASK_PREFIX ML_NAMEI
+ #include <cluster/masklog.h>
+@@ -486,6 +487,9 @@ static int ocfs2_mknod_locked(struct ocf
+ u64 fe_blkno = 0;
+ u16 suballoc_bit;
+ struct inode *inode = NULL;
++ uid_t uid;
++ gid_t gid;
++ tag_t tag;
- {XFS_INHERIT_NOATIME, "inherit_noatime", &xfs_params.inherit_noatim.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.inherit_noatim.min, &xfs_params.inherit_noatim.max},
+ mlog_entry("(0x%p, 0x%p, %d, %lu, '%.*s')\n", dir, dentry, mode,
+ (unsigned long)dev, dentry->d_name.len,
+@@ -545,13 +549,19 @@ 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(osb->slot_num);
+- fe->i_uid = cpu_to_le32(current->fsuid);
++
++ tag = dx_current_fstag(osb->sb);
++ uid = current->fsuid;
+ if (dir->i_mode & S_ISGID) {
+- fe->i_gid = cpu_to_le32(dir->i_gid);
++ gid = dir->i_gid;
+ if (S_ISDIR(mode))
+ mode |= S_ISGID;
+ } else
+- fe->i_gid = cpu_to_le32(current->fsgid);
++ gid = current->fsgid;
++
++ fe->i_uid = cpu_to_le32(TAGINO_UID(DX_TAG(inode), uid, tag));
++ fe->i_gid = cpu_to_le32(TAGINO_GID(DX_TAG(inode), gid, tag));
++ inode->i_tag = tag;
+ fe->i_mode = cpu_to_le16(mode);
+ if (S_ISCHR(mode) || S_ISBLK(mode))
+ fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
+@@ -2318,5 +2328,6 @@ struct inode_operations ocfs2_dir_iops =
+ .rename = ocfs2_rename,
+ .setattr = ocfs2_setattr,
+ .getattr = ocfs2_getattr,
++ .sync_flags = ocfs2_sync_flags,
+ .permission = ocfs2_permission,
+ };
+--- linux-2.6.20/fs/ocfs2/ocfs2.h 2007-02-06 03:01:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ocfs2/ocfs2.h 2007-02-06 03:05:22 +0100
+@@ -175,6 +175,7 @@ enum ocfs2_mount_options
+ OCFS2_MOUNT_NOINTR = 1 << 2, /* Don't catch signals */
+ OCFS2_MOUNT_ERRORS_PANIC = 1 << 3, /* Panic on errors */
+ OCFS2_MOUNT_DATA_WRITEBACK = 1 << 4, /* No data ordering */
++ OCFS2_MOUNT_TAGGED = 1 << 8, /* use tagging */
+ };
- {XFS_BUF_TIMER, "xfsbufd_centisecs", &xfs_params.xfs_buf_timer.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.xfs_buf_timer.min, &xfs_params.xfs_buf_timer.max},
+ #define OCFS2_OSB_SOFT_RO 0x0001
+--- linux-2.6.20/fs/ocfs2/ocfs2_fs.h 2007-02-06 03:01:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ocfs2/ocfs2_fs.h 2007-02-06 03:05:22 +0100
+@@ -151,8 +151,12 @@
+ #define OCFS2_NOATIME_FL (0x00000080) /* do not update atime */
+ #define OCFS2_DIRSYNC_FL (0x00010000) /* dirsync behaviour (directories only) */
+
++#define OCFS2_BARRIER_FL (0x04000000) /* Barrier for chroot() */
++#define OCFS2_IUNLINK_FL (0x08000000) /* Immutable unlink */
++
+ #define OCFS2_FL_VISIBLE (0x000100FF) /* User visible flags */
+ #define OCFS2_FL_MODIFIABLE (0x000100FF) /* User modifiable flags */
++#define OCFS2_FL_MASK (0x0F0100FF)
- {XFS_BUF_AGE, "age_buffer_centisecs", &xfs_params.xfs_buf_age.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.xfs_buf_age.min, &xfs_params.xfs_buf_age.max},
+ /*
+ * ioctl commands
+--- linux-2.6.20/fs/ocfs2/super.c 2007-02-06 03:01:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/ocfs2/super.c 2007-02-06 03:23:25 +0100
+@@ -140,6 +140,7 @@ enum {
+ Opt_data_ordered,
+ Opt_data_writeback,
+ Opt_atime_quantum,
++ Opt_tag, Opt_notag, Opt_tagid,
+ Opt_err,
+ };
- {XFS_INHERIT_NOSYM, "inherit_nosymlinks", &xfs_params.inherit_nosym.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.inherit_nosym.min, &xfs_params.inherit_nosym.max},
+@@ -154,6 +155,10 @@ static match_table_t tokens = {
+ {Opt_data_ordered, "data=ordered"},
+ {Opt_data_writeback, "data=writeback"},
+ {Opt_atime_quantum, "atime_quantum=%u"},
++ {Opt_tag, "tag"},
++ {Opt_tag, "tagxid"},
++ {Opt_notag, "notag"},
++ {Opt_tagid, "tagid=%u"},
+ {Opt_err, NULL}
+ };
- {XFS_ROTORSTEP, "rotorstep", &xfs_params.rotorstep.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.rotorstep.min, &xfs_params.rotorstep.max},
+@@ -362,6 +367,14 @@ static int ocfs2_remount(struct super_bl
+ goto out;
+ }
- {XFS_INHERIT_NODFRG, "inherit_nodefrag", &xfs_params.inherit_nodfrg.val,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.inherit_nodfrg.min, &xfs_params.inherit_nodfrg.max},
++ printk("ocfs2_remount: %lx,%lx\n", osb->s_mount_opt, sb->s_flags);
++ if ((parsed_options & OCFS2_MOUNT_TAGGED) &&
++ !(sb->s_flags & MS_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 & OCFS2_MOUNT_HB_LOCAL)) {
+ ret = -EINVAL;
+@@ -654,6 +667,9 @@ static int ocfs2_fill_super(struct super
- /* please keep this the last entry */
- #ifdef CONFIG_PROC_FS
- {XFS_STATS_CLEAR, "stats_clear", &xfs_params.stats_clear.val,
- sizeof(int), 0644, NULL, &xfs_stats_clear_proc_handler,
-- &sysctl_intvec, NULL,
-+ NULL, &sysctl_intvec, NULL,
- &xfs_params.stats_clear.min, &xfs_params.stats_clear.max},
- #endif /* CONFIG_PROC_FS */
+ ocfs2_complete_mount_recovery(osb);
---- linux-2.6.18.5/fs/xfs/linux-2.6/xfs_vnode.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/xfs/linux-2.6/xfs_vnode.c 2006-09-20 17:01:44 +0200
-@@ -119,6 +119,7 @@ vn_revalidate_core(
- inode->i_nlink = vap->va_nlink;
- inode->i_uid = vap->va_uid;
- inode->i_gid = vap->va_gid;
-+ inode->i_xid = vap->va_xid;
- inode->i_blocks = vap->va_nblocks;
- inode->i_mtime = vap->va_mtime;
- inode->i_ctime = vap->va_ctime;
-@@ -127,6 +128,14 @@ vn_revalidate_core(
- inode->i_flags |= S_IMMUTABLE;
- else
- inode->i_flags &= ~S_IMMUTABLE;
-+ if (vap->va_xflags & XFS_XFLAG_IUNLINK)
-+ inode->i_flags |= S_IUNLINK;
-+ else
-+ inode->i_flags &= ~S_IUNLINK;
-+ if (vap->va_xflags & XFS_XFLAG_BARRIER)
-+ inode->i_flags |= S_BARRIER;
-+ else
-+ inode->i_flags &= ~S_BARRIER;
- if (vap->va_xflags & XFS_XFLAG_APPEND)
- inode->i_flags |= S_APPEND;
++ if (osb->s_mount_opt & OCFS2_MOUNT_TAGGED)
++ sb->s_flags |= MS_TAGGED;
++
+ if (ocfs2_mount_local(osb))
+ snprintf(nodestr, sizeof(nodestr), "local");
else
---- linux-2.6.18.5/fs/xfs/linux-2.6/xfs_vnode.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/xfs/linux-2.6/xfs_vnode.h 2006-09-20 17:01:44 +0200
-@@ -352,6 +352,7 @@ typedef struct bhv_vattr {
- xfs_nlink_t va_nlink; /* number of references to file */
- uid_t va_uid; /* owner user id */
- gid_t va_gid; /* owner group id */
-+ xid_t va_xid; /* owner group id */
- xfs_ino_t va_nodeid; /* file id */
- xfs_off_t va_size; /* file size in bytes */
- u_long va_blocksize; /* blocksize preferred for i/o */
-@@ -400,13 +401,15 @@ typedef struct bhv_vattr {
- #define XFS_AT_PROJID 0x04000000
- #define XFS_AT_SIZE_NOPERM 0x08000000
- #define XFS_AT_GENCOUNT 0x10000000
-+#define XFS_AT_XID 0x20000000
+@@ -782,6 +798,20 @@ static int ocfs2_parse_options(struct su
+ else
+ osb->s_atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM;
+ break;
++#ifndef CONFIG_TAGGING_NONE
++ case Opt_tag:
++ *mount_opt |= OCFS2_MOUNT_TAGGED;
++ break;
++ case Opt_notag:
++ *mount_opt &= ~OCFS2_MOUNT_TAGGED;
++ break;
++#endif
++#ifdef CONFIG_PROPAGATE
++ case Opt_tagid:
++ /* use args[0] */
++ *mount_opt |= OCFS2_MOUNT_TAGGED;
++ break;
++#endif
+ default:
+ mlog(ML_ERROR,
+ "Unrecognized mount option \"%s\" "
+--- linux-2.6.20/fs/open.c 2007-02-06 03:01:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/open.c 2007-02-06 03:05:22 +0100
+@@ -27,22 +27,31 @@
+ #include <linux/syscalls.h>
+ #include <linux/rcupdate.h>
+ #include <linux/audit.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>
- #define XFS_AT_ALL (XFS_AT_TYPE|XFS_AT_MODE|XFS_AT_UID|XFS_AT_GID|\
- XFS_AT_FSID|XFS_AT_NODEID|XFS_AT_NLINK|XFS_AT_SIZE|\
- XFS_AT_ATIME|XFS_AT_MTIME|XFS_AT_CTIME|XFS_AT_RDEV|\
- XFS_AT_BLKSIZE|XFS_AT_NBLOCKS|XFS_AT_VCODE|XFS_AT_MAC|\
- XFS_AT_ACL|XFS_AT_CAP|XFS_AT_INF|XFS_AT_XFLAGS|XFS_AT_EXTSIZE|\
-- XFS_AT_NEXTENTS|XFS_AT_ANEXTENTS|XFS_AT_PROJID|XFS_AT_GENCOUNT)
-+ XFS_AT_NEXTENTS|XFS_AT_ANEXTENTS|XFS_AT_PROJID|XFS_AT_GENCOUNT\
-+ XFS_AT_XID)
+ int vfs_statfs(struct dentry *dentry, struct kstatfs *buf)
+ {
+ int retval = -ENODEV;
- #define XFS_AT_STAT (XFS_AT_TYPE|XFS_AT_MODE|XFS_AT_UID|XFS_AT_GID|\
- XFS_AT_FSID|XFS_AT_NODEID|XFS_AT_NLINK|XFS_AT_SIZE|\
---- linux-2.6.18.5/fs/xfs/quota/xfs_qm_syscalls.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/xfs/quota/xfs_qm_syscalls.c 2006-09-20 17:01:44 +0200
-@@ -213,7 +213,7 @@ xfs_qm_scall_quotaoff(
- xfs_qoff_logitem_t *qoffstart;
- int nculprits;
+ if (dentry) {
++ struct super_block *sb = dentry->d_sb;
++
+ retval = -ENOSYS;
+- if (dentry->d_sb->s_op->statfs) {
++ if (sb->s_op->statfs) {
+ memset(buf, 0, sizeof(*buf));
+ retval = security_sb_statfs(dentry);
+ if (retval)
+ return retval;
+- retval = dentry->d_sb->s_op->statfs(dentry, buf);
++ retval = sb->s_op->statfs(dentry, buf);
+ if (retval == 0 && buf->f_frsize == 0)
+ buf->f_frsize = buf->f_bsize;
+ }
++ if (!vx_check(0, VS_ADMIN|VS_WATCH))
++ vx_vsi_statfs(sb, buf);
+ }
+ return retval;
+ }
+@@ -246,7 +255,7 @@ static long do_sys_truncate(const char _
+ goto dput_and_out;
-- if (!force && !capable(CAP_SYS_ADMIN))
-+ if (!force && !vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
- return XFS_ERROR(EPERM);
- /*
- * No file system can have quotas enabled on disk but not in core.
-@@ -382,7 +382,7 @@ xfs_qm_scall_trunc_qfiles(
- int error;
- xfs_inode_t *qip;
+ error = -EROFS;
+- if (IS_RDONLY(inode))
++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt))
+ goto dput_and_out;
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
- return XFS_ERROR(EPERM);
- error = 0;
- if (!XFS_SB_VERSION_HASQUOTA(&mp->m_sb) || flags == 0) {
-@@ -427,7 +427,7 @@ xfs_qm_scall_quotaon(
- uint accflags;
- __int64_t sbflags;
+ error = -EPERM;
+@@ -395,7 +404,7 @@ asmlinkage long sys_faccessat(int dfd, c
+ special_file(nd.dentry->d_inode->i_mode))
+ goto out_path_release;
+
+- if(IS_RDONLY(nd.dentry->d_inode))
++ if(IS_RDONLY(nd.dentry->d_inode) || MNT_IS_RDONLY(nd.mnt))
+ res = -EROFS;
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
- return XFS_ERROR(EPERM);
+ out_path_release:
+@@ -509,7 +518,7 @@ asmlinkage long sys_fchmod(unsigned int
+ audit_inode(NULL, inode);
- flags &= (XFS_ALL_QUOTA_ACCT | XFS_ALL_QUOTA_ENFD);
-@@ -598,7 +598,7 @@ xfs_qm_scall_setqlim(
- int error;
- xfs_qcnt_t hard, soft;
+ err = -EROFS;
+- if (IS_RDONLY(inode))
++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(file->f_vfsmnt))
+ goto out_putf;
+ err = -EPERM;
+ if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+@@ -539,11 +548,11 @@ asmlinkage long sys_fchmodat(int dfd, co
+ error = __user_walk_fd(dfd, filename, LOOKUP_FOLLOW, &nd);
+ if (error)
+ goto out;
+- inode = nd.dentry->d_inode;
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
- return XFS_ERROR(EPERM);
+- error = -EROFS;
+- if (IS_RDONLY(inode))
++ error = cow_check_and_break(&nd);
++ if (error)
+ goto dput_and_out;
++ inode = nd.dentry->d_inode;
- if ((newlim->d_fieldmask &
---- linux-2.6.18.5/fs/xfs/xfs_clnt.h 2006-06-18 04:54:50 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/xfs/xfs_clnt.h 2006-09-20 17:01:44 +0200
-@@ -99,5 +99,7 @@ struct xfs_mount_args {
- */
- #define XFSMNT2_COMPAT_IOSIZE 0x00000001 /* don't report large preferred
- * I/O size in stat(2) */
-+#define XFSMNT2_TAGXID 0x80000000 /* context xid tagging */
-+
-
- #endif /* __XFS_CLNT_H__ */
---- linux-2.6.18.5/fs/xfs/xfs_dinode.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/xfs/xfs_dinode.h 2006-09-20 18:30:41 +0200
-@@ -53,7 +53,8 @@ typedef struct xfs_dinode_core
- __uint32_t di_gid; /* owner's group id */
- __uint32_t di_nlink; /* number of links to file */
- __uint16_t di_projid; /* owner's project id */
-- __uint8_t di_pad[8]; /* unused, zeroed space */
-+ __uint16_t di_xid; /* vserver context id */
-+ __uint8_t di_pad[6]; /* unused, zeroed space */
- __uint16_t di_flushiter; /* incremented on flush */
- xfs_timestamp_t di_atime; /* time last accessed */
- xfs_timestamp_t di_mtime; /* time last modified */
-@@ -257,6 +258,9 @@ typedef enum xfs_dinode_fmt
- #define XFS_DIFLAG_EXTSIZE_BIT 11 /* inode extent size allocator hint */
- #define XFS_DIFLAG_EXTSZINHERIT_BIT 12 /* inherit inode extent size */
- #define XFS_DIFLAG_NODEFRAG_BIT 13 /* do not reorganize/defragment */
-+#define XFS_DIFLAG_BARRIER_BIT 14 /* chroot() barrier */
-+#define XFS_DIFLAG_IUNLINK_BIT 15 /* immutable unlink */
-+
- #define XFS_DIFLAG_REALTIME (1 << XFS_DIFLAG_REALTIME_BIT)
- #define XFS_DIFLAG_PREALLOC (1 << XFS_DIFLAG_PREALLOC_BIT)
- #define XFS_DIFLAG_NEWRTBM (1 << XFS_DIFLAG_NEWRTBM_BIT)
-@@ -271,12 +275,15 @@ typedef enum xfs_dinode_fmt
- #define XFS_DIFLAG_EXTSIZE (1 << XFS_DIFLAG_EXTSIZE_BIT)
- #define XFS_DIFLAG_EXTSZINHERIT (1 << XFS_DIFLAG_EXTSZINHERIT_BIT)
- #define XFS_DIFLAG_NODEFRAG (1 << XFS_DIFLAG_NODEFRAG_BIT)
-+#define XFS_DIFLAG_BARRIER (1 << XFS_DIFLAG_BARRIER_BIT)
-+#define XFS_DIFLAG_IUNLINK (1 << XFS_DIFLAG_IUNLINK_BIT)
-
- #define XFS_DIFLAG_ANY \
- (XFS_DIFLAG_REALTIME | XFS_DIFLAG_PREALLOC | XFS_DIFLAG_NEWRTBM | \
- XFS_DIFLAG_IMMUTABLE | XFS_DIFLAG_APPEND | XFS_DIFLAG_SYNC | \
- XFS_DIFLAG_NOATIME | XFS_DIFLAG_NODUMP | XFS_DIFLAG_RTINHERIT | \
- XFS_DIFLAG_PROJINHERIT | XFS_DIFLAG_NOSYMLINKS | XFS_DIFLAG_EXTSIZE | \
-- XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG)
-+ XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_BARRIER | \
-+ XFS_DIFLAG_IUNLINK)
+ error = -EPERM;
+ if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+@@ -568,7 +577,8 @@ asmlinkage long sys_chmod(const char __u
+ return sys_fchmodat(AT_FDCWD, filename, mode);
+ }
- #endif /* __XFS_DINODE_H__ */
---- linux-2.6.18.5/fs/xfs/xfs_fs.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/xfs/xfs_fs.h 2006-09-20 18:29:07 +0200
-@@ -68,6 +68,8 @@ struct fsxattr {
- #define XFS_XFLAG_EXTSIZE 0x00000800 /* extent size allocator hint */
- #define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
- #define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
-+#define XFS_XFLAG_BARRIER 0x00004000 /* chroot() barrier */
-+#define XFS_XFLAG_IUNLINK 0x00008000 /* immutable unlink */
- #define XFS_XFLAG_HASATTR 0x80000000 /* no DIFLAG for this */
+-static int chown_common(struct dentry * dentry, uid_t user, gid_t group)
++static int chown_common(struct dentry *dentry, struct vfsmount *mnt,
++ uid_t user, gid_t group)
+ {
+ struct inode * inode;
+ int error;
+@@ -580,7 +590,7 @@ static int chown_common(struct dentry *
+ goto out;
+ }
+ error = -EROFS;
+- if (IS_RDONLY(inode))
++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(mnt))
+ goto out;
+ error = -EPERM;
+ if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+@@ -588,11 +598,11 @@ static int chown_common(struct dentry *
+ newattrs.ia_valid = ATTR_CTIME;
+ if (user != (uid_t) -1) {
+ newattrs.ia_valid |= ATTR_UID;
+- newattrs.ia_uid = user;
++ newattrs.ia_uid = dx_map_uid(user);
+ }
+ if (group != (gid_t) -1) {
+ newattrs.ia_valid |= ATTR_GID;
+- newattrs.ia_gid = group;
++ newattrs.ia_gid = dx_map_gid(group);
+ }
+ if (!S_ISDIR(inode->i_mode))
+ newattrs.ia_valid |= ATTR_KILL_SUID|ATTR_KILL_SGID;
+@@ -611,7 +621,11 @@ asmlinkage long sys_chown(const char __u
+ error = user_path_walk(filename, &nd);
+ if (error)
+ goto out;
+- error = chown_common(nd.dentry, user, group);
++#ifdef CONFIG_VSERVER_COWBL
++ error = cow_check_and_break(&nd);
++ if (!error)
++#endif
++ error = chown_common(nd.dentry, nd.mnt, user, group);
+ path_release(&nd);
+ out:
+ return error;
+@@ -631,7 +645,11 @@ asmlinkage long sys_fchownat(int dfd, co
+ error = __user_walk_fd(dfd, filename, follow, &nd);
+ if (error)
+ goto out;
+- error = chown_common(nd.dentry, user, group);
++#ifdef CONFIG_VSERVER_COWBL
++ error = cow_check_and_break(&nd);
++ if (!error)
++#endif
++ error = chown_common(nd.dentry, nd.mnt, user, group);
+ path_release(&nd);
+ out:
+ return error;
+@@ -645,7 +663,11 @@ asmlinkage long sys_lchown(const char __
+ error = user_path_walk_link(filename, &nd);
+ if (error)
+ goto out;
+- error = chown_common(nd.dentry, user, group);
++#ifdef CONFIG_VSERVER_COWBL
++ error = cow_check_and_break(&nd);
++ if (!error)
++#endif
++ error = chown_common(nd.dentry, nd.mnt, user, group);
+ path_release(&nd);
+ out:
+ return error;
+@@ -664,7 +686,7 @@ asmlinkage long sys_fchown(unsigned int
- /*
-@@ -296,7 +298,8 @@ typedef struct xfs_bstat {
- __s32 bs_extents; /* number of extents */
- __u32 bs_gen; /* generation count */
- __u16 bs_projid; /* project id */
-- unsigned char bs_pad[14]; /* pad space, unused */
-+ __u16 bs_xid; /* context id */
-+ unsigned char bs_pad[12]; /* pad space, unused */
- __u32 bs_dmevmask; /* DMIG event mask */
- __u16 bs_dmstate; /* DMIG state info */
- __u16 bs_aextents; /* attribute number of extents */
---- linux-2.6.18.5/fs/xfs/xfs_inode.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/xfs/xfs_inode.c 2006-09-20 17:01:44 +0200
-@@ -50,6 +50,7 @@
- #include "xfs_mac.h"
- #include "xfs_acl.h"
+ dentry = file->f_path.dentry;
+ audit_inode(NULL, dentry->d_inode);
+- error = chown_common(dentry, user, group);
++ error = chown_common(dentry, file->f_vfsmnt, user, group);
+ fput(file);
+ out:
+ return error;
+@@ -891,6 +913,7 @@ repeat:
+ FD_SET(fd, fdt->open_fds);
+ FD_CLR(fd, fdt->close_on_exec);
+ files->next_fd = fd + 1;
++ vx_openfd_inc(fd);
+ #if 1
+ /* Sanity check */
+ if (fdt->fd[fd] != NULL) {
+@@ -913,6 +936,7 @@ static void __put_unused_fd(struct files
+ __FD_CLR(fd, fdt->open_fds);
+ if (fd < files->next_fd)
+ files->next_fd = fd;
++ vx_openfd_dec(fd);
+ }
-+#include <linux/vserver/xid.h>
+ void fastcall put_unused_fd(unsigned int fd)
+--- linux-2.6.20/fs/proc/array.c 2007-02-06 03:01:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/proc/array.c 2007-02-06 03:15:47 +0100
+@@ -75,6 +75,8 @@
+ #include <linux/cpuset.h>
+ #include <linux/rcupdate.h>
+ #include <linux/delayacct.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
- kmem_zone_t *xfs_ifork_zone;
- kmem_zone_t *xfs_inode_zone;
-@@ -736,20 +737,35 @@ xfs_xlate_dinode_core(
- xfs_dinode_core_t *buf_core = (xfs_dinode_core_t *)buf;
- xfs_dinode_core_t *mem_core = (xfs_dinode_core_t *)dip;
- xfs_arch_t arch = ARCH_CONVERT;
-+ uint32_t uid = 0, gid = 0;
-+ uint16_t xid = 0;
+ #include <asm/uaccess.h>
+ #include <asm/pgtable.h>
+@@ -134,8 +136,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 */
+ };
- ASSERT(dir);
+ static inline const char * get_task_state(struct task_struct *tsk)
+@@ -144,7 +147,8 @@ static inline const char * get_task_stat
+ TASK_INTERRUPTIBLE |
+ TASK_UNINTERRUPTIBLE |
+ TASK_STOPPED |
+- TASK_TRACED)) |
++ TASK_TRACED |
++ TASK_ONHOLD)) |
+ (tsk->exit_state & (EXIT_ZOMBIE |
+ EXIT_DEAD));
+ const char **p = &task_state_array[0];
+@@ -161,8 +165,16 @@ static inline char * task_state(struct t
+ struct group_info *group_info;
+ int g;
+ struct fdtable *fdt = NULL;
++ pid_t pid, ptgid, tppid, tgid;
-+ if (dir < 0) {
-+ xid = mem_core->di_xid;
-+ /* FIXME: supposed to use superblock flag */
-+ uid = XIDINO_UID(1, mem_core->di_uid, xid);
-+ gid = XIDINO_GID(1, mem_core->di_gid, xid);
-+ xid = XIDINO_XID(1, xid);
-+ }
+ rcu_read_lock();
++ tgid = vx_map_tgid(p->tgid);
++ pid = vx_map_pid(p->pid);
++ ptgid = vx_map_pid(pid_alive(p) ?
++ rcu_dereference(p->real_parent)->tgid : 0);
++ tppid = vx_map_pid(pid_alive(p) && p->ptrace ?
++ rcu_dereference(p->parent)->pid : 0);
+
- INT_XLATE(buf_core->di_magic, mem_core->di_magic, dir, arch);
- INT_XLATE(buf_core->di_mode, mem_core->di_mode, dir, arch);
- INT_XLATE(buf_core->di_version, mem_core->di_version, dir, arch);
- INT_XLATE(buf_core->di_format, mem_core->di_format, dir, arch);
- INT_XLATE(buf_core->di_onlink, mem_core->di_onlink, dir, arch);
-- INT_XLATE(buf_core->di_uid, mem_core->di_uid, dir, arch);
-- INT_XLATE(buf_core->di_gid, mem_core->di_gid, dir, arch);
-+ INT_XLATE(buf_core->di_uid, uid, dir, arch);
-+ INT_XLATE(buf_core->di_gid, gid, dir, arch);
-+ INT_XLATE(buf_core->di_xid, xid, dir, arch);
- INT_XLATE(buf_core->di_nlink, mem_core->di_nlink, dir, arch);
- INT_XLATE(buf_core->di_projid, mem_core->di_projid, dir, arch);
-
- if (dir > 0) {
-+ /* FIXME: supposed to use superblock flag */
-+ mem_core->di_uid = INOXID_UID(1, uid, gid);
-+ mem_core->di_gid = INOXID_GID(1, uid, gid);
-+ mem_core->di_xid = INOXID_XID(1, uid, gid, xid);
- memcpy(mem_core->di_pad, buf_core->di_pad,
- sizeof(buf_core->di_pad));
- } else {
-@@ -797,6 +813,10 @@ _xfs_dic2xflags(
- flags |= XFS_XFLAG_PREALLOC;
- if (di_flags & XFS_DIFLAG_IMMUTABLE)
- flags |= XFS_XFLAG_IMMUTABLE;
-+ if (di_flags & XFS_DIFLAG_IUNLINK)
-+ flags |= XFS_XFLAG_IUNLINK;
-+ if (di_flags & XFS_DIFLAG_BARRIER)
-+ flags |= XFS_XFLAG_BARRIER;
- if (di_flags & XFS_DIFLAG_APPEND)
- flags |= XFS_XFLAG_APPEND;
- if (di_flags & XFS_DIFLAG_SYNC)
-@@ -1126,6 +1146,7 @@ xfs_ialloc(
- ASSERT(ip->i_d.di_nlink == nlink);
- ip->i_d.di_uid = current_fsuid(cr);
- ip->i_d.di_gid = current_fsgid(cr);
-+ ip->i_d.di_xid = current_fsxid(cr, vp);
- ip->i_d.di_projid = prid;
- memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
-
---- linux-2.6.18.5/fs/xfs/xfs_itable.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/xfs/xfs_itable.c 2006-09-20 17:01:44 +0200
-@@ -78,6 +78,7 @@ xfs_bulkstat_one_iget(
- buf->bs_mode = dic->di_mode;
- buf->bs_uid = dic->di_uid;
- buf->bs_gid = dic->di_gid;
-+ buf->bs_xid = dic->di_xid;
- buf->bs_size = dic->di_size;
- vn_atime_to_bstime(vp, &buf->bs_atime);
- buf->bs_mtime.tv_sec = dic->di_mtime.t_sec;
-@@ -152,6 +153,7 @@ xfs_bulkstat_one_dinode(
- buf->bs_mode = INT_GET(dic->di_mode, ARCH_CONVERT);
- buf->bs_uid = INT_GET(dic->di_uid, ARCH_CONVERT);
- buf->bs_gid = INT_GET(dic->di_gid, ARCH_CONVERT);
-+ buf->bs_xid = INT_GET(dic->di_xid, ARCH_CONVERT);
- buf->bs_size = INT_GET(dic->di_size, ARCH_CONVERT);
- buf->bs_atime.tv_sec = INT_GET(dic->di_atime.t_sec, ARCH_CONVERT);
- buf->bs_atime.tv_nsec = INT_GET(dic->di_atime.t_nsec, ARCH_CONVERT);
---- linux-2.6.18.5/fs/xfs/xfs_mount.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/xfs/xfs_mount.h 2006-09-20 17:01:44 +0200
-@@ -460,6 +460,7 @@ typedef struct xfs_mount {
- #define XFS_MOUNT_NO_PERCPU_SB (1ULL << 23) /* don't use per-cpu superblock
- counters */
-
-+#define XFS_MOUNT_TAGXID (1ULL << 31) /* context xid tagging */
-
- /*
- * Default minimum read and write sizes.
---- linux-2.6.18.5/fs/xfs/xfs_vfsops.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/xfs/xfs_vfsops.c 2006-09-20 17:01:44 +0200
-@@ -300,6 +300,8 @@ xfs_start_flags(
-
- if (ap->flags2 & XFSMNT2_COMPAT_IOSIZE)
- mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE;
-+ if (ap->flags2 & XFSMNT2_TAGXID)
-+ mp->m_flags |= XFS_MOUNT_TAGXID;
+ buffer += sprintf(buffer,
+ "State:\t%s\n"
+ "SleepAVG:\t%lu%%\n"
+@@ -174,9 +186,7 @@ static inline char * task_state(struct t
+ "Gid:\t%d\t%d\t%d\t%d\n",
+ get_task_state(p),
+ (p->sleep_avg/1024)*100/(1020000000/1024),
+- p->tgid, p->pid,
+- pid_alive(p) ? rcu_dereference(p->real_parent)->tgid : 0,
+- pid_alive(p) && p->ptrace ? rcu_dereference(p->parent)->pid : 0,
++ tgid, pid, (pid > 1) ? ptgid : 0, tppid,
+ p->uid, p->euid, p->suid, p->fsuid,
+ p->gid, p->egid, p->sgid, p->fsgid);
- /*
- * no recovery flag requires a read-only mount
-@@ -394,6 +396,8 @@ xfs_finish_flags(
- return XFS_ERROR(EINVAL);
- }
+@@ -283,17 +293,26 @@ static inline char * task_sig(struct tas
-+ if (ap->flags2 & XFSMNT2_TAGXID)
-+ vfs->vfs_super->s_flags |= MS_TAGXID;
- return 0;
+ static inline char *task_cap(struct task_struct *p, char *buffer)
+ {
+- return buffer + sprintf(buffer, "CapInh:\t%016x\n"
+- "CapPrm:\t%016x\n"
+- "CapEff:\t%016x\n",
+- cap_t(p->cap_inheritable),
+- cap_t(p->cap_permitted),
+- cap_t(p->cap_effective));
++ struct vx_info *vxi = p->vx_info;
++
++ return buffer + sprintf(buffer,
++ "CapInh:\t%016x\n"
++ "CapPrm:\t%016x\n"
++ "CapEff:\t%016x\n",
++ (unsigned)vx_info_mbcap(vxi, p->cap_inheritable),
++ (unsigned)vx_info_mbcap(vxi, p->cap_permitted),
++ (unsigned)vx_info_mbcap(vxi, p->cap_effective));
}
-@@ -1645,6 +1649,7 @@ xfs_vget(
- * in stat(). */
- #define MNTOPT_ATTR2 "attr2" /* do use attr2 attribute format */
- #define MNTOPT_NOATTR2 "noattr2" /* do not use attr2 attribute format */
-+#define MNTOPT_TAGXID "tagxid" /* context xid tagging for inodes */
+ int proc_pid_status(struct task_struct *task, char * buffer)
+ {
+ char * orig = buffer;
++#ifdef CONFIG_VSERVER_LEGACY
++ struct vx_info *vxi;
++#endif
++#ifdef CONFIG_VSERVER_LEGACYNET
++ struct nx_info *nxi;
++#endif
+ struct mm_struct *mm = get_task_mm(task);
- STATIC unsigned long
- suffix_strtoul(char *s, char **endp, unsigned int base)
-@@ -1831,6 +1836,10 @@ xfs_parseargs(
- args->flags |= XFSMNT_ATTR2;
- } else if (!strcmp(this_char, MNTOPT_NOATTR2)) {
- args->flags &= ~XFSMNT_ATTR2;
-+#ifndef CONFIG_INOXID_NONE
-+ } else if (!strcmp(this_char, MNTOPT_TAGXID)) {
-+ args->flags2 |= XFSMNT2_TAGXID;
+ buffer = task_name(task, buffer);
+@@ -306,6 +325,46 @@ int proc_pid_status(struct task_struct *
+ buffer = task_sig(task, buffer);
+ buffer = task_cap(task, buffer);
+ buffer = cpuset_task_status_allowed(task, buffer);
++
++ if (task_vx_flags(task, VXF_HIDE_VINFO, 0))
++ goto skip;
++#ifdef CONFIG_VSERVER_LEGACY
++ buffer += sprintf (buffer,"s_context: %d\n", vx_task_xid(task));
++ vxi = task_get_vx_info(task);
++ if (vxi) {
++ buffer += sprintf (buffer,"ctxflags: %08llx\n"
++ ,(unsigned long long)vxi->vx_flags);
++ buffer += sprintf (buffer,"initpid: %d\n"
++ ,vxi->vx_initpid);
++ } else {
++ buffer += sprintf (buffer,"ctxflags: none\n");
++ buffer += sprintf (buffer,"initpid: none\n");
++ }
++ put_vx_info(vxi);
++#else
++ buffer += sprintf (buffer,"VxID: %d\n", vx_task_xid(task));
+#endif
- } else if (!strcmp(this_char, "osyncisdsync")) {
- /* no-op, this is now the default */
- cmn_err(CE_WARN,
---- linux-2.6.18.5/fs/xfs/xfs_vnodeops.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/fs/xfs/xfs_vnodeops.c 2006-09-20 17:01:44 +0200
-@@ -160,6 +160,7 @@ xfs_getattr(
- vap->va_mode = ip->i_d.di_mode;
- vap->va_uid = ip->i_d.di_uid;
- vap->va_gid = ip->i_d.di_gid;
-+ vap->va_xid = ip->i_d.di_xid;
- vap->va_projid = ip->i_d.di_projid;
-
- /*
-@@ -260,6 +261,7 @@ xfs_setattr(
- uint commit_flags=0;
- uid_t uid=0, iuid=0;
- gid_t gid=0, igid=0;
-+ xid_t xid=0, ixid=0;
- int timeflags = 0;
- bhv_vnode_t *vp;
- xfs_prid_t projid=0, iprojid=0;
-@@ -316,6 +318,7 @@ xfs_setattr(
- (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_PROJID))) {
- uint qflags = 0;
-
-+ /* FIXME: handle xid? */
- if ((mask & XFS_AT_UID) && XFS_IS_UQUOTA_ON(mp)) {
- uid = vap->va_uid;
- qflags |= XFS_QMOPT_UQUOTA;
-@@ -395,6 +398,8 @@ xfs_setattr(
- if (mask &
- (XFS_AT_MODE|XFS_AT_XFLAGS|XFS_AT_EXTSIZE|XFS_AT_UID|
- XFS_AT_GID|XFS_AT_PROJID)) {
-+ /* FIXME: handle xid? */
++#ifdef CONFIG_VSERVER_LEGACYNET
++ nxi = task_get_nx_info(task);
++ if (nxi) {
++ int i;
+
- /*
- * CAP_FOWNER overrides the following restrictions:
- *
-@@ -443,7 +448,7 @@ xfs_setattr(
- * and can change the group id only to a group of which he
- * or she is a member.
- */
-- if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_PROJID)) {
-+ if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_XID|XFS_AT_PROJID)) {
- /*
- * These IDs could have changed since we last looked at them.
- * But, we're assured that if the ownership did change
-@@ -451,10 +456,12 @@ xfs_setattr(
- * would have changed also.
- */
- iuid = ip->i_d.di_uid;
-- iprojid = ip->i_d.di_projid;
- igid = ip->i_d.di_gid;
-- gid = (mask & XFS_AT_GID) ? vap->va_gid : igid;
-+ ixid = ip->i_d.di_xid;
-+ iprojid = ip->i_d.di_projid;
- uid = (mask & XFS_AT_UID) ? vap->va_uid : iuid;
-+ gid = (mask & XFS_AT_GID) ? vap->va_gid : igid;
-+ xid = (mask & XFS_AT_XID) ? vap->va_xid : ixid;
- projid = (mask & XFS_AT_PROJID) ? (xfs_prid_t)vap->va_projid :
- iprojid;
-
-@@ -482,6 +489,7 @@ xfs_setattr(
- if ((XFS_IS_UQUOTA_ON(mp) && iuid != uid) ||
- (XFS_IS_PQUOTA_ON(mp) && iprojid != projid) ||
- (XFS_IS_GQUOTA_ON(mp) && igid != gid)) {
-+ /* FIXME: handle xid? */
- ASSERT(tp);
- code = XFS_QM_DQVOPCHOWNRESV(mp, tp, ip, udqp, gdqp,
- capable(CAP_FOWNER) ?
-@@ -707,7 +715,7 @@ xfs_setattr(
- * and can change the group id only to a group of which he
- * or she is a member.
- */
-- if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_PROJID)) {
-+ if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_XID|XFS_AT_PROJID)) {
- /*
- * CAP_FSETID overrides the following restrictions:
- *
-@@ -723,6 +731,12 @@ xfs_setattr(
- * Change the ownerships and register quota modifications
- * in the transaction.
- */
-+ if (ixid != xid) {
-+ if (XFS_IS_GQUOTA_ON(mp)) {
-+ /* FIXME: handle xid quota? */
-+ }
-+ ip->i_d.di_xid = xid;
++ buffer += sprintf (buffer,"ipv4root:");
++ for (i=0; i<nxi->nbipv4; i++){
++ buffer += sprintf (buffer," %08x/%08x"
++ ,nxi->ipv4[i]
++ ,nxi->mask[i]);
+ }
- if (iuid != uid) {
- if (XFS_IS_UQUOTA_ON(mp)) {
- ASSERT(mask & XFS_AT_UID);
-@@ -803,6 +817,10 @@ xfs_setattr(
- di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC);
- if (vap->va_xflags & XFS_XFLAG_IMMUTABLE)
- di_flags |= XFS_DIFLAG_IMMUTABLE;
-+ if (vap->va_xflags & XFS_XFLAG_IUNLINK)
-+ di_flags |= XFS_DIFLAG_IUNLINK;
-+ if (vap->va_xflags & XFS_XFLAG_BARRIER)
-+ di_flags |= XFS_DIFLAG_BARRIER;
- if (vap->va_xflags & XFS_XFLAG_APPEND)
- di_flags |= XFS_DIFLAG_APPEND;
- if (vap->va_xflags & XFS_XFLAG_SYNC)
---- linux-2.6.18.5/include/asm-arm/tlb.h 2006-06-18 04:54:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/asm-arm/tlb.h 2006-09-20 17:01:44 +0200
-@@ -28,6 +28,7 @@
- #else /* !CONFIG_MMU */
-
- #include <asm/pgalloc.h>
-+#include <linux/vs_memory.h>
-
- /*
- * TLB handling. This allows us to remove pages from the page
---- linux-2.6.18.5/include/asm-arm26/tlb.h 2006-01-03 17:30:02 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/asm-arm26/tlb.h 2006-09-20 17:01:44 +0200
-@@ -3,6 +3,7 @@
++ *buffer++ = '\n';
++ buffer += sprintf (buffer,"ipv4root_bcast: %08x\n"
++ ,nxi->v4_bcast);
++ } else {
++ buffer += sprintf (buffer,"ipv4root: 0\n");
++ buffer += sprintf (buffer,"ipv4root_bcast: 0\n");
++ }
++ put_nx_info(nxi);
++#endif
++skip:
+ #if defined(CONFIG_S390)
+ buffer = task_show_regs(task, buffer);
+ #endif
+@@ -320,7 +379,7 @@ static int do_task_stat(struct task_stru
+ sigset_t sigign, sigcatch;
+ char state;
+ int res;
+- pid_t ppid = 0, pgid = -1, sid = -1;
++ pid_t pid = 0, ppid = 0, pgid = -1, sid = -1;
+ int num_threads = 0;
+ struct mm_struct *mm;
+ unsigned long long start_time;
+@@ -382,8 +441,10 @@ static int do_task_stat(struct task_stru
+ }
- #include <asm/pgalloc.h>
- #include <asm/tlbflush.h>
-+#include <linux/vs_memory.h>
+ sid = signal_session(sig);
+- pgid = process_group(task);
+- ppid = rcu_dereference(task->real_parent)->tgid;
++ pid = vx_info_map_pid(task->vx_info, task->pid);
++ pgid = vx_info_map_pid(task->vx_info, process_group(task));
++ ppid = (pid > 1) ? vx_info_map_tgid(task->vx_info,
++ rcu_dereference(task->real_parent)->tgid) : 0;
- /*
- * TLB handling. This allows us to remove pages from the page
---- linux-2.6.18.5/include/asm-arm26/unistd.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/asm-arm26/unistd.h 2006-09-20 17:01:44 +0200
-@@ -302,6 +302,8 @@
- #define __NR_mq_getsetattr (__NR_SYSCALL_BASE+279)
- #define __NR_waitid (__NR_SYSCALL_BASE+280)
+ unlock_task_sighand(task, &flags);
+ }
+@@ -410,10 +471,21 @@ static int do_task_stat(struct task_stru
+ /* convert nsec -> ticks */
+ start_time = nsec_to_clock_t(start_time);
-+#define __NR_vserver (__NR_SYSCALL_BASE+313)
++ /* fixup start time for virt uptime */
++ if (vx_flags(VXF_VIRT_UPTIME, 0)) {
++ unsigned long long bias =
++ current->vx_info->cvirt.bias_clock;
+
- /*
- * The following SWIs are ARM private. FIXME - make appropriate for arm26
- */
---- linux-2.6.18.5/include/asm-generic/tlb.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/asm-generic/tlb.h 2006-09-20 17:01:44 +0200
-@@ -14,6 +14,7 @@
- #define _ASM_GENERIC__TLB_H
-
- #include <linux/swap.h>
-+#include <linux/vs_memory.h>
- #include <asm/pgalloc.h>
- #include <asm/tlbflush.h>
++ if (start_time > bias)
++ start_time -= bias;
++ else
++ start_time = 0;
++ }
++
+ res = sprintf(buffer,"%d (%s) %c %d %d %d %d %d %lu %lu \
+ %lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
+ %lu %lu %lu %lu %lu %lu %lu %lu %d %d %lu %lu %llu\n",
+- task->pid,
++ pid,
+ tcomm,
+ state,
+ ppid,
+--- linux-2.6.20/fs/proc/base.c 2007-02-06 03:01:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/proc/base.c 2007-02-06 03:16:36 +0100
+@@ -73,6 +73,9 @@
+ #include <linux/poll.h>
+ #include <linux/nsproxy.h>
+ #include <linux/oom.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++
+ #include "internal.h"
---- linux-2.6.18.5/include/asm-i386/elf.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/asm-i386/elf.h 2006-09-20 17:01:44 +0200
-@@ -112,7 +112,7 @@ typedef struct user_fxsr_struct elf_fpxr
- For the moment, we have only optimizations for the Intel generations,
- but that could change... */
+ /* NOTE:
+@@ -1034,6 +1037,8 @@ static struct inode *proc_pid_make_inode
+ inode->i_uid = task->euid;
+ inode->i_gid = task->egid;
+ }
++ /* procfs is xid tagged */
++ inode->i_tag = (tag_t)vx_task_xid(task);
+ security_task_to_inode(task, inode);
--#define ELF_PLATFORM (system_utsname.machine)
-+#define ELF_PLATFORM (vx_new_uts(machine))
+ out:
+@@ -1086,7 +1091,13 @@ static int pid_revalidate(struct dentry
+ {
+ struct inode *inode = dentry->d_inode;
+ struct task_struct *task = get_proc_task(inode);
++ int ret = 0;
++
+ if (task) {
++ if (!vx_proc_task_visible(task))
++ goto out_put;
++
++ ret = 1;
+ if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
+ task_dumpable(task)) {
+ inode->i_uid = task->euid;
+@@ -1097,11 +1108,11 @@ static int pid_revalidate(struct dentry
+ }
+ inode->i_mode &= ~(S_ISUID | S_ISGID);
+ security_task_to_inode(task, inode);
++ out_put:
+ put_task_struct(task);
+- return 1;
+ }
+ d_drop(dentry);
+- return 0;
++ return ret;
+ }
- #define SET_PERSONALITY(ex, ibcs2) do { } while (0)
+ static int pid_delete_dentry(struct dentry * dentry)
+@@ -1467,6 +1478,13 @@ static struct dentry *proc_pident_lookup
+ if (!task)
+ goto out_no_task;
---- linux-2.6.18.5/include/asm-ia64/tlb.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/asm-ia64/tlb.h 2006-09-20 17:01:44 +0200
-@@ -40,6 +40,7 @@
- #include <linux/mm.h>
- #include <linux/pagemap.h>
- #include <linux/swap.h>
-+#include <linux/vs_memory.h>
++ /* FIXME: maybe we can come up with a generic approach? */
++ if (task_vx_flags(task, VXF_HIDE_VINFO, 0) &&
++ (dentry->d_name.len == 5) &&
++ (!memcmp(dentry->d_name.name, "vinfo", 5) ||
++ !memcmp(dentry->d_name.name, "ninfo", 5)))
++ goto out;
++
+ /*
+ * Yes, it does not scale. And it should not. Don't add
+ * new entries into /proc/<tgid>/ without very good reasons.
+@@ -1671,14 +1689,14 @@ static int proc_self_readlink(struct den
+ int buflen)
+ {
+ char tmp[PROC_NUMBUF];
+- sprintf(tmp, "%d", current->tgid);
++ sprintf(tmp, "%d", vx_map_tgid(current->tgid));
+ return vfs_readlink(dentry,buffer,buflen,tmp);
+ }
- #include <asm/pgalloc.h>
- #include <asm/processor.h>
---- linux-2.6.18.5/include/asm-mips/irq.h 2006-09-20 16:58:41 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/asm-mips/irq.h 2006-11-21 02:45:10 +0100
-@@ -10,6 +10,7 @@
- #define _ASM_IRQ_H
+ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
+ {
+ char tmp[PROC_NUMBUF];
+- sprintf(tmp, "%d", current->tgid);
++ sprintf(tmp, "%d", vx_map_tgid(current->tgid));
+ return ERR_PTR(vfs_follow_link(nd,tmp));
+ }
- #include <linux/linkage.h>
-+#include <linux/vs_context.h>
+@@ -1772,7 +1790,7 @@ out_iput:
+ static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry)
+ {
+ struct dentry *error;
+- struct task_struct *task = get_proc_task(dir);
++ struct task_struct *task = get_proc_task_real(dir);
+ struct pid_entry *p, *last;
+
+ error = ERR_PTR(-ENOENT);
+@@ -1833,6 +1851,9 @@ static int proc_pid_io_accounting(struct
+ static struct file_operations proc_task_operations;
+ static struct inode_operations proc_task_inode_operations;
- #include <asm/mipsmtregs.h>
++extern int proc_pid_vx_info(struct task_struct *, char *);
++extern int proc_pid_nx_info(struct task_struct *, char *);
++
+ static struct pid_entry tgid_base_stuff[] = {
+ DIR("task", S_IRUGO|S_IXUGO, task),
+ DIR("fd", S_IRUSR|S_IXUSR, fd),
+@@ -1870,6 +1891,8 @@ static struct pid_entry tgid_base_stuff[
+ #ifdef CONFIG_CPUSETS
+ REG("cpuset", S_IRUGO, cpuset),
+ #endif
++ INF("vinfo", S_IRUGO, pid_vx_info),
++ INF("ninfo", S_IRUGO, pid_nx_info),
+ INF("oom_score", S_IRUGO, oom_score),
+ REG("oom_adj", S_IRUGO|S_IWUSR, oom_adjust),
+ #ifdef CONFIG_AUDITSYSCALL
+@@ -2018,7 +2041,7 @@ struct dentry *proc_pid_lookup(struct in
+ goto out;
---- linux-2.6.18.5/include/asm-powerpc/systbl.h 2006-09-20 16:58:41 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/asm-powerpc/systbl.h 2006-09-20 20:01:36 +0200
-@@ -260,7 +260,7 @@ COMPAT_SYS_SPU(fstatfs64)
- SYSX(sys_ni_syscall, ppc_fadvise64_64, ppc_fadvise64_64)
- PPC_SYS_SPU(rtas)
- OLDSYS(debug_setcontext)
--SYSCALL(ni_syscall)
-+SYSX(sys_vserver, sys32_vserver, sys_vserver)
- SYSCALL(ni_syscall)
- COMPAT_SYS(mbind)
- COMPAT_SYS(get_mempolicy)
---- linux-2.6.18.5/include/asm-powerpc/unistd.h 2006-09-20 16:58:41 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/asm-powerpc/unistd.h 2006-09-20 17:01:44 +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
- /* 258 currently unused */
- #define __NR_mbind 259
- #define __NR_get_mempolicy 260
---- linux-2.6.18.5/include/asm-s390/unistd.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/asm-s390/unistd.h 2006-09-20 17:01:44 +0200
-@@ -255,7 +255,7 @@
- #define __NR_clock_gettime (__NR_timer_create+6)
- #define __NR_clock_getres (__NR_timer_create+7)
- #define __NR_clock_nanosleep (__NR_timer_create+8)
--/* Number 263 is reserved for vserver */
-+#define __NR_vserver 263
- #define __NR_fadvise64_64 264
- #define __NR_statfs64 265
- #define __NR_fstatfs64 266
---- linux-2.6.18.5/include/asm-sparc/unistd.h 2006-12-04 06:13:52 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/asm-sparc/unistd.h 2006-11-19 17:04:56 +0100
-@@ -283,7 +283,7 @@
- #define __NR_timer_getoverrun 264
- #define __NR_timer_delete 265
- #define __NR_timer_create 266
--/* #define __NR_vserver 267 Reserved for VSERVER */
-+#define __NR_vserver 267
- #define __NR_io_setup 268
- #define __NR_io_destroy 269
- #define __NR_io_submit 270
---- linux-2.6.18.5/include/asm-sparc64/tlb.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/asm-sparc64/tlb.h 2006-09-20 17:01:44 +0200
-@@ -2,6 +2,7 @@
- #define _SPARC64_TLB_H
-
- #include <linux/swap.h>
-+#include <linux/vs_memory.h>
- #include <asm/pgalloc.h>
- #include <asm/tlbflush.h>
- #include <asm/mmu_context.h>
---- linux-2.6.18.5/include/asm-sparc64/unistd.h 2006-12-04 06:13:52 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/asm-sparc64/unistd.h 2006-11-19 17:04:56 +0100
-@@ -285,7 +285,7 @@
- #define __NR_timer_getoverrun 264
- #define __NR_timer_delete 265
- #define __NR_timer_create 266
--/* #define __NR_vserver 267 Reserved for VSERVER */
-+#define __NR_vserver 267
- #define __NR_io_setup 268
- #define __NR_io_destroy 269
- #define __NR_io_submit 270
---- linux-2.6.18.5/include/asm-x86_64/unistd.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/asm-x86_64/unistd.h 2006-09-20 17:01:44 +0200
-@@ -532,7 +532,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
- #define __NR_utimes 235
- __SYSCALL(__NR_utimes, sys_utimes)
- #define __NR_vserver 236
--__SYSCALL(__NR_vserver, sys_ni_syscall)
-+__SYSCALL(__NR_vserver, sys_vserver)
- #define __NR_mbind 237
- __SYSCALL(__NR_mbind, sys_mbind)
- #define __NR_set_mempolicy 238
---- linux-2.6.18.5/include/linux/capability.h 2006-06-18 04:55:15 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/capability.h 2006-09-20 17:01:45 +0200
-@@ -235,6 +235,7 @@ typedef __u32 kernel_cap_t;
- arbitrary SCSI commands */
- /* Allow setting encryption key on loopback filesystem */
- /* Allow setting zone reclaim policy */
-+/* Allow the selection of a security context */
+ rcu_read_lock();
+- task = find_task_by_pid(tgid);
++ task = vx_find_proc_task_by_pid(tgid);
+ if (task)
+ get_task_struct(task);
+ rcu_read_unlock();
+@@ -2082,7 +2105,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 task_struct *task;
+ int tgid;
+
+@@ -2101,7 +2124,10 @@ int proc_pid_readdir(struct file * filp,
+ put_task_struct(task), task = next_tgid(tgid + 1)) {
+ tgid = task->pid;
+ filp->f_pos = tgid + TGID_OFFSET;
+- if (proc_pid_fill_cache(filp, dirent, filldir, task, tgid) < 0) {
++ if (!vx_proc_task_visible(task))
++ continue;
++ if (proc_pid_fill_cache(filp, dirent, filldir, task,
++ vx_map_tgid(tgid)) < 0) {
+ put_task_struct(task);
+ goto out;
+ }
+@@ -2225,9 +2251,11 @@ static struct dentry *proc_task_lookup(s
+ tid = name_to_int(dentry);
+ if (tid == ~0U)
+ goto out;
++ if (vx_current_initpid(tid))
++ goto out;
- #define CAP_SYS_ADMIN 21
+ rcu_read_lock();
+- task = find_task_by_pid(tid);
++ task = vx_find_proc_task_by_pid(tid);
+ if (task)
+ get_task_struct(task);
+ rcu_read_unlock();
+@@ -2372,7 +2400,10 @@ static int proc_task_readdir(struct file
+ for (task = first_tid(leader, tid, pos - 2);
+ task;
+ task = next_tid(task), pos++) {
+- tid = task->pid;
++ tid = vx_map_pid(task->pid);
++ /* FIXME: could go away now! */
++ if (!vx_proc_task_visible(task))
++ continue;
+ if (proc_task_fill_cache(filp, dirent, filldir, task, tid) < 0) {
+ /* returning this tgid failed, save it as the first
+ * pid for the next readir call */
+--- linux-2.6.20/fs/proc/generic.c 2007-02-06 03:01:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/proc/generic.c 2007-02-06 03:05:22 +0100
+@@ -20,6 +20,7 @@
+ #include <linux/namei.h>
+ #include <linux/bitops.h>
+ #include <linux/spinlock.h>
++#include <linux/vserver/inode.h>
+ #include <asm/uaccess.h>
-@@ -288,6 +289,11 @@ typedef __u32 kernel_cap_t;
+ #include "internal.h"
+@@ -395,12 +396,16 @@ struct dentry *proc_lookup(struct inode
+ for (de = de->subdir; de ; de = de->next) {
+ if (de->namelen != dentry->d_name.len)
+ continue;
++ if (!vx_hide_check(0, de->vx_flags))
++ continue;
+ if (!memcmp(dentry->d_name.name, de->name, de->namelen)) {
+ unsigned int ino = de->low_ino;
- #define CAP_AUDIT_CONTROL 30
+ spin_unlock(&proc_subdir_lock);
+ error = -EINVAL;
+ inode = proc_get_inode(dir->i_sb, ino, de);
++ /* generic proc entries belong to the host */
++ inode->i_tag = 0;
+ spin_lock(&proc_subdir_lock);
+ break;
+ }
+@@ -476,12 +481,15 @@ int proc_readdir(struct file * filp,
+ }
-+/* Allow context manipulations */
-+/* Allow changing context info on files */
-+
-+#define CAP_CONTEXT 31
-+
- #ifdef __KERNEL__
- /*
- * Bounding set
---- linux-2.6.18.5/include/linux/devpts_fs.h 2004-08-14 12:55:59 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/devpts_fs.h 2006-09-20 17:01:45 +0200
-@@ -30,5 +30,7 @@ static inline void devpts_pty_kill(int n
+ do {
++ if (!vx_hide_check(0, de->vx_flags))
++ goto skip;
+ /* filldir passes info to user space */
+ spin_unlock(&proc_subdir_lock);
+ if (filldir(dirent, de->name, de->namelen, filp->f_pos,
+ de->low_ino, de->mode >> 12) < 0)
+ goto out;
+ spin_lock(&proc_subdir_lock);
++ skip:
+ filp->f_pos++;
+ de = de->next;
+ } while (de);
+@@ -604,6 +612,7 @@ static struct proc_dir_entry *proc_creat
+ ent->namelen = len;
+ ent->mode = mode;
+ ent->nlink = nlink;
++ ent->vx_flags = IATTR_PROC_DEFAULT;
+ out:
+ return ent;
+ }
+@@ -624,7 +633,8 @@ struct proc_dir_entry *proc_symlink(cons
+ kfree(ent->data);
+ kfree(ent);
+ ent = NULL;
+- }
++ } else
++ ent->vx_flags = IATTR_PROC_SYMLINK;
+ } else {
+ kfree(ent);
+ ent = NULL;
+--- linux-2.6.20/fs/proc/inode.c 2007-02-06 03:01:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/proc/inode.c 2007-02-06 03:05:22 +0100
+@@ -168,6 +168,8 @@ struct inode *proc_get_inode(struct supe
+ inode->i_uid = de->uid;
+ inode->i_gid = de->gid;
+ }
++ if (de->vx_flags)
++ PROC_I(inode)->vx_flags = de->vx_flags;
+ if (de->size)
+ inode->i_size = de->size;
+ if (de->nlink)
+--- linux-2.6.20/fs/proc/internal.h 2006-11-30 21:19:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/proc/internal.h 2007-02-06 03:05:22 +0100
+@@ -10,6 +10,7 @@
+ */
- #endif
+ #include <linux/proc_fs.h>
++#include <linux/vs_pid.h>
-+#define DEVPTS_SUPER_MAGIC 0x00001cd1
-+
+ struct vmalloc_info {
+ unsigned long used;
+@@ -56,11 +57,16 @@ static inline struct pid *proc_pid(struc
+ return PROC_I(inode)->pid;
+ }
- #endif /* _LINUX_DEVPTS_FS_H */
---- linux-2.6.18.5/include/linux/ext2_fs.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/ext2_fs.h 2006-09-20 17:01:45 +0200
-@@ -192,10 +192,17 @@ struct ext2_group_desc
- #define EXT2_NOTAIL_FL 0x00008000 /* file tail should not be merged */
- #define EXT2_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
- #define EXT2_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
-+#define EXT2_BARRIER_FL 0x04000000 /* Barrier for chroot() */
-+#define EXT2_IUNLINK_FL 0x08000000 /* Immutable unlink */
- #define EXT2_RESERVED_FL 0x80000000 /* reserved for ext2 lib */
+-static inline struct task_struct *get_proc_task(struct inode *inode)
++static inline struct task_struct *get_proc_task_real(struct inode *inode)
+ {
+ return get_pid_task(proc_pid(inode), PIDTYPE_PID);
+ }
-+#ifdef CONFIG_VSERVER_LEGACY
-+#define EXT2_FL_USER_VISIBLE 0x0803DFFF /* User visible flags */
-+#define EXT2_FL_USER_MODIFIABLE 0x080380FF /* User modifiable flags */
-+#else
- #define EXT2_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
- #define EXT2_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
-+#endif
++static inline struct task_struct *get_proc_task(struct inode *inode)
++{
++ return vx_get_proc_task(inode, proc_pid(inode));
++}
++
+ static inline int proc_fd(struct inode *inode)
+ {
+ return PROC_I(inode)->fd;
+--- linux-2.6.20/fs/proc/proc_misc.c 2007-02-06 03:01:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/proc/proc_misc.c 2007-02-06 03:19:18 +0100
+@@ -54,6 +54,8 @@
+ #include <asm/div64.h>
+ #include "internal.h"
++#include <linux/vs_cvirt.h>
++
+ #define LOAD_INT(x) ((x) >> FSHIFT)
+ #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
/*
- * ioctl commands
-@@ -240,7 +247,7 @@ struct ext2_inode {
- struct {
- __u8 l_i_frag; /* Fragment number */
- __u8 l_i_fsize; /* Fragment size */
-- __u16 i_pad1;
-+ __u16 l_i_xid; /* LRU Context */
- __le16 l_i_uid_high; /* these 2 fields */
- __le16 l_i_gid_high; /* were reserved2[0] */
- __u32 l_i_reserved2;
-@@ -272,6 +279,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_raw_xid osd2.linux2.l_i_xid
- #define i_reserved2 osd2.linux2.l_i_reserved2
- #endif
+@@ -83,17 +85,32 @@ static int proc_calc_metrics(char *page,
+ static int loadavg_read_proc(char *page, char **start, off_t off,
+ int count, int *eof, void *data)
+ {
++ unsigned int running, threads;
+ int a, b, c;
+ int len;
-@@ -313,8 +321,9 @@ struct ext2_inode {
- #define EXT2_MOUNT_XATTR_USER 0x004000 /* Extended user attributes */
- #define EXT2_MOUNT_POSIX_ACL 0x008000 /* POSIX Access Control Lists */
- #define EXT2_MOUNT_XIP 0x010000 /* Execute in place */
--#define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */
--#define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */
-+#define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */
-+#define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */
-+#define EXT2_MOUNT_TAGXID (1<<24) /* Enable Context Tags */
+- a = avenrun[0] + (FIXED_1/200);
+- b = avenrun[1] + (FIXED_1/200);
+- c = avenrun[2] + (FIXED_1/200);
+- len = sprintf(page,"%d.%02d %d.%02d %d.%02d %ld/%d %d\n",
++ if (vx_flags(VXF_VIRT_LOAD, 0)) {
++ struct vx_info *vxi = current->vx_info;
++
++ a = vxi->cvirt.load[0] + (FIXED_1/200);
++ b = vxi->cvirt.load[1] + (FIXED_1/200);
++ c = vxi->cvirt.load[2] + (FIXED_1/200);
++
++ running = atomic_read(&vxi->cvirt.nr_running);
++ threads = atomic_read(&vxi->cvirt.nr_threads);
++ } else {
++ a = avenrun[0] + (FIXED_1/200);
++ b = avenrun[1] + (FIXED_1/200);
++ c = avenrun[2] + (FIXED_1/200);
++
++ running = nr_running();
++ threads = nr_threads;
++ }
++ len = sprintf(page,"%d.%02d %d.%02d %d.%02d %d/%d %d\n",
+ LOAD_INT(a), LOAD_FRAC(a),
+ LOAD_INT(b), LOAD_FRAC(b),
+ LOAD_INT(c), LOAD_FRAC(c),
+- nr_running(), nr_threads, current->nsproxy->pid_ns->last_pid);
++ running, threads, current->nsproxy->pid_ns->last_pid);
+ return proc_calc_metrics(page, start, off, count, eof, len);
+ }
+@@ -107,6 +124,9 @@ static int uptime_read_proc(char *page,
- #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
---- linux-2.6.18.5/include/linux/ext3_fs.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/ext3_fs.h 2006-09-20 17:01:45 +0200
-@@ -181,10 +181,20 @@ struct ext3_group_desc
- #define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
- #define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
- #define EXT3_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
-+#define EXT3_BARRIER_FL 0x04000000 /* Barrier for chroot() */
-+#define EXT3_IUNLINK_FL 0x08000000 /* Immutable unlink */
- #define EXT3_RESERVED_FL 0x80000000 /* reserved for ext3 lib */
+ do_posix_clock_monotonic_gettime(&uptime);
+ cputime_to_timespec(idletime, &idle);
++ if (vx_flags(VXF_VIRT_UPTIME, 0))
++ vx_vsi_uptime(&uptime, &idle);
++
+ len = sprintf(page,"%lu.%02lu %lu.%02lu\n",
+ (unsigned long) uptime.tv_sec,
+ (uptime.tv_nsec / (NSEC_PER_SEC / 100)),
+@@ -143,7 +163,7 @@ static int meminfo_read_proc(char *page,
-+#ifdef CONFIG_VSERVER_LEGACY
-+#define EXT3_FL_USER_VISIBLE 0x0803DFFF /* User visible flags */
-+#define EXT3_FL_USER_MODIFIABLE 0x080380FF /* User modifiable flags */
-+#else
- #define EXT3_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
- #define EXT3_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
-+#endif
-+#ifdef CONFIG_VSERVER_LEGACY
-+#define EXT3_IOC_SETXID FIOC_SETXIDJ
-+#endif
+ cached = global_page_state(NR_FILE_PAGES) -
+ total_swapcache_pages - i.bufferram;
+- if (cached < 0)
++ if (cached < 0 || vx_flags(VXF_VIRT_MEM, 0))
+ cached = 0;
- /*
- * Inode dynamic state flags
-@@ -283,7 +293,7 @@ struct ext3_inode {
- struct {
- __u8 l_i_frag; /* Fragment number */
- __u8 l_i_fsize; /* Fragment size */
-- __u16 i_pad1;
-+ __u16 l_i_xid; /* LRU Context */
- __le16 l_i_uid_high; /* these 2 fields */
- __le16 l_i_gid_high; /* were reserved2[0] */
- __u32 l_i_reserved2;
-@@ -317,6 +327,7 @@ struct ext3_inode {
- #define i_gid_low i_gid
- #define i_uid_high osd2.linux2.l_i_uid_high
- #define i_gid_high osd2.linux2.l_i_gid_high
-+#define i_raw_xid osd2.linux2.l_i_xid
- #define i_reserved2 osd2.linux2.l_i_reserved2
+ get_vmalloc_info(&vmi);
+--- linux-2.6.20/fs/proc/root.c 2007-02-06 03:01:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/proc/root.c 2007-02-06 03:05:22 +0100
+@@ -26,6 +26,9 @@ struct proc_dir_entry *proc_net, *proc_n
+ #ifdef CONFIG_SYSCTL
+ struct proc_dir_entry *proc_sys_root;
+ #endif
++struct proc_dir_entry *proc_virtual;
++
++extern void proc_vx_init(void);
- #elif defined(__GNU__)
-@@ -371,6 +382,7 @@ struct ext3_inode {
- #define EXT3_MOUNT_QUOTA 0x80000 /* Some quota option set */
- #define EXT3_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
- #define EXT3_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
-+#define EXT3_MOUNT_TAGXID (1<<24) /* Enable Context Tags */
+ static int proc_get_sb(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data, struct vfsmount *mnt)
+@@ -90,6 +93,7 @@ void __init proc_root_init(void)
+ proc_device_tree_init();
+ #endif
+ proc_bus = proc_mkdir("bus", NULL);
++ proc_vx_init();
+ }
- /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
- #ifndef _LINUX_EXT2_FS_H
-@@ -799,6 +811,7 @@ struct buffer_head * ext3_bread (handle_
- int ext3_get_blocks_handle(handle_t *handle, struct inode *inode,
- sector_t iblock, unsigned long maxblocks, struct buffer_head *bh_result,
- int create, int extend_disksize);
-+extern int ext3_sync_flags(struct inode *inode);
+ static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
+--- linux-2.6.20/fs/quota.c 2006-11-30 21:19:28 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/quota.c 2007-02-06 03:05:22 +0100
+@@ -17,6 +17,7 @@
+ #include <linux/buffer_head.h>
+ #include <linux/capability.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_context.h>
- extern void ext3_read_inode (struct inode *);
- extern int ext3_write_inode (struct inode *, int);
---- linux-2.6.18.5/include/linux/fs.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/fs.h 2006-09-20 17:01:45 +0200
-@@ -119,6 +119,8 @@ extern int dir_notify_enable;
- #define MS_PRIVATE (1<<18) /* change to private */
- #define MS_SLAVE (1<<19) /* change to slave */
- #define MS_SHARED (1<<20) /* change to shared */
-+#define MS_TAGXID (1<<24) /* tag inodes with context information */
-+#define MS_XID (1<<25) /* use specific xid for this mount */
- #define MS_ACTIVE (1<<30)
- #define MS_NOUSER (1<<31)
+ /* 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
+ if (cmd == Q_GETQUOTA) {
+ if (((type == USRQUOTA && current->euid != id) ||
+ (type == GRPQUOTA && !in_egroup_p(id))) &&
+- !capable(CAP_SYS_ADMIN))
++ !vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
+ return -EPERM;
+ }
+ else if (cmd != Q_GETFMT && cmd != Q_SYNC && cmd != Q_GETINFO)
+- if (!capable(CAP_SYS_ADMIN))
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
+ return -EPERM;
-@@ -145,6 +147,8 @@ extern int dir_notify_enable;
- #define S_NOCMTIME 128 /* Do not update file c/mtime */
- #define S_SWAPFILE 256 /* Do not truncate: swapon got its bmaps */
- #define S_PRIVATE 512 /* Inode is fs-internal */
-+#define S_BARRIER 1024 /* Barrier for chroot() */
-+#define S_IUNLINK 2048 /* Immutable unlink */
+ return 0;
+@@ -132,10 +133,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))) &&
+- !capable(CAP_SYS_ADMIN))
++ !vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
+ return -EPERM;
+ } else if (cmd != Q_XGETQSTAT && cmd != Q_XQUOTASYNC) {
+- if (!capable(CAP_SYS_ADMIN))
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
+ return -EPERM;
+ }
+
+@@ -365,6 +366,46 @@ static inline struct super_block *quotac
+ #endif
+ }
++#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
++
++#include <linux/vroot.h>
++#include <linux/major.h>
++#include <linux/module.h>
++#include <linux/kallsyms.h>
++#include <linux/vserver/debug.h>
++
++static vroot_grb_func *vroot_get_real_bdev = NULL;
++
++static spinlock_t vroot_grb_lock = SPIN_LOCK_UNLOCKED;
++
++int register_vroot_grb(vroot_grb_func *func) {
++ int ret = -EBUSY;
++
++ spin_lock(&vroot_grb_lock);
++ if (!vroot_get_real_bdev) {
++ vroot_get_real_bdev = func;
++ ret = 0;
++ }
++ spin_unlock(&vroot_grb_lock);
++ return ret;
++}
++EXPORT_SYMBOL(register_vroot_grb);
++
++int unregister_vroot_grb(vroot_grb_func *func) {
++ int ret = -EINVAL;
++
++ spin_lock(&vroot_grb_lock);
++ if (vroot_get_real_bdev) {
++ vroot_get_real_bdev = NULL;
++ ret = 0;
++ }
++ spin_unlock(&vroot_grb_lock);
++ return ret;
++}
++EXPORT_SYMBOL(unregister_vroot_grb);
++
++#endif
++
/*
- * Note that nosuid etc flags are inode-specific: setting some file-system
-@@ -161,18 +165,22 @@ extern int dir_notify_enable;
- */
- #define __IS_FLG(inode,flg) ((inode)->i_sb->s_flags & (flg))
+ * This is the system call interface. This communicates with
+ * the user-level programs. Currently this only supports diskquota
+--- linux-2.6.20/fs/read_write.c 2007-02-06 03:01:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/read_write.c 2007-02-06 03:38:37 +0100
+@@ -701,12 +701,77 @@ sys_writev(unsigned long fd, const struc
+ return ret;
+ }
--#define IS_RDONLY(inode) ((inode)->i_sb->s_flags & MS_RDONLY)
-+#define IS_RDONLY(inode) __IS_FLG(inode, MS_RDONLY)
- #define IS_SYNC(inode) (__IS_FLG(inode, MS_SYNCHRONOUS) || \
- ((inode)->i_flags & S_SYNC))
- #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_TAGXID(inode) __IS_FLG(inode, MS_TAGXID)
++ssize_t vfs_sendfile(struct file *out_file, struct file *in_file, loff_t *ppos,
++ size_t count, loff_t max)
++{
++ struct inode * in_inode, * out_inode;
++ loff_t pos;
++ ssize_t ret;
++
++ /* verify in_file */
++ in_inode = in_file->f_path.dentry->d_inode;
++ if (!in_inode)
++ return -EINVAL;
++ if (!in_file->f_op || !in_file->f_op->sendfile)
++ return -EINVAL;
++
++ if (!ppos)
++ ppos = &in_file->f_pos;
++ else
++ if (!(in_file->f_mode & FMODE_PREAD))
++ return -ESPIPE;
++
++ ret = rw_verify_area(READ, in_file, ppos, count);
++ if (ret < 0)
++ return ret;
++ count = ret;
++
++ /* verify out_file */
++ out_inode = out_file->f_path.dentry->d_inode;
++ if (!out_inode)
++ return -EINVAL;
++ if (!out_file->f_op || !out_file->f_op->sendpage)
++ return -EINVAL;
++
++ ret = rw_verify_area(WRITE, out_file, &out_file->f_pos, count);
++ if (ret < 0)
++ return ret;
++ count = ret;
++
++ ret = security_file_permission (out_file, MAY_WRITE);
++ if (ret)
++ return ret;
++
++ if (!max)
++ max = min(in_inode->i_sb->s_maxbytes, out_inode->i_sb->s_maxbytes);
++
++ pos = *ppos;
++ if (unlikely(pos < 0))
++ return -EINVAL;
++ if (unlikely(pos + count > max)) {
++ if (pos >= max)
++ return -EOVERFLOW;
++ count = max - pos;
++ }
++
++ ret = in_file->f_op->sendfile(in_file, ppos, count, file_send_actor, out_file);
++
++ if (ret > 0) {
++ current->rchar += ret;
++ current->wchar += ret;
++ }
++
++ if (*ppos > max)
++ return -EOVERFLOW;
++ return ret;
++}
++
++EXPORT_SYMBOL(vfs_sendfile);
++
+ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,
+ size_t count, loff_t max)
+ {
+ struct file * in_file, * out_file;
+- struct inode * in_inode, * out_inode;
+- loff_t pos;
+ ssize_t retval;
+ int fput_needed_in, fput_needed_out;
- #define IS_NOQUOTA(inode) ((inode)->i_flags & S_NOQUOTA)
- #define IS_APPEND(inode) ((inode)->i_flags & S_APPEND)
- #define IS_IMMUTABLE(inode) ((inode)->i_flags & S_IMMUTABLE)
-+#define IS_IUNLINK(inode) ((inode)->i_flags & S_IUNLINK)
-+#define IS_IXORUNLINK(inode) ((IS_IUNLINK(inode) ? S_IMMUTABLE : 0) ^ IS_IMMUTABLE(inode))
- #define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
+@@ -719,22 +784,6 @@ static ssize_t do_sendfile(int out_fd, i
+ goto out;
+ if (!(in_file->f_mode & FMODE_READ))
+ goto fput_in;
+- retval = -EINVAL;
+- in_inode = in_file->f_path.dentry->d_inode;
+- if (!in_inode)
+- goto fput_in;
+- if (!in_file->f_op || !in_file->f_op->sendfile)
+- goto fput_in;
+- retval = -ESPIPE;
+- if (!ppos)
+- ppos = &in_file->f_pos;
+- else
+- if (!(in_file->f_mode & FMODE_PREAD))
+- goto fput_in;
+- retval = rw_verify_area(READ, in_file, ppos, count);
+- if (retval < 0)
+- goto fput_in;
+- count = retval;
-+#define IS_BARRIER(inode) (S_ISDIR((inode)->i_mode) && ((inode)->i_flags & S_BARRIER))
- #define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
- #define IS_NOCMTIME(inode) ((inode)->i_flags & S_NOCMTIME)
- #define IS_SWAPFILE(inode) ((inode)->i_flags & S_SWAPFILE)
-@@ -280,6 +288,7 @@ typedef void (dio_iodone_t)(struct kiocb
- #define ATTR_KILL_SUID 2048
- #define ATTR_KILL_SGID 4096
- #define ATTR_FILE 8192
-+#define ATTR_XID 16384
+ retval = security_file_permission (in_file, MAY_READ);
+ if (retval)
+@@ -749,45 +798,12 @@ static ssize_t do_sendfile(int out_fd, i
+ goto fput_in;
+ if (!(out_file->f_mode & FMODE_WRITE))
+ goto fput_out;
+- retval = -EINVAL;
+- if (!out_file->f_op || !out_file->f_op->sendpage)
+- goto fput_out;
+- out_inode = out_file->f_path.dentry->d_inode;
+- retval = rw_verify_area(WRITE, out_file, &out_file->f_pos, count);
+- if (retval < 0)
+- goto fput_out;
+- count = retval;
+-
+- retval = security_file_permission (out_file, MAY_WRITE);
+- if (retval)
+- goto fput_out;
+-
+- if (!max)
+- max = min(in_inode->i_sb->s_maxbytes, out_inode->i_sb->s_maxbytes);
+-
+- pos = *ppos;
+- retval = -EINVAL;
+- if (unlikely(pos < 0))
+- goto fput_out;
+- if (unlikely(pos + count > max)) {
+- retval = -EOVERFLOW;
+- if (pos >= max)
+- goto fput_out;
+- count = max - pos;
+- }
- /*
- * This is the Inode Attributes structure, used for notify_change(). It
-@@ -295,6 +304,7 @@ struct iattr {
- umode_t ia_mode;
- uid_t ia_uid;
- gid_t ia_gid;
-+ xid_t ia_xid;
- loff_t ia_size;
- struct timespec ia_atime;
- struct timespec ia_mtime;
-@@ -308,6 +318,9 @@ struct iattr {
- struct file *ia_file;
- };
+- retval = in_file->f_op->sendfile(in_file, ppos, count, file_send_actor, out_file);
++ retval = vfs_sendfile(out_file, in_file, ppos, count, max);
-+#define ATTR_FLAG_BARRIER 512 /* Barrier for chroot() */
-+#define ATTR_FLAG_IUNLINK 1024 /* Immutable unlink */
-+
- /*
- * Includes for diskquotas.
- */
-@@ -505,6 +518,7 @@ struct inode {
- unsigned int i_nlink;
- uid_t i_uid;
- gid_t i_gid;
-+ xid_t i_xid;
- dev_t i_rdev;
- loff_t i_size;
- struct timespec i_atime;
-@@ -687,6 +701,7 @@ struct file {
- struct fown_struct f_owner;
- unsigned int f_uid, f_gid;
- struct file_ra_state f_ra;
-+ xid_t f_xid;
+- if (retval > 0) {
+- current->rchar += retval;
+- current->wchar += retval;
+- }
+ current->syscr++;
+ current->syscw++;
- unsigned long f_version;
- void *f_security;
-@@ -767,6 +782,7 @@ struct file_lock {
- unsigned char fl_type;
- loff_t fl_start;
- loff_t fl_end;
-+ xid_t fl_xid;
+- if (*ppos > max)
+- retval = -EOVERFLOW;
+-
+ fput_out:
+ fput_light(out_file, fput_needed_out);
+ fput_in:
+--- linux-2.6.20/fs/reiserfs/bitmap.c 2007-02-06 03:01:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/reiserfs/bitmap.c 2007-02-06 03:05:22 +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>
- struct fasync_struct * fl_fasync; /* for lease break notifications */
- unsigned long fl_break_time; /* for nonblocking lease breaks */
-@@ -959,12 +975,12 @@ static inline void unlock_super(struct s
- */
- extern int vfs_permission(struct nameidata *, int);
- extern int vfs_create(struct inode *, struct dentry *, int, struct nameidata *);
--extern int vfs_mkdir(struct inode *, struct dentry *, int);
--extern int vfs_mknod(struct inode *, struct dentry *, int, dev_t);
--extern int vfs_symlink(struct inode *, struct dentry *, const char *, int);
--extern int vfs_link(struct dentry *, struct inode *, struct dentry *);
--extern int vfs_rmdir(struct inode *, struct dentry *);
--extern int vfs_unlink(struct inode *, struct dentry *);
-+extern int vfs_mkdir(struct inode *, struct dentry *, int, struct nameidata *);
-+extern int vfs_mknod(struct inode *, struct dentry *, int, dev_t, struct nameidata *);
-+extern int vfs_symlink(struct inode *, struct dentry *, const char *, int, struct nameidata *);
-+extern int vfs_link(struct dentry *, struct inode *, struct dentry *, struct nameidata *);
-+extern int vfs_rmdir(struct inode *, struct dentry *, struct nameidata *);
-+extern int vfs_unlink(struct inode *, struct dentry *, struct nameidata *);
- extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
+ #define PREALLOCATION_SIZE 9
- /*
-@@ -1106,6 +1122,7 @@ struct inode_operations {
- ssize_t (*listxattr) (struct dentry *, char *, size_t);
- int (*removexattr) (struct dentry *, const char *);
- void (*truncate_range)(struct inode *, loff_t, loff_t);
-+ int (*sync_flags) (struct inode *);
- };
+@@ -425,8 +426,10 @@ static void _reiserfs_free_block(struct
+ set_sb_free_blocks(rs, sb_free_blocks(rs) + 1);
- struct seq_file;
-@@ -1790,6 +1807,7 @@ extern int dcache_dir_open(struct inode
- extern int dcache_dir_close(struct inode *, struct file *);
- extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
- extern int dcache_readdir(struct file *, void *, filldir_t);
-+extern int dcache_readdir_filter(struct file *, void *, filldir_t, int (*)(struct dentry *));
- extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
- extern int simple_statfs(struct dentry *, struct kstatfs *);
- extern int simple_link(struct dentry *, struct inode *, struct dentry *);
---- linux-2.6.18.5/include/linux/init_task.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/init_task.h 2006-09-20 17:51:11 +0200
-@@ -128,6 +128,10 @@ extern struct group_info init_groups;
- .pi_lock = SPIN_LOCK_UNLOCKED, \
- INIT_TRACE_IRQFLAGS \
- INIT_LOCKDEP \
-+ .xid = 0, \
-+ .vx_info = NULL, \
-+ .nid = 0, \
-+ .nx_info = NULL, \
+ 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,
+@@ -1034,6 +1037,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;
---- linux-2.6.18.5/include/linux/ipc.h 2004-08-14 12:54:46 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/ipc.h 2006-09-20 17:01:45 +0200
-@@ -66,6 +66,7 @@ struct kern_ipc_perm
- mode_t mode;
- unsigned long seq;
- void *security;
-+ xid_t xid;
- };
-
- #endif /* __KERNEL__ */
---- linux-2.6.18.5/include/linux/kernel.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/kernel.h 2006-09-20 17:01:45 +0200
-@@ -17,6 +17,7 @@
- #include <asm/bug.h>
-
- extern const char linux_banner[];
-+extern const char vx_linux_banner[];
-
- #define INT_MAX ((int)(~0U>>1))
- #define INT_MIN (-INT_MAX - 1)
---- linux-2.6.18.5/include/linux/major.h 2006-06-18 04:55:19 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/major.h 2006-09-20 17:01:45 +0200
-@@ -15,6 +15,7 @@
- #define HD_MAJOR IDE0_MAJOR
- #define PTY_SLAVE_MAJOR 3
- #define TTY_MAJOR 4
-+#define VROOT_MAJOR 4
- #define TTYAUX_MAJOR 5
- #define LP_MAJOR 6
- #define VCS_MAJOR 7
---- linux-2.6.18.5/include/linux/mount.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/mount.h 2006-09-20 17:50:23 +0200
-@@ -27,12 +27,16 @@ struct namespace;
- #define MNT_NOEXEC 0x04
- #define MNT_NOATIME 0x08
- #define MNT_NODIRATIME 0x10
-+#define MNT_RDONLY 0x20
+ determine_prealloc_size(hint);
+ if (!hint->formatted_node) {
+@@ -1043,19 +1047,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;
++ }
+
-+#define MNT_IS_RDONLY(m) ((m) && ((m)->mnt_flags & MNT_RDONLY))
-
- #define MNT_SHRINKABLE 0x100
-
- #define MNT_SHARED 0x1000 /* if the vfsmount is a shared mount */
- #define MNT_UNBINDABLE 0x2000 /* if the vfsmount is a unbindable mount */
- #define MNT_PNODE_MASK 0x3000 /* propogation flag mask */
-+#define MNT_XID 0x8000
-
- struct vfsmount {
- struct list_head mnt_hash;
-@@ -54,6 +58,7 @@ struct vfsmount {
- struct vfsmount *mnt_master; /* slave is on master->mnt_slave_list */
- struct namespace *mnt_namespace; /* containing namespace */
- int mnt_pinned;
-+ xid_t mnt_xid; /* xid tagging used for vfsmount */
- };
-
- static inline struct vfsmount *mntget(struct vfsmount *mnt)
---- linux-2.6.18.5/include/linux/net.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/net.h 2006-09-20 17:47:13 +0200
-@@ -62,6 +62,7 @@ typedef enum {
- #define SOCK_NOSPACE 2
- #define SOCK_PASSCRED 3
- #define SOCK_PASSSEC 4
-+#define SOCK_USER_SOCKET 5
-
- #ifndef ARCH_HAS_SOCKET_TYPES
- /**
---- linux-2.6.18.5/include/linux/nfs_mount.h 2005-08-29 22:25:42 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/nfs_mount.h 2006-09-20 17:01:45 +0200
-@@ -61,6 +61,7 @@ struct nfs_mount_data {
- #define NFS_MOUNT_NOACL 0x0800 /* 4 */
- #define NFS_MOUNT_STRICTLOCK 0x1000 /* reserved for NFSv4 */
- #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
-+#define NFS_MOUNT_TAGXID 0x8000 /* tagxid */
- #define NFS_MOUNT_FLAGMASK 0xFFFF
-
+ 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
---- linux-2.6.18.5/include/linux/percpu.h 2006-04-09 13:49:57 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/percpu.h 2006-09-20 17:01:45 +0200
-@@ -8,7 +8,7 @@
-
- /* Enough to cover all DEFINE_PER_CPUs in kernel, including modules. */
- #ifndef PERCPU_ENOUGH_ROOM
--#define PERCPU_ENOUGH_ROOM 32768
-+#define PERCPU_ENOUGH_ROOM 65536
+- 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;
+ }
+@@ -1087,7 +1102,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,
+@@ -1118,10 +1136,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);
+ }
- /* Must be an lvalue. */
---- linux-2.6.18.5/include/linux/pid.h 2006-06-18 04:55:21 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/pid.h 2006-10-17 01:48:03 +0200
-@@ -8,7 +8,8 @@ enum pid_type
- PIDTYPE_PID,
- PIDTYPE_PGID,
- PIDTYPE_SID,
-- PIDTYPE_MAX
-+ PIDTYPE_MAX,
-+ PIDTYPE_REALPID
+ return CARRY_ON;
+--- linux-2.6.20/fs/reiserfs/file.c 2007-02-06 03:01:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/reiserfs/file.c 2007-02-06 03:05:22 +0100
+@@ -1550,6 +1550,7 @@ const struct file_operations reiserfs_fi
+ .release = reiserfs_file_release,
+ .fsync = reiserfs_sync_file,
+ .sendfile = generic_file_sendfile,
++ .sendpage = generic_file_sendpage,
+ .aio_read = generic_file_aio_read,
+ .aio_write = generic_file_aio_write,
+ .splice_read = generic_file_splice_read,
+@@ -1564,4 +1565,5 @@ struct inode_operations reiserfs_file_in
+ .listxattr = reiserfs_listxattr,
+ .removexattr = reiserfs_removexattr,
+ .permission = reiserfs_permission,
++ .sync_flags = reiserfs_sync_flags,
};
+--- linux-2.6.20/fs/reiserfs/inode.c 2007-02-06 03:01:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/reiserfs/inode.c 2007-02-06 03:05:22 +0100
+@@ -16,6 +16,8 @@
+ #include <linux/mpage.h>
+ #include <linux/writeback.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_dlimit.h>
++#include <linux/vs_tag.h>
- /*
---- linux-2.6.18.5/include/linux/proc_fs.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/proc_fs.h 2006-09-20 17:46:14 +0200
-@@ -55,6 +55,7 @@ struct proc_dir_entry {
- nlink_t nlink;
- uid_t uid;
- gid_t gid;
-+ int vx_flags;
- loff_t size;
- struct inode_operations * proc_iops;
- const struct file_operations * proc_fops;
-@@ -247,10 +248,12 @@ extern void kclist_add(struct kcore_list
+ static int reiserfs_commit_write(struct file *f, struct page *page,
+ unsigned from, unsigned to);
+@@ -50,6 +52,7 @@ void reiserfs_delete_inode(struct inode
+ * stat data deletion */
+ if (!err)
+ DQUOT_FREE_INODE(inode);
++ DLIMIT_FREE_INODE(inode);
- struct proc_inode {
- struct pid *pid;
-+ int vx_flags;
- int fd;
- union {
- int (*proc_get_link)(struct inode *, struct dentry **, struct vfsmount **);
- int (*proc_read)(struct task_struct *task, char *page);
-+ int (*proc_vid_read)(int vid, char *page);
- } op;
- struct proc_dir_entry *pde;
- struct inode vfs_inode;
---- linux-2.6.18.5/include/linux/reiserfs_fs.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/reiserfs_fs.h 2006-09-20 17:01:45 +0200
-@@ -829,6 +829,18 @@ struct stat_data_v1 {
- #define REISERFS_COMPR_FL EXT2_COMPR_FL
- #define REISERFS_NOTAIL_FL EXT2_NOTAIL_FL
+ if (journal_end(&th, inode->i_sb, jbegin_count))
+ goto out;
+@@ -1112,6 +1115,8 @@ static void init_inode(struct inode *ino
+ struct buffer_head *bh;
+ struct item_head *ih;
+ __u32 rdev;
++ uid_t uid;
++ gid_t gid;
+ //int version = ITEM_VERSION_1;
-+/* unfortunately reiserfs sdattr is only 16 bit */
-+#define REISERFS_BARRIER_FL (EXT2_BARRIER_FL >> 16)
-+#define REISERFS_IUNLINK_FL (EXT2_IUNLINK_FL >> 16)
+ bh = PATH_PLAST_BUFFER(path);
+@@ -1135,12 +1140,13 @@ static void init_inode(struct inode *ino
+ (struct stat_data_v1 *)B_I_PITEM(bh, ih);
+ unsigned long blocks;
+
++ uid = sd_v1_uid(sd);
++ gid = sd_v1_gid(sd);
+
-+#ifdef CONFIG_VSERVER_LEGACY
-+#define REISERFS_FL_USER_VISIBLE (REISERFS_IUNLINK_FL|0x80FF)
-+#define REISERFS_FL_USER_MODIFIABLE (REISERFS_IUNLINK_FL|0x80FF)
-+#else
-+#define REISERFS_FL_USER_VISIBLE 0x80FF
-+#define REISERFS_FL_USER_MODIFIABLE 0x80FF
-+#endif
+ set_inode_item_key_version(inode, KEY_FORMAT_3_5);
+ set_inode_sd_version(inode, STAT_DATA_V1);
+ inode->i_mode = sd_v1_mode(sd);
+ inode->i_nlink = sd_v1_nlink(sd);
+- inode->i_uid = sd_v1_uid(sd);
+- inode->i_gid = sd_v1_gid(sd);
+ 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);
+@@ -1182,11 +1188,12 @@ static void init_inode(struct inode *ino
+ // (directories and symlinks)
+ struct stat_data *sd = (struct stat_data *)B_I_PITEM(bh, ih);
+
++ uid = sd_v2_uid(sd);
++ gid = sd_v2_gid(sd);
+
- /* persistent flags that file inherits from the parent directory */
- #define REISERFS_INHERIT_MASK ( REISERFS_IMMUTABLE_FL | \
- REISERFS_SYNC_FL | \
-@@ -1909,6 +1921,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);
+ inode->i_mode = sd_v2_mode(sd);
+ inode->i_nlink = sd_v2_nlink(sd);
+- inode->i_uid = sd_v2_uid(sd);
+ inode->i_size = sd_v2_size(sd);
+- inode->i_gid = sd_v2_gid(sd);
+ 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);
+@@ -1216,6 +1223,10 @@ static void init_inode(struct inode *ino
+ sd_attrs_to_i_attrs(sd_v2_attrs(sd), inode);
+ }
- /* namei.c */
- void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
---- linux-2.6.18.5/include/linux/reiserfs_fs_sb.h 2006-02-18 14:40:35 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/reiserfs_fs_sb.h 2006-09-20 17:01:45 +0200
-@@ -456,6 +456,7 @@ enum reiserfs_mount_options {
- REISERFS_POSIXACL,
- REISERFS_BARRIER_NONE,
- REISERFS_BARRIER_FLUSH,
-+ REISERFS_TAGXID,
++ 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);
++
+ pathrelse(path);
+ if (S_ISREG(inode->i_mode)) {
+ inode->i_op = &reiserfs_file_inode_operations;
+@@ -1238,13 +1249,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;
++ 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);
+ __u16 flags;
- /* Actions on error */
- REISERFS_ERROR_PANIC,
---- linux-2.6.18.5/include/linux/sched.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/sched.h 2006-12-10 02:36:48 +0100
-@@ -52,6 +52,7 @@ struct sched_param {
- #include <linux/cpumask.h>
- #include <linux/errno.h>
- #include <linux/nodemask.h>
-+#include <linux/vs_base.h>
++ set_sd_v2_uid(sd_v2, uid);
++ set_sd_v2_gid(sd_v2, gid);
+ set_sd_v2_mode(sd_v2, inode->i_mode);
+ set_sd_v2_nlink(sd_v2, inode->i_nlink);
+- set_sd_v2_uid(sd_v2, inode->i_uid);
+ set_sd_v2_size(sd_v2, size);
+- set_sd_v2_gid(sd_v2, inode->i_gid);
+ 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);
+@@ -1775,6 +1788,10 @@ int reiserfs_new_inode(struct reiserfs_t
- #include <asm/system.h>
- #include <asm/semaphore.h>
-@@ -148,6 +149,7 @@ extern unsigned long weighted_cpuload(co
- #define EXIT_DEAD 32
- /* in tsk->state again */
- #define TASK_NONINTERACTIVE 64
-+#define TASK_ONHOLD 128
-
- #define __set_task_state(tsk, state_value) \
- do { (tsk)->state = (state_value); } while (0)
-@@ -262,27 +264,30 @@ extern void arch_unmap_area_topdown(stru
- * The mm counters are not protected by its page_table_lock,
- * so must be incremented atomically.
- */
--#define set_mm_counter(mm, member, value) atomic_long_set(&(mm)->_##member, value)
--#define get_mm_counter(mm, member) ((unsigned long)atomic_long_read(&(mm)->_##member))
--#define add_mm_counter(mm, member, value) atomic_long_add(value, &(mm)->_##member)
--#define inc_mm_counter(mm, member) atomic_long_inc(&(mm)->_##member)
--#define dec_mm_counter(mm, member) atomic_long_dec(&(mm)->_##member)
- typedef atomic_long_t mm_counter_t;
-+#define __set_mm_counter(mm, member, value) \
-+ atomic_long_set(&(mm)->_##member, value)
-+#define get_mm_counter(mm, member) \
-+ ((unsigned long)atomic_long_read(&(mm)->_##member))
-
- #else /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
- /*
- * The mm counters are protected by its page_table_lock,
- * so can be incremented directly.
- */
--#define set_mm_counter(mm, member, value) (mm)->_##member = (value)
--#define get_mm_counter(mm, member) ((mm)->_##member)
--#define add_mm_counter(mm, member, value) (mm)->_##member += (value)
--#define inc_mm_counter(mm, member) (mm)->_##member++
--#define dec_mm_counter(mm, member) (mm)->_##member--
- typedef unsigned long mm_counter_t;
-+#define __set_mm_counter(mm, member, value) (mm)->_##member = (value)
-+#define get_mm_counter(mm, member) ((mm)->_##member)
+ BUG_ON(!th->t_trans_id);
- #endif /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
++ if (DLIMIT_ALLOC_INODE(inode)) {
++ err = -ENOSPC;
++ goto out_bad_dlimit;
++ }
+ if (DQUOT_ALLOC_INODE(inode)) {
+ err = -EDQUOT;
+ goto out_end_trans;
+@@ -1960,6 +1977,9 @@ int reiserfs_new_inode(struct reiserfs_t
+ DQUOT_FREE_INODE(inode);
-+#define set_mm_counter(mm, member, value) \
-+ vx_ ## member ## pages_sub((mm), (get_mm_counter(mm, member) - value))
-+#define add_mm_counter(mm, member, value) \
-+ vx_ ## member ## pages_add((mm), (value))
-+#define inc_mm_counter(mm, member) vx_ ## member ## pages_inc((mm))
-+#define dec_mm_counter(mm, member) vx_ ## member ## pages_dec((mm))
+ out_end_trans:
++ DLIMIT_FREE_INODE(inode);
+
- #define get_mm_rss(mm) \
- (get_mm_counter(mm, file_rss) + get_mm_counter(mm, anon_rss))
- #define update_hiwater_rss(mm) do { \
-@@ -341,6 +346,7 @@ struct mm_struct {
-
- /* Architecture-specific MM context */
- mm_context_t context;
-+ struct vx_info *mm_vx_info;
-
- /* Token based thrashing protection. */
- unsigned long swap_token_time;
-@@ -531,9 +537,10 @@ struct user_struct {
- /* Hash table maintenance information */
- struct list_head uidhash_list;
- uid_t uid;
-+ xid_t xid;
- };
-
--extern struct user_struct *find_user(uid_t);
-+extern struct user_struct *find_user(xid_t, uid_t);
++ 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);
+@@ -2699,6 +2719,14 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs,
+ inode->i_flags |= S_IMMUTABLE;
+ else
+ inode->i_flags &= ~S_IMMUTABLE;
++ if (sd_attrs & REISERFS_IUNLINK_FL)
++ inode->i_flags |= S_IUNLINK;
++ else
++ inode->i_flags &= ~S_IUNLINK;
++ if (sd_attrs & REISERFS_BARRIER_FL)
++ inode->i_flags |= S_BARRIER;
++ else
++ inode->i_flags &= ~S_BARRIER;
+ if (sd_attrs & REISERFS_APPEND_FL)
+ inode->i_flags |= S_APPEND;
+ else
+@@ -2721,6 +2749,14 @@ 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_IUNLINK)
++ *sd_attrs |= REISERFS_IUNLINK_FL;
++ else
++ *sd_attrs &= ~REISERFS_IUNLINK_FL;
++ if (inode->i_flags & S_BARRIER)
++ *sd_attrs |= REISERFS_BARRIER_FL;
++ else
++ *sd_attrs &= ~REISERFS_BARRIER_FL;
+ if (inode->i_flags & S_SYNC)
+ *sd_attrs |= REISERFS_SYNC_FL;
+ else
+@@ -2900,6 +2936,22 @@ static ssize_t reiserfs_direct_IO(int rw
+ reiserfs_get_blocks_direct_io, NULL);
+ }
- extern struct user_struct root_user;
- #define INIT_USER (&root_user)
-@@ -898,6 +905,14 @@ struct task_struct {
-
- void *security;
- struct audit_context *audit_context;
-+
-+/* vserver context data */
-+ struct vx_info *vx_info;
-+ struct nx_info *nx_info;
-+
-+ xid_t xid;
-+ nid_t nid;
++int reiserfs_sync_flags(struct inode *inode)
++{
++ u16 oldflags, newflags;
+
- seccomp_t seccomp;
-
- /* Thread group tracking */
-@@ -1162,13 +1177,18 @@ extern struct task_struct init_task;
-
- extern struct mm_struct init_mm;
-
--#define find_task_by_pid(nr) find_task_by_pid_type(PIDTYPE_PID, nr)
++ oldflags = REISERFS_I(inode)->i_attrs;
++ newflags = oldflags;
++ i_attrs_to_sd_attrs(inode, &newflags);
+
-+#define find_task_by_real_pid(nr) \
-+ find_task_by_pid_type(PIDTYPE_REALPID, nr)
-+#define find_task_by_pid(nr) \
-+ find_task_by_pid_type(PIDTYPE_PID, nr)
++ if (oldflags ^ newflags) {
++ REISERFS_I(inode)->i_attrs = newflags;
++ inode->i_ctime = CURRENT_TIME_SEC;
++ mark_inode_dirty(inode);
++ }
++ return 0;
++}
+
- extern struct task_struct *find_task_by_pid_type(int type, int pid);
- extern void set_special_pids(pid_t session, pid_t pgrp);
- extern void __set_special_pids(pid_t session, pid_t pgrp);
-
- /* per-UID process charging. */
--extern struct user_struct * alloc_uid(uid_t);
-+extern struct user_struct * alloc_uid(xid_t, uid_t);
- static inline struct user_struct *get_uid(struct user_struct *u)
+ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr)
{
- atomic_inc(&u->__count);
---- linux-2.6.18.5/include/linux/shmem_fs.h 2006-04-09 13:49:57 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/shmem_fs.h 2006-09-20 17:01:45 +0200
-@@ -8,6 +8,9 @@
-
- #define SHMEM_NR_DIRECT 16
+ struct inode *inode = dentry->d_inode;
+@@ -2949,9 +3001,11 @@ int reiserfs_setattr(struct dentry *dent
+ }
-+#define TMPFS_SUPER_MAGIC 0x01021994
-+
+ error = inode_change_ok(inode, attr);
+
- struct shmem_inode_info {
- spinlock_t lock;
- unsigned long flags;
---- linux-2.6.18.5/include/linux/stat.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/stat.h 2006-09-20 17:01:45 +0200
-@@ -63,6 +63,7 @@ struct kstat {
- unsigned int nlink;
- uid_t uid;
- gid_t gid;
-+ xid_t xid;
- dev_t rdev;
- loff_t size;
- struct timespec atime;
---- linux-2.6.18.5/include/linux/sunrpc/auth.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/sunrpc/auth.h 2006-09-20 17:01:45 +0200
-@@ -27,6 +27,7 @@
- struct auth_cred {
- uid_t uid;
- gid_t gid;
-+ xid_t xid;
- struct group_info *group_info;
- };
+ 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 = reiserfs_chown_xattrs(inode, attr);
---- linux-2.6.18.5/include/linux/sunrpc/clnt.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/sunrpc/clnt.h 2006-09-20 17:01:45 +0200
-@@ -52,7 +52,8 @@ struct rpc_clnt {
- cl_intr : 1,/* interruptible */
- cl_autobind : 1,/* use getport() */
- cl_oneshot : 1,/* dispose after use */
-- cl_dead : 1;/* abandoned */
-+ cl_dead : 1,/* abandoned */
-+ cl_tagxid : 1;/* do xid tagging */
+ if (!error) {
+@@ -2981,6 +3035,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;
++ if ((attr->ia_valid & ATTR_TAG) &&
++ IS_TAGGED(inode))
++ inode->i_tag = attr->ia_tag;
+ mark_inode_dirty(inode);
+ error =
+ journal_end(&th, inode->i_sb, jbegin_count);
+--- linux-2.6.20/fs/reiserfs/ioctl.c 2007-02-06 03:01:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/reiserfs/ioctl.c 2007-02-06 03:05:22 +0100
+@@ -4,6 +4,7 @@
- struct rpc_rtt * cl_rtt; /* RTO estimator data */
- struct rpc_portmap * cl_pmap; /* port mapping */
---- linux-2.6.18.5/include/linux/sysctl.h 2006-12-04 06:13:52 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/sysctl.h 2006-10-16 18:56:11 +0200
-@@ -93,6 +93,7 @@ enum
- KERN_CAP_BSET=14, /* int: capability bounding set */
- KERN_PANIC=15, /* int: panic timeout */
- KERN_REALROOTDEV=16, /* real root device to mount after initrd */
-+ KERN_VSHELPER=17, /* string: path to vshelper policy agent */
+ #include <linux/capability.h>
+ #include <linux/fs.h>
++#include <linux/mount.h>
+ #include <linux/reiserfs_fs.h>
+ #include <linux/time.h>
+ #include <asm/uaccess.h>
+@@ -24,7 +25,7 @@ static int reiserfs_unpack(struct inode
+ int reiserfs_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
+ unsigned long arg)
+ {
+- unsigned int flags;
++ unsigned int flags, oldflags;
- KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
- KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-@@ -917,6 +918,9 @@ typedef int ctl_handler (ctl_table *tabl
- typedef int proc_handler (ctl_table *ctl, int write, struct file * filp,
- void __user *buffer, size_t *lenp, loff_t *ppos);
+ switch (cmd) {
+ case REISERFS_IOC_UNPACK:
+@@ -43,12 +44,14 @@ int reiserfs_ioctl(struct inode *inode,
-+typedef int virt_handler (struct ctl_table *ctl, int write, xid_t xid,
-+ void **datap, size_t *lenp);
-+
- extern int proc_dostring(ctl_table *, int, struct file *,
- void __user *, size_t *, loff_t *);
- extern int proc_dointvec(ctl_table *, int, struct file *,
-@@ -998,6 +1002,7 @@ struct ctl_table
- mode_t mode;
- ctl_table *child;
- proc_handler *proc_handler; /* Callback for text formatting */
-+ virt_handler *virt_handler; /* Context virtualization */
- ctl_handler *strategy; /* Callback function for all r/w */
- struct proc_dir_entry *de; /* /proc control block */
- void *extra1;
---- linux-2.6.18.5/include/linux/sysfs.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/sysfs.h 2006-09-20 17:01:45 +0200
-@@ -12,6 +12,8 @@
+ flags = REISERFS_I(inode)->i_attrs;
+ i_attrs_to_sd_attrs(inode, (__u16 *) & flags);
++ flags &= REISERFS_FL_USER_VISIBLE;
+ return put_user(flags, (int __user *)arg);
+ case REISERFS_IOC_SETFLAGS:{
+ if (!reiserfs_attrs(inode->i_sb))
+ return -ENOTTY;
- #include <asm/atomic.h>
+- if (IS_RDONLY(inode))
++ if (IS_RDONLY(inode) ||
++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
+ return -EROFS;
-+#define SYSFS_SUPER_MAGIC 0x62656572
-+
- struct kobject;
- struct module;
+ if ((current->fsuid != inode->i_uid)
+@@ -58,10 +61,12 @@ int reiserfs_ioctl(struct inode *inode,
+ if (get_user(flags, (int __user *)arg))
+ return -EFAULT;
---- linux-2.6.18.5/include/linux/types.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/types.h 2006-09-20 17:01:45 +0200
-@@ -37,6 +37,8 @@ typedef __kernel_uid32_t uid_t;
- typedef __kernel_gid32_t gid_t;
- typedef __kernel_uid16_t uid16_t;
- typedef __kernel_gid16_t gid16_t;
-+typedef unsigned int xid_t;
-+typedef unsigned int nid_t;
+- if (((flags ^ REISERFS_I(inode)->
+- i_attrs) & (REISERFS_IMMUTABLE_FL |
+- REISERFS_APPEND_FL))
+- && !capable(CAP_LINUX_IMMUTABLE))
++ oldflags = REISERFS_I(inode) -> i_attrs;
++ if (((oldflags & REISERFS_IMMUTABLE_FL) ||
++ ((flags ^ oldflags) &
++ (REISERFS_IMMUTABLE_FL | REISERFS_IUNLINK_FL |
++ REISERFS_APPEND_FL))) &&
++ !capable(CAP_LINUX_IMMUTABLE))
+ return -EPERM;
+
+ if ((flags & REISERFS_NOTAIL_FL) &&
+@@ -72,6 +77,9 @@ int reiserfs_ioctl(struct inode *inode,
+ if (result)
+ return result;
+ }
++
++ flags = 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;
+@@ -83,7 +91,8 @@ int reiserfs_ioctl(struct inode *inode,
+ case REISERFS_IOC_SETVERSION:
+ if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
+ return -EPERM;
+- if (IS_RDONLY(inode))
++ if (IS_RDONLY(inode) ||
++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
+ return -EROFS;
+ if (get_user(inode->i_generation, (int __user *)arg))
+ return -EFAULT;
+--- linux-2.6.20/fs/reiserfs/namei.c 2007-02-06 03:01:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/reiserfs/namei.c 2007-02-06 03:05:22 +0100
+@@ -18,6 +18,7 @@
+ #include <linux/reiserfs_xattr.h>
+ #include <linux/smp_lock.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.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);
+@@ -361,6 +362,7 @@ static struct dentry *reiserfs_lookup(st
+ reiserfs_write_unlock(dir->i_sb);
+ return ERR_PTR(-EACCES);
+ }
++ 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))
+@@ -596,6 +598,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);
+ return 0;
+ }
+@@ -1542,6 +1545,7 @@ struct inode_operations reiserfs_dir_ino
+ .listxattr = reiserfs_listxattr,
+ .removexattr = reiserfs_removexattr,
+ .permission = reiserfs_permission,
++ .sync_flags = reiserfs_sync_flags,
+ };
+
+ /*
+@@ -1558,6 +1562,7 @@ struct inode_operations reiserfs_symlink
+ .listxattr = reiserfs_listxattr,
+ .removexattr = reiserfs_removexattr,
+ .permission = reiserfs_permission,
++ .sync_flags = reiserfs_sync_flags,
+
+ };
+
+@@ -1571,5 +1576,6 @@ struct inode_operations reiserfs_special
+ .listxattr = reiserfs_listxattr,
+ .removexattr = reiserfs_removexattr,
+ .permission = reiserfs_permission,
++ .sync_flags = reiserfs_sync_flags,
+
+ };
+--- linux-2.6.20/fs/reiserfs/stree.c 2007-02-06 03:01:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/reiserfs/stree.c 2007-02-06 03:05:22 +0100
+@@ -56,6 +56,7 @@
+ #include <linux/smp_lock.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;
+ }
+@@ -1738,6 +1741,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;
+ }
+@@ -1979,6 +1983,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
+@@ -2031,6 +2040,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;
+ }
+@@ -2068,6 +2078,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));
+@@ -2115,7 +2130,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;
+ }
+--- linux-2.6.20/fs/reiserfs/super.c 2007-02-06 03:01:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/reiserfs/super.c 2007-02-06 03:05:22 +0100
+@@ -885,6 +885,14 @@ static int reiserfs_parse_options(struct
+ {"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
+ {"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
+ #endif
++#ifndef CONFIG_TAGGING_NONE
++ {"tagxid",.setmask = 1 << REISERFS_TAGGED},
++ {"tag",.setmask = 1 << REISERFS_TAGGED},
++ {"notag",.clrmask = 1 << REISERFS_TAGGED},
++#endif
++#ifdef CONFIG_PROPAGATE
++ {"tag",.arg_required = 'T',.values = NULL},
++#endif
+ #ifdef CONFIG_REISERFS_FS_POSIX_ACL
+ {"acl",.setmask = 1 << REISERFS_POSIXACL},
+ {"noacl",.clrmask = 1 << REISERFS_POSIXACL},
+@@ -1146,6 +1154,12 @@ static int reiserfs_remount(struct super
+ return -EINVAL;
+ }
+
++ if ((mount_options & (1 << REISERFS_TAGGED)) &&
++ !(s->s_flags & MS_TAGGED)) {
++ reiserfs_warning(s, "reiserfs: tagging not permitted on remount.");
++ return -EINVAL;
++ }
++
+ handle_attrs(s);
+
+ /* Add options that are safe here */
+@@ -1593,6 +1607,10 @@ static int reiserfs_fill_super(struct su
+ goto error;
+ }
+
++ /* map mount option tagxid */
++ if (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_TAGGED))
++ s->s_flags |= MS_TAGGED;
++
+ 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,
+--- linux-2.6.20/fs/reiserfs/xattr.c 2007-02-06 03:01:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/reiserfs/xattr.c 2007-02-06 03:05:22 +0100
+@@ -35,6 +35,7 @@
+ #include <linux/namei.h>
+ #include <linux/errno.h>
+ #include <linux/fs.h>
++#include <linux/mount.h>
+ #include <linux/file.h>
+ #include <linux/pagemap.h>
+ #include <linux/xattr.h>
+@@ -823,7 +824,7 @@ int reiserfs_delete_xattrs(struct inode
+ if (dir->d_inode->i_nlink <= 2) {
+ root = get_xa_root(inode->i_sb);
+ reiserfs_write_lock_xattrs(inode->i_sb);
+- err = vfs_rmdir(root->d_inode, dir);
++ err = vfs_rmdir(root->d_inode, dir, NULL);
+ reiserfs_write_unlock_xattrs(inode->i_sb);
+ dput(root);
+ } else {
+--- linux-2.6.20/fs/stat.c 2007-02-06 03:01:30 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/stat.c 2007-02-06 03:05:22 +0100
+@@ -27,6 +27,7 @@ void generic_fillattr(struct inode *inod
+ stat->nlink = inode->i_nlink;
+ stat->uid = inode->i_uid;
+ stat->gid = inode->i_gid;
++ stat->tag = inode->i_tag;
+ stat->rdev = inode->i_rdev;
+ stat->atime = inode->i_atime;
+ stat->mtime = inode->i_mtime;
+--- linux-2.6.20/fs/super.c 2007-02-06 03:01:30 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/super.c 2007-02-06 03:05:22 +0100
+@@ -37,6 +37,9 @@
+ #include <linux/idr.h>
+ #include <linux/kobject.h>
+ #include <linux/mutex.h>
++#include <linux/devpts_fs.h>
++#include <linux/proc_fs.h>
++#include <linux/vs_context.h>
+ #include <asm/uaccess.h>
+
+
+@@ -871,6 +874,7 @@ struct vfsmount *
+ vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void *data)
+ {
+ struct vfsmount *mnt;
++ struct super_block *sb;
+ char *secdata = NULL;
+ int error;
+
+@@ -896,7 +900,14 @@ vfs_kern_mount(struct file_system_type *
+ if (error < 0)
+ goto out_free_secdata;
+
+- error = security_sb_kern_mount(mnt->mnt_sb, secdata);
++ sb = mnt->mnt_sb;
++ error = -EPERM;
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT) && !sb->s_bdev &&
++ (sb->s_magic != PROC_SUPER_MAGIC) &&
++ (sb->s_magic != DEVPTS_SUPER_MAGIC))
++ goto out_sb;
++
++ error = security_sb_kern_mount(sb, secdata);
+ if (error)
+ goto out_sb;
+
+@@ -924,9 +935,17 @@ do_kern_mount(const char *fstype, int fl
+ {
+ struct file_system_type *type = get_fs_type(fstype);
+ struct vfsmount *mnt;
++
+ if (!type)
+ return ERR_PTR(-ENODEV);
++
++ mnt = ERR_PTR(-EPERM);
++ if ((type->fs_flags & FS_BINARY_MOUNTDATA) &&
++ !vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT))
++ goto out_put;
++
+ mnt = vfs_kern_mount(type, flags, name, data);
++out_put:
+ put_filesystem(type);
+ return mnt;
+ }
+--- linux-2.6.20/fs/sysfs/mount.c 2007-02-06 03:01:30 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/sysfs/mount.c 2007-02-06 03:05:22 +0100
+@@ -11,8 +11,6 @@
+
+ #include "sysfs.h"
+
+-/* Random magic number */
+-#define SYSFS_MAGIC 0x62656572
+
+ struct vfsmount *sysfs_mount;
+ struct super_block * sysfs_sb = NULL;
+@@ -38,7 +36,7 @@ static int sysfs_fill_super(struct super
+
+ sb->s_blocksize = PAGE_CACHE_SIZE;
+ sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
+- sb->s_magic = SYSFS_MAGIC;
++ sb->s_magic = SYSFS_SUPER_MAGIC;
+ sb->s_op = &sysfs_ops;
+ sb->s_time_gran = 1;
+ sysfs_sb = sb;
+--- linux-2.6.20/fs/utimes.c 2007-02-06 03:01:31 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/utimes.c 2007-02-06 03:05:22 +0100
+@@ -4,6 +4,8 @@
+ #include <linux/namei.h>
+ #include <linux/sched.h>
+ #include <linux/utime.h>
++#include <linux/mount.h>
++#include <linux/vs_cowbl.h>
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+
+@@ -33,7 +35,7 @@ asmlinkage long sys_utime(char __user *
+ inode = nd.dentry->d_inode;
+
+ error = -EROFS;
+- if (IS_RDONLY(inode))
++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt))
+ goto dput_and_out;
+
+ /* Don't worry, the checks are done in inode_change_ok() */
+@@ -84,14 +86,13 @@ long do_utimes(int dfd, char __user *fil
+ struct iattr newattrs;
+
+ error = __user_walk_fd(dfd, filename, LOOKUP_FOLLOW, &nd);
+-
+ if (error)
+ goto out;
+- inode = nd.dentry->d_inode;
+
+- error = -EROFS;
+- if (IS_RDONLY(inode))
++ error = cow_check_and_break(&nd);
++ if (error)
+ goto dput_and_out;
++ inode = nd.dentry->d_inode;
+
+ /* Don't worry, the checks are done in inode_change_ok() */
+ newattrs.ia_valid = ATTR_CTIME | ATTR_MTIME | ATTR_ATIME;
+--- linux-2.6.20/fs/xattr.c 2007-02-06 03:01:31 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/xattr.c 2007-02-06 03:05:22 +0100
+@@ -18,6 +18,7 @@
+ #include <linux/module.h>
+ #include <linux/fsnotify.h>
+ #include <linux/audit.h>
++#include <linux/mount.h>
+ #include <asm/uaccess.h>
+
+
+@@ -195,7 +196,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
+ */
+ static long
+ setxattr(struct dentry *d, char __user *name, void __user *value,
+- size_t size, int flags)
++ size_t size, int flags, struct vfsmount *mnt)
+ {
+ int error;
+ void *kvalue = NULL;
+@@ -222,6 +223,9 @@ setxattr(struct dentry *d, char __user *
+ }
+ }
+
++ if (MNT_IS_RDONLY(mnt))
++ return -EROFS;
++
+ error = vfs_setxattr(d, kname, kvalue, size, flags);
+ kfree(kvalue);
+ return error;
+@@ -237,7 +241,7 @@ sys_setxattr(char __user *path, char __u
+ error = user_path_walk(path, &nd);
+ if (error)
+ return error;
+- error = setxattr(nd.dentry, name, value, size, flags);
++ error = setxattr(nd.dentry, name, value, size, flags, nd.mnt);
+ path_release(&nd);
+ return error;
+ }
+@@ -252,7 +256,7 @@ sys_lsetxattr(char __user *path, char __
+ error = user_path_walk_link(path, &nd);
+ if (error)
+ return error;
+- error = setxattr(nd.dentry, name, value, size, flags);
++ error = setxattr(nd.dentry, name, value, size, flags, nd.mnt);
+ path_release(&nd);
+ return error;
+ }
+@@ -270,7 +274,7 @@ sys_fsetxattr(int fd, char __user *name,
+ return error;
+ dentry = f->f_path.dentry;
+ audit_inode(NULL, dentry->d_inode);
+- error = setxattr(dentry, name, value, size, flags);
++ error = setxattr(dentry, name, value, size, flags, f->f_vfsmnt);
+ fput(f);
+ return error;
+ }
+@@ -432,7 +436,7 @@ sys_flistxattr(int fd, char __user *list
+ * Extended attribute REMOVE operations
+ */
+ static long
+-removexattr(struct dentry *d, char __user *name)
++removexattr(struct dentry *d, char __user *name, struct vfsmount *mnt)
+ {
+ int error;
+ char kname[XATTR_NAME_MAX + 1];
+@@ -443,6 +447,9 @@ removexattr(struct dentry *d, char __use
+ if (error < 0)
+ return error;
+
++ if (MNT_IS_RDONLY(mnt))
++ return -EROFS;
++
+ return vfs_removexattr(d, kname);
+ }
+
+@@ -455,7 +462,7 @@ sys_removexattr(char __user *path, char
+ error = user_path_walk(path, &nd);
+ if (error)
+ return error;
+- error = removexattr(nd.dentry, name);
++ error = removexattr(nd.dentry, name, nd.mnt);
+ path_release(&nd);
+ return error;
+ }
+@@ -469,7 +476,7 @@ sys_lremovexattr(char __user *path, char
+ error = user_path_walk_link(path, &nd);
+ if (error)
+ return error;
+- error = removexattr(nd.dentry, name);
++ error = removexattr(nd.dentry, name, nd.mnt);
+ path_release(&nd);
+ return error;
+ }
+@@ -486,7 +493,7 @@ sys_fremovexattr(int fd, char __user *na
+ return error;
+ dentry = f->f_path.dentry;
+ audit_inode(NULL, dentry->d_inode);
+- error = removexattr(dentry, name);
++ error = removexattr(dentry, name, f->f_vfsmnt);
+ fput(f);
+ return error;
+ }
+--- linux-2.6.20/fs/xfs/linux-2.6/xfs_file.c 2007-02-06 03:01:31 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/xfs/linux-2.6/xfs_file.c 2007-02-06 03:05:22 +0100
+@@ -453,6 +453,7 @@ const struct file_operations xfs_file_op
+ .aio_read = xfs_file_aio_read,
+ .aio_write = xfs_file_aio_write,
+ .sendfile = xfs_file_sendfile,
++ .sendpage = generic_file_sendpage,
+ .splice_read = xfs_file_splice_read,
+ .splice_write = xfs_file_splice_write,
+ .unlocked_ioctl = xfs_file_ioctl,
+@@ -476,6 +477,7 @@ const struct file_operations xfs_invis_f
+ .aio_read = xfs_file_aio_read_invis,
+ .aio_write = xfs_file_aio_write_invis,
+ .sendfile = xfs_file_sendfile_invis,
++ .sendpage = generic_file_sendpage,
+ .splice_read = xfs_file_splice_read_invis,
+ .splice_write = xfs_file_splice_write_invis,
+ .unlocked_ioctl = xfs_file_ioctl_invis,
+--- linux-2.6.20/fs/xfs/linux-2.6/xfs_ioctl.c 2007-02-06 03:01:31 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/xfs/linux-2.6/xfs_ioctl.c 2007-02-06 03:05:22 +0100
+@@ -1100,6 +1100,8 @@ xfs_ioc_fsgeometry(
+ #define LINUX_XFLAG_APPEND 0x00000020 /* writes to file may only append */
+ #define LINUX_XFLAG_NODUMP 0x00000040 /* do not dump file */
+ #define LINUX_XFLAG_NOATIME 0x00000080 /* do not update atime */
++#define LINUX_XFLAG_BARRIER 0x04000000 /* chroot() barrier */
++#define LINUX_XFLAG_IUNLINK 0x08000000 /* immutable unlink */
+
+ STATIC unsigned int
+ xfs_merge_ioc_xflags(
+@@ -1140,6 +1142,10 @@ xfs_di2lxflags(
+
+ if (di_flags & XFS_DIFLAG_IMMUTABLE)
+ flags |= LINUX_XFLAG_IMMUTABLE;
++ if (di_flags & XFS_DIFLAG_IUNLINK)
++ flags |= LINUX_XFLAG_IUNLINK;
++ if (di_flags & XFS_DIFLAG_BARRIER)
++ flags |= LINUX_XFLAG_BARRIER;
+ if (di_flags & XFS_DIFLAG_APPEND)
+ flags |= LINUX_XFLAG_APPEND;
+ if (di_flags & XFS_DIFLAG_SYNC)
+--- linux-2.6.20/fs/xfs/linux-2.6/xfs_iops.c 2006-11-30 21:19:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/xfs/linux-2.6/xfs_iops.c 2007-02-06 03:05:22 +0100
+@@ -53,6 +53,7 @@
+ #include <linux/xattr.h>
+ #include <linux/namei.h>
+ #include <linux/security.h>
++#include <linux/vs_tag.h>
+
+ /*
+ * Get a XFS inode from a given vnode.
+@@ -402,6 +403,7 @@ xfs_vn_lookup(
+ d_add(dentry, NULL);
+ return NULL;
+ }
++ dx_propagate_tag(nd, vn_to_inode(cvp));
+
+ return d_splice_alias(vn_to_inode(cvp), dentry);
+ }
+@@ -659,6 +661,10 @@ xfs_vn_setattr(
+ int flags = 0;
+ int error;
+
++ error = inode_change_ok(inode, attr);
++ if (error)
++ return error;
++
+ if (ia_valid & ATTR_UID) {
+ vattr.va_mask |= XFS_AT_UID;
+ vattr.va_uid = attr->ia_uid;
+@@ -667,6 +673,10 @@ xfs_vn_setattr(
+ vattr.va_mask |= XFS_AT_GID;
+ vattr.va_gid = attr->ia_gid;
+ }
++ if ((ia_valid & ATTR_TAG) && IS_TAGGED(inode)) {
++ vattr.va_mask |= XFS_AT_TAG;
++ vattr.va_tag = attr->ia_tag;
++ }
+ if (ia_valid & ATTR_SIZE) {
+ vattr.va_mask |= XFS_AT_SIZE;
+ vattr.va_size = attr->ia_size;
+@@ -712,6 +722,42 @@ xfs_vn_truncate(
+ }
+
+ STATIC int
++xfs_vn_sync_flags(struct inode *inode)
++{
++ unsigned int oldflags, newflags;
++ int flags = 0;
++ int error;
++ bhv_vattr_t vattr;
++ bhv_vnode_t *vp = vn_from_inode(inode);
++
++ memset(&vattr, 0, sizeof vattr);
++
++ vattr.va_mask = XFS_AT_XFLAGS;
++ error = bhv_vop_getattr(vp, &vattr, 0, NULL);
++
++ if (error)
++ return error;
++ oldflags = vattr.va_xflags;
++ newflags = oldflags & ~(XFS_XFLAG_IMMUTABLE |
++ XFS_XFLAG_IUNLINK | XFS_XFLAG_BARRIER);
++
++ if (IS_IMMUTABLE(inode))
++ newflags |= XFS_XFLAG_IMMUTABLE;
++ if (IS_IUNLINK(inode))
++ newflags |= XFS_XFLAG_IUNLINK;
++ if (IS_BARRIER(inode))
++ newflags |= XFS_XFLAG_BARRIER;
++
++ if (oldflags ^ newflags) {
++ vattr.va_xflags = newflags;
++ vattr.va_mask |= XFS_AT_XFLAGS;
++ error = bhv_vop_setattr(vp, &vattr, flags, NULL);
++ }
++ vn_revalidate(vp);
++ return error;
++}
++
++STATIC int
+ xfs_vn_setxattr(
+ struct dentry *dentry,
+ const char *name,
+@@ -824,6 +870,7 @@ struct inode_operations xfs_inode_operat
+ .getxattr = xfs_vn_getxattr,
+ .listxattr = xfs_vn_listxattr,
+ .removexattr = xfs_vn_removexattr,
++ .sync_flags = xfs_vn_sync_flags,
+ };
+
+ struct inode_operations xfs_dir_inode_operations = {
+@@ -843,6 +890,7 @@ struct inode_operations xfs_dir_inode_op
+ .getxattr = xfs_vn_getxattr,
+ .listxattr = xfs_vn_listxattr,
+ .removexattr = xfs_vn_removexattr,
++ .sync_flags = xfs_vn_sync_flags,
+ };
+
+ struct inode_operations xfs_symlink_inode_operations = {
+@@ -856,4 +904,5 @@ struct inode_operations xfs_symlink_inod
+ .getxattr = xfs_vn_getxattr,
+ .listxattr = xfs_vn_listxattr,
+ .removexattr = xfs_vn_removexattr,
++ .sync_flags = xfs_vn_sync_flags,
+ };
+--- linux-2.6.20/fs/xfs/linux-2.6/xfs_linux.h 2006-11-30 21:19:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/xfs/linux-2.6/xfs_linux.h 2007-02-06 03:05:22 +0100
+@@ -139,6 +139,7 @@ BUFFER_FNS(PrivateStart, unwritten);
+ #define current_pid() (current->pid)
+ #define current_fsuid(cred) (current->fsuid)
+ #define current_fsgid(cred) (current->fsgid)
++#define current_fstag(cred,vp) (dx_current_fstag(vn_to_inode(vp)->i_sb))
+ #define current_test_flags(f) (current->flags & (f))
+ #define current_set_flags_nested(sp, f) \
+ (*(sp) = current->flags, current->flags |= (f))
+--- linux-2.6.20/fs/xfs/linux-2.6/xfs_super.c 2007-02-06 03:01:31 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/xfs/linux-2.6/xfs_super.c 2007-02-06 03:05:22 +0100
+@@ -159,6 +159,7 @@ xfs_revalidate_inode(
+ inode->i_nlink = ip->i_d.di_nlink;
+ inode->i_uid = ip->i_d.di_uid;
+ inode->i_gid = ip->i_d.di_gid;
++ inode->i_tag = ip->i_d.di_tag;
+
+ switch (inode->i_mode & S_IFMT) {
+ case S_IFBLK:
+@@ -186,6 +187,14 @@ xfs_revalidate_inode(
+ inode->i_flags |= S_IMMUTABLE;
+ else
+ inode->i_flags &= ~S_IMMUTABLE;
++ if (ip->i_d.di_flags & XFS_DIFLAG_IUNLINK)
++ inode->i_flags |= S_IUNLINK;
++ else
++ inode->i_flags &= ~S_IUNLINK;
++ if (ip->i_d.di_flags & XFS_DIFLAG_BARRIER)
++ inode->i_flags |= S_BARRIER;
++ else
++ inode->i_flags &= ~S_BARRIER;
+ if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
+ inode->i_flags |= S_APPEND;
+ else
+@@ -709,6 +718,12 @@ xfs_fs_remount(
+ int error;
+
+ error = bhv_vfs_parseargs(vfsp, options, args, 1);
++ if ((args->flags2 & XFSMNT2_TAGGED) &&
++ !(sb->s_flags & MS_TAGGED)) {
++ printk("XFS: %s: tagging not permitted on remount.\n",
++ sb->s_id);
++ error = EINVAL;
++ }
+ if (!error)
+ error = bhv_vfs_mntupdate(vfsp, flags, args);
+ kmem_free(args, sizeof(*args));
+--- linux-2.6.20/fs/xfs/linux-2.6/xfs_sysctl.c 2006-09-20 16:58:39 +0200
++++ linux-2.6.20-vs2.2.0-pre1/fs/xfs/linux-2.6/xfs_sysctl.c 2007-02-06 03:05:22 +0100
+@@ -57,79 +57,79 @@ xfs_stats_clear_proc_handler(
+ STATIC ctl_table xfs_table[] = {
+ {XFS_RESTRICT_CHOWN, "restrict_chown", &xfs_params.restrict_chown.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.restrict_chown.min, &xfs_params.restrict_chown.max},
+
+ {XFS_SGID_INHERIT, "irix_sgid_inherit", &xfs_params.sgid_inherit.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.sgid_inherit.min, &xfs_params.sgid_inherit.max},
+
+ {XFS_SYMLINK_MODE, "irix_symlink_mode", &xfs_params.symlink_mode.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.symlink_mode.min, &xfs_params.symlink_mode.max},
+
+ {XFS_PANIC_MASK, "panic_mask", &xfs_params.panic_mask.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.panic_mask.min, &xfs_params.panic_mask.max},
+
+ {XFS_ERRLEVEL, "error_level", &xfs_params.error_level.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.error_level.min, &xfs_params.error_level.max},
+
+ {XFS_SYNCD_TIMER, "xfssyncd_centisecs", &xfs_params.syncd_timer.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.syncd_timer.min, &xfs_params.syncd_timer.max},
+
+ {XFS_INHERIT_SYNC, "inherit_sync", &xfs_params.inherit_sync.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.inherit_sync.min, &xfs_params.inherit_sync.max},
+
+ {XFS_INHERIT_NODUMP, "inherit_nodump", &xfs_params.inherit_nodump.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.inherit_nodump.min, &xfs_params.inherit_nodump.max},
+
+ {XFS_INHERIT_NOATIME, "inherit_noatime", &xfs_params.inherit_noatim.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.inherit_noatim.min, &xfs_params.inherit_noatim.max},
+
+ {XFS_BUF_TIMER, "xfsbufd_centisecs", &xfs_params.xfs_buf_timer.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.xfs_buf_timer.min, &xfs_params.xfs_buf_timer.max},
+
+ {XFS_BUF_AGE, "age_buffer_centisecs", &xfs_params.xfs_buf_age.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.xfs_buf_age.min, &xfs_params.xfs_buf_age.max},
+
+ {XFS_INHERIT_NOSYM, "inherit_nosymlinks", &xfs_params.inherit_nosym.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.inherit_nosym.min, &xfs_params.inherit_nosym.max},
+
+ {XFS_ROTORSTEP, "rotorstep", &xfs_params.rotorstep.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.rotorstep.min, &xfs_params.rotorstep.max},
+
+ {XFS_INHERIT_NODFRG, "inherit_nodefrag", &xfs_params.inherit_nodfrg.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.inherit_nodfrg.min, &xfs_params.inherit_nodfrg.max},
+
+ /* please keep this the last entry */
+ #ifdef CONFIG_PROC_FS
+ {XFS_STATS_CLEAR, "stats_clear", &xfs_params.stats_clear.val,
+ sizeof(int), 0644, NULL, &xfs_stats_clear_proc_handler,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.stats_clear.min, &xfs_params.stats_clear.max},
+ #endif /* CONFIG_PROC_FS */
+
+--- linux-2.6.20/fs/xfs/linux-2.6/xfs_vnode.c 2006-11-30 21:19:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/xfs/linux-2.6/xfs_vnode.c 2007-02-06 03:05:22 +0100
+@@ -119,6 +119,7 @@ vn_revalidate_core(
+ inode->i_nlink = vap->va_nlink;
+ inode->i_uid = vap->va_uid;
+ inode->i_gid = vap->va_gid;
++ inode->i_tag = vap->va_tag;
+ inode->i_blocks = vap->va_nblocks;
+ inode->i_mtime = vap->va_mtime;
+ inode->i_ctime = vap->va_ctime;
+@@ -126,6 +127,14 @@ vn_revalidate_core(
+ inode->i_flags |= S_IMMUTABLE;
+ else
+ inode->i_flags &= ~S_IMMUTABLE;
++ if (vap->va_xflags & XFS_XFLAG_IUNLINK)
++ inode->i_flags |= S_IUNLINK;
++ else
++ inode->i_flags &= ~S_IUNLINK;
++ if (vap->va_xflags & XFS_XFLAG_BARRIER)
++ inode->i_flags |= S_BARRIER;
++ else
++ inode->i_flags &= ~S_BARRIER;
+ if (vap->va_xflags & XFS_XFLAG_APPEND)
+ inode->i_flags |= S_APPEND;
+ else
+--- linux-2.6.20/fs/xfs/linux-2.6/xfs_vnode.h 2006-11-30 21:19:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/xfs/linux-2.6/xfs_vnode.h 2007-02-06 03:05:22 +0100
+@@ -350,6 +350,7 @@ typedef struct bhv_vattr {
+ xfs_nlink_t va_nlink; /* number of references to file */
+ uid_t va_uid; /* owner user id */
+ gid_t va_gid; /* owner group id */
++ tag_t va_tag; /* owner group id */
+ xfs_ino_t va_nodeid; /* file id */
+ xfs_off_t va_size; /* file size in bytes */
+ u_long va_blocksize; /* blocksize preferred for i/o */
+@@ -398,13 +399,15 @@ typedef struct bhv_vattr {
+ #define XFS_AT_PROJID 0x04000000
+ #define XFS_AT_SIZE_NOPERM 0x08000000
+ #define XFS_AT_GENCOUNT 0x10000000
++#define XFS_AT_TAG 0x20000000
+
+ #define XFS_AT_ALL (XFS_AT_TYPE|XFS_AT_MODE|XFS_AT_UID|XFS_AT_GID|\
+ XFS_AT_FSID|XFS_AT_NODEID|XFS_AT_NLINK|XFS_AT_SIZE|\
+ XFS_AT_ATIME|XFS_AT_MTIME|XFS_AT_CTIME|XFS_AT_RDEV|\
+ XFS_AT_BLKSIZE|XFS_AT_NBLOCKS|XFS_AT_VCODE|XFS_AT_MAC|\
+ XFS_AT_ACL|XFS_AT_CAP|XFS_AT_INF|XFS_AT_XFLAGS|XFS_AT_EXTSIZE|\
+- XFS_AT_NEXTENTS|XFS_AT_ANEXTENTS|XFS_AT_PROJID|XFS_AT_GENCOUNT)
++ XFS_AT_NEXTENTS|XFS_AT_ANEXTENTS|XFS_AT_PROJID|XFS_AT_GENCOUNT\
++ XFS_AT_TAG)
+
+ #define XFS_AT_STAT (XFS_AT_TYPE|XFS_AT_MODE|XFS_AT_UID|XFS_AT_GID|\
+ XFS_AT_FSID|XFS_AT_NODEID|XFS_AT_NLINK|XFS_AT_SIZE|\
+--- linux-2.6.20/fs/xfs/quota/xfs_qm_syscalls.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.20-vs2.2.0-pre1/fs/xfs/quota/xfs_qm_syscalls.c 2007-02-06 03:05:22 +0100
+@@ -17,6 +17,7 @@
+ */
+
+ #include <linux/capability.h>
++#include <linux/vs_context.h>
+
+ #include "xfs.h"
+ #include "xfs_fs.h"
+@@ -213,7 +214,7 @@ xfs_qm_scall_quotaoff(
+ xfs_qoff_logitem_t *qoffstart;
+ int nculprits;
+
+- if (!force && !capable(CAP_SYS_ADMIN))
++ if (!force && !vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
+ return XFS_ERROR(EPERM);
+ /*
+ * No file system can have quotas enabled on disk but not in core.
+@@ -382,7 +383,7 @@ xfs_qm_scall_trunc_qfiles(
+ int error;
+ xfs_inode_t *qip;
+
+- if (!capable(CAP_SYS_ADMIN))
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
+ return XFS_ERROR(EPERM);
+ error = 0;
+ if (!XFS_SB_VERSION_HASQUOTA(&mp->m_sb) || flags == 0) {
+@@ -427,7 +428,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);
+@@ -598,7 +599,7 @@ xfs_qm_scall_setqlim(
+ int error;
+ xfs_qcnt_t hard, soft;
+
+- if (!capable(CAP_SYS_ADMIN))
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
+ return XFS_ERROR(EPERM);
+
+ if ((newlim->d_fieldmask &
+--- linux-2.6.20/fs/xfs/xfs_clnt.h 2006-06-18 04:54:50 +0200
++++ linux-2.6.20-vs2.2.0-pre1/fs/xfs/xfs_clnt.h 2007-02-06 03:05:22 +0100
+@@ -99,5 +99,7 @@ struct xfs_mount_args {
+ */
+ #define XFSMNT2_COMPAT_IOSIZE 0x00000001 /* don't report large preferred
+ * I/O size in stat(2) */
++#define XFSMNT2_TAGGED 0x80000000 /* context tagging */
++
+
+ #endif /* __XFS_CLNT_H__ */
+--- linux-2.6.20/fs/xfs/xfs_dinode.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.20-vs2.2.0-pre1/fs/xfs/xfs_dinode.h 2007-02-06 03:05:22 +0100
+@@ -53,7 +53,8 @@ typedef struct xfs_dinode_core
+ __uint32_t di_gid; /* owner's group id */
+ __uint32_t di_nlink; /* number of links to file */
+ __uint16_t di_projid; /* owner's project id */
+- __uint8_t di_pad[8]; /* unused, zeroed space */
++ __uint16_t di_tag; /* context tagging */
++ __uint8_t di_pad[6]; /* unused, zeroed space */
+ __uint16_t di_flushiter; /* incremented on flush */
+ xfs_timestamp_t di_atime; /* time last accessed */
+ xfs_timestamp_t di_mtime; /* time last modified */
+@@ -257,6 +258,9 @@ typedef enum xfs_dinode_fmt
+ #define XFS_DIFLAG_EXTSIZE_BIT 11 /* inode extent size allocator hint */
+ #define XFS_DIFLAG_EXTSZINHERIT_BIT 12 /* inherit inode extent size */
+ #define XFS_DIFLAG_NODEFRAG_BIT 13 /* do not reorganize/defragment */
++#define XFS_DIFLAG_BARRIER_BIT 14 /* chroot() barrier */
++#define XFS_DIFLAG_IUNLINK_BIT 15 /* immutable unlink */
++
+ #define XFS_DIFLAG_REALTIME (1 << XFS_DIFLAG_REALTIME_BIT)
+ #define XFS_DIFLAG_PREALLOC (1 << XFS_DIFLAG_PREALLOC_BIT)
+ #define XFS_DIFLAG_NEWRTBM (1 << XFS_DIFLAG_NEWRTBM_BIT)
+@@ -271,12 +275,15 @@ typedef enum xfs_dinode_fmt
+ #define XFS_DIFLAG_EXTSIZE (1 << XFS_DIFLAG_EXTSIZE_BIT)
+ #define XFS_DIFLAG_EXTSZINHERIT (1 << XFS_DIFLAG_EXTSZINHERIT_BIT)
+ #define XFS_DIFLAG_NODEFRAG (1 << XFS_DIFLAG_NODEFRAG_BIT)
++#define XFS_DIFLAG_BARRIER (1 << XFS_DIFLAG_BARRIER_BIT)
++#define XFS_DIFLAG_IUNLINK (1 << XFS_DIFLAG_IUNLINK_BIT)
+
+ #define XFS_DIFLAG_ANY \
+ (XFS_DIFLAG_REALTIME | XFS_DIFLAG_PREALLOC | XFS_DIFLAG_NEWRTBM | \
+ XFS_DIFLAG_IMMUTABLE | XFS_DIFLAG_APPEND | XFS_DIFLAG_SYNC | \
+ XFS_DIFLAG_NOATIME | XFS_DIFLAG_NODUMP | XFS_DIFLAG_RTINHERIT | \
+ XFS_DIFLAG_PROJINHERIT | XFS_DIFLAG_NOSYMLINKS | XFS_DIFLAG_EXTSIZE | \
+- XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG)
++ XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_BARRIER | \
++ XFS_DIFLAG_IUNLINK)
+
+ #endif /* __XFS_DINODE_H__ */
+--- linux-2.6.20/fs/xfs/xfs_fs.h 2006-11-30 21:19:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/xfs/xfs_fs.h 2007-02-06 03:05:22 +0100
+@@ -66,6 +66,8 @@ struct fsxattr {
+ #define XFS_XFLAG_EXTSIZE 0x00000800 /* extent size allocator hint */
+ #define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
+ #define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
++#define XFS_XFLAG_BARRIER 0x00004000 /* chroot() barrier */
++#define XFS_XFLAG_IUNLINK 0x00008000 /* immutable unlink */
+ #define XFS_XFLAG_HASATTR 0x80000000 /* no DIFLAG for this */
+
+ /*
+@@ -294,7 +296,8 @@ typedef struct xfs_bstat {
+ __s32 bs_extents; /* number of extents */
+ __u32 bs_gen; /* generation count */
+ __u16 bs_projid; /* project id */
+- unsigned char bs_pad[14]; /* pad space, unused */
++ __u16 bs_tag; /* context tagging */
++ unsigned char bs_pad[12]; /* pad space, unused */
+ __u32 bs_dmevmask; /* DMIG event mask */
+ __u16 bs_dmstate; /* DMIG state info */
+ __u16 bs_aextents; /* attribute number of extents */
+--- linux-2.6.20/fs/xfs/xfs_inode.c 2006-11-30 21:19:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/xfs/xfs_inode.c 2007-02-06 03:05:22 +0100
+@@ -50,6 +50,7 @@
+ #include "xfs_mac.h"
+ #include "xfs_acl.h"
+
++#include <linux/vs_tag.h>
+
+ kmem_zone_t *xfs_ifork_zone;
+ kmem_zone_t *xfs_inode_zone;
+@@ -736,20 +737,35 @@ xfs_xlate_dinode_core(
+ xfs_dinode_core_t *buf_core = (xfs_dinode_core_t *)buf;
+ xfs_dinode_core_t *mem_core = (xfs_dinode_core_t *)dip;
+ xfs_arch_t arch = ARCH_CONVERT;
++ uint32_t uid = 0, gid = 0;
++ uint16_t tag = 0;
+
+ ASSERT(dir);
+
++ if (dir < 0) {
++ tag = mem_core->di_tag;
++ /* FIXME: supposed to use superblock flag */
++ uid = TAGINO_UID(1, mem_core->di_uid, tag);
++ gid = TAGINO_GID(1, mem_core->di_gid, tag);
++ tag = TAGINO_TAG(1, tag);
++ }
++
+ INT_XLATE(buf_core->di_magic, mem_core->di_magic, dir, arch);
+ INT_XLATE(buf_core->di_mode, mem_core->di_mode, dir, arch);
+ INT_XLATE(buf_core->di_version, mem_core->di_version, dir, arch);
+ INT_XLATE(buf_core->di_format, mem_core->di_format, dir, arch);
+ INT_XLATE(buf_core->di_onlink, mem_core->di_onlink, dir, arch);
+- INT_XLATE(buf_core->di_uid, mem_core->di_uid, dir, arch);
+- INT_XLATE(buf_core->di_gid, mem_core->di_gid, dir, arch);
++ INT_XLATE(buf_core->di_uid, uid, dir, arch);
++ INT_XLATE(buf_core->di_gid, gid, dir, arch);
++ INT_XLATE(buf_core->di_tag, tag, dir, arch);
+ INT_XLATE(buf_core->di_nlink, mem_core->di_nlink, dir, arch);
+ INT_XLATE(buf_core->di_projid, mem_core->di_projid, dir, arch);
+
+ if (dir > 0) {
++ /* FIXME: supposed to use superblock flag */
++ mem_core->di_uid = INOTAG_UID(1, uid, gid);
++ mem_core->di_gid = INOTAG_GID(1, uid, gid);
++ mem_core->di_tag = INOTAG_TAG(1, uid, gid, tag);
+ memcpy(mem_core->di_pad, buf_core->di_pad,
+ sizeof(buf_core->di_pad));
+ } else {
+@@ -797,6 +813,10 @@ _xfs_dic2xflags(
+ flags |= XFS_XFLAG_PREALLOC;
+ if (di_flags & XFS_DIFLAG_IMMUTABLE)
+ flags |= XFS_XFLAG_IMMUTABLE;
++ if (di_flags & XFS_DIFLAG_IUNLINK)
++ flags |= XFS_XFLAG_IUNLINK;
++ if (di_flags & XFS_DIFLAG_BARRIER)
++ flags |= XFS_XFLAG_BARRIER;
+ if (di_flags & XFS_DIFLAG_APPEND)
+ flags |= XFS_XFLAG_APPEND;
+ if (di_flags & XFS_DIFLAG_SYNC)
+@@ -1128,6 +1148,7 @@ xfs_ialloc(
+ ASSERT(ip->i_d.di_nlink == nlink);
+ ip->i_d.di_uid = current_fsuid(cr);
+ ip->i_d.di_gid = current_fsgid(cr);
++ ip->i_d.di_tag = current_fstag(cr, vp);
+ ip->i_d.di_projid = prid;
+ memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
+
+--- linux-2.6.20/fs/xfs/xfs_itable.c 2006-11-30 21:19:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/xfs/xfs_itable.c 2007-02-06 03:05:22 +0100
+@@ -89,6 +89,7 @@ xfs_bulkstat_one_iget(
+ 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(vp, &buf->bs_atime);
+ buf->bs_mtime.tv_sec = dic->di_mtime.t_sec;
+@@ -163,6 +164,7 @@ xfs_bulkstat_one_dinode(
+ buf->bs_mode = INT_GET(dic->di_mode, ARCH_CONVERT);
+ buf->bs_uid = INT_GET(dic->di_uid, ARCH_CONVERT);
+ buf->bs_gid = INT_GET(dic->di_gid, ARCH_CONVERT);
++ buf->bs_tag = INT_GET(dic->di_tag, ARCH_CONVERT);
+ buf->bs_size = INT_GET(dic->di_size, ARCH_CONVERT);
+ buf->bs_atime.tv_sec = INT_GET(dic->di_atime.t_sec, ARCH_CONVERT);
+ buf->bs_atime.tv_nsec = INT_GET(dic->di_atime.t_nsec, ARCH_CONVERT);
+--- linux-2.6.20/fs/xfs/xfs_mount.h 2006-11-30 21:19:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/xfs/xfs_mount.h 2007-02-06 03:05:22 +0100
+@@ -460,6 +460,7 @@ typedef struct xfs_mount {
+ #define XFS_MOUNT_NO_PERCPU_SB (1ULL << 23) /* don't use per-cpu superblock
+ counters */
+
++#define XFS_MOUNT_TAGGED (1ULL << 31) /* context tagging */
+
+ /*
+ * Default minimum read and write sizes.
+--- linux-2.6.20/fs/xfs/xfs_vfsops.c 2006-11-30 21:19:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/xfs/xfs_vfsops.c 2007-02-06 03:05:22 +0100
+@@ -300,6 +300,8 @@ xfs_start_flags(
+
+ if (ap->flags2 & XFSMNT2_COMPAT_IOSIZE)
+ mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE;
++ if (ap->flags2 & XFSMNT2_TAGGED)
++ mp->m_flags |= XFS_MOUNT_TAGGED;
+
+ /*
+ * no recovery flag requires a read-only mount
+@@ -394,6 +396,8 @@ xfs_finish_flags(
+ return XFS_ERROR(EINVAL);
+ }
+
++ if (ap->flags2 & XFSMNT2_TAGGED)
++ vfs->vfs_super->s_flags |= MS_TAGGED;
+ return 0;
+ }
+
+@@ -1645,6 +1649,9 @@ xfs_vget(
+ * in stat(). */
+ #define MNTOPT_ATTR2 "attr2" /* do use attr2 attribute format */
+ #define MNTOPT_NOATTR2 "noattr2" /* do not use attr2 attribute format */
++#define MNTOPT_TAGXID "tagxid" /* context tagging for inodes */
++#define MNTOPT_TAGGED "tag" /* context tagging for inodes */
++#define MNTOPT_NOTAGTAG "notag" /* do not use context tagging */
+
+ STATIC unsigned long
+ suffix_strtoul(char *s, char **endp, unsigned int base)
+@@ -1831,6 +1838,19 @@ xfs_parseargs(
+ args->flags |= XFSMNT_ATTR2;
+ } else if (!strcmp(this_char, MNTOPT_NOATTR2)) {
+ args->flags &= ~XFSMNT_ATTR2;
++#ifndef CONFIG_TAGGING_NONE
++ } else if (!strcmp(this_char, MNTOPT_TAGGED)) {
++ args->flags2 |= XFSMNT2_TAGGED;
++ } else if (!strcmp(this_char, MNTOPT_NOTAGTAG)) {
++ args->flags2 &= ~XFSMNT2_TAGGED;
++ } else if (!strcmp(this_char, MNTOPT_TAGXID)) {
++ args->flags2 |= XFSMNT2_TAGGED;
++#endif
++#ifdef CONFIG_PROPAGATE
++ } else if (!strcmp(this_char, MNTOPT_TAGGED)) {
++ /* use value */
++ args->flags2 |= XFSMNT2_TAGGED;
++#endif
+ } else if (!strcmp(this_char, "osyncisdsync")) {
+ /* no-op, this is now the default */
+ cmn_err(CE_WARN,
+--- linux-2.6.20/fs/xfs/xfs_vnodeops.c 2006-11-30 21:19:29 +0100
++++ linux-2.6.20-vs2.2.0-pre1/fs/xfs/xfs_vnodeops.c 2007-02-06 03:05:22 +0100
+@@ -160,6 +160,7 @@ xfs_getattr(
+ vap->va_mode = ip->i_d.di_mode;
+ vap->va_uid = ip->i_d.di_uid;
+ vap->va_gid = ip->i_d.di_gid;
++ vap->va_tag = ip->i_d.di_tag;
+ vap->va_projid = ip->i_d.di_projid;
+
+ /*
+@@ -260,6 +261,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;
+ bhv_vnode_t *vp;
+ xfs_prid_t projid=0, iprojid=0;
+@@ -316,6 +318,7 @@ xfs_setattr(
+ (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_PROJID))) {
+ uint qflags = 0;
+
++ /* FIXME: handle tagging? */
+ if ((mask & XFS_AT_UID) && XFS_IS_UQUOTA_ON(mp)) {
+ uid = vap->va_uid;
+ qflags |= XFS_QMOPT_UQUOTA;
+@@ -395,6 +398,8 @@ xfs_setattr(
+ if (mask &
+ (XFS_AT_MODE|XFS_AT_XFLAGS|XFS_AT_EXTSIZE|XFS_AT_UID|
+ XFS_AT_GID|XFS_AT_PROJID)) {
++ /* FIXME: handle tagging? */
++
+ /*
+ * CAP_FOWNER overrides the following restrictions:
+ *
+@@ -443,7 +448,7 @@ xfs_setattr(
+ * and can change the group id only to a group of which he
+ * or she is a member.
+ */
+- if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_PROJID)) {
++ if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_TAG|XFS_AT_PROJID)) {
+ /*
+ * These IDs could have changed since we last looked at them.
+ * But, we're assured that if the ownership did change
+@@ -451,10 +456,12 @@ xfs_setattr(
+ * would have changed also.
+ */
+ iuid = ip->i_d.di_uid;
+- iprojid = ip->i_d.di_projid;
+ igid = ip->i_d.di_gid;
+- gid = (mask & XFS_AT_GID) ? vap->va_gid : igid;
++ itag = ip->i_d.di_tag;
++ iprojid = ip->i_d.di_projid;
+ uid = (mask & XFS_AT_UID) ? vap->va_uid : iuid;
++ gid = (mask & XFS_AT_GID) ? vap->va_gid : igid;
++ tag = (mask & XFS_AT_TAG) ? vap->va_tag : itag;
+ projid = (mask & XFS_AT_PROJID) ? (xfs_prid_t)vap->va_projid :
+ iprojid;
+
+@@ -482,6 +489,7 @@ xfs_setattr(
+ if ((XFS_IS_UQUOTA_ON(mp) && iuid != uid) ||
+ (XFS_IS_PQUOTA_ON(mp) && iprojid != projid) ||
+ (XFS_IS_GQUOTA_ON(mp) && igid != gid)) {
++ /* FIXME: handle tagging? */
+ ASSERT(tp);
+ code = XFS_QM_DQVOPCHOWNRESV(mp, tp, ip, udqp, gdqp,
+ capable(CAP_FOWNER) ?
+@@ -707,7 +715,7 @@ xfs_setattr(
+ * and can change the group id only to a group of which he
+ * or she is a member.
+ */
+- if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_PROJID)) {
++ if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_TAG|XFS_AT_PROJID)) {
+ /*
+ * CAP_FSETID overrides the following restrictions:
+ *
+@@ -723,6 +731,9 @@ xfs_setattr(
+ * Change the ownerships and register quota modifications
+ * in the transaction.
+ */
++ if (itag != tag) {
++ ip->i_d.di_tag = tag;
++ }
+ if (iuid != uid) {
+ if (XFS_IS_UQUOTA_ON(mp)) {
+ ASSERT(mask & XFS_AT_UID);
+@@ -803,6 +814,10 @@ xfs_setattr(
+ di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC);
+ if (vap->va_xflags & XFS_XFLAG_IMMUTABLE)
+ di_flags |= XFS_DIFLAG_IMMUTABLE;
++ if (vap->va_xflags & XFS_XFLAG_IUNLINK)
++ di_flags |= XFS_DIFLAG_IUNLINK;
++ if (vap->va_xflags & XFS_XFLAG_BARRIER)
++ di_flags |= XFS_DIFLAG_BARRIER;
+ if (vap->va_xflags & XFS_XFLAG_APPEND)
+ di_flags |= XFS_DIFLAG_APPEND;
+ if (vap->va_xflags & XFS_XFLAG_SYNC)
+--- linux-2.6.20/include/asm-arm/tlb.h 2006-06-18 04:54:58 +0200
++++ linux-2.6.20-vs2.2.0-pre1/include/asm-arm/tlb.h 2007-02-06 03:05:22 +0100
+@@ -28,6 +28,7 @@
+ #else /* !CONFIG_MMU */
+
+ #include <asm/pgalloc.h>
++#include <linux/vs_memory.h>
+
+ /*
+ * TLB handling. This allows us to remove pages from the page
+--- linux-2.6.20/include/asm-arm26/tlb.h 2006-01-03 17:30:02 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/asm-arm26/tlb.h 2007-02-06 03:05:22 +0100
+@@ -3,6 +3,7 @@
+
+ #include <asm/pgalloc.h>
+ #include <asm/tlbflush.h>
++#include <linux/vs_memory.h>
+
+ /*
+ * TLB handling. This allows us to remove pages from the page
+--- linux-2.6.20/include/asm-arm26/unistd.h 2007-02-06 03:01:35 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/asm-arm26/unistd.h 2007-02-06 03:05:22 +0100
+@@ -302,6 +302,8 @@
+ #define __NR_mq_getsetattr (__NR_SYSCALL_BASE+279)
+ #define __NR_waitid (__NR_SYSCALL_BASE+280)
+
++#define __NR_vserver (__NR_SYSCALL_BASE+313)
++
+ /*
+ * The following SWIs are ARM private. FIXME - make appropriate for arm26
+ */
+--- linux-2.6.20/include/asm-generic/tlb.h 2006-11-30 21:19:31 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/asm-generic/tlb.h 2007-02-06 03:05:22 +0100
+@@ -14,6 +14,7 @@
+ #define _ASM_GENERIC__TLB_H
+
+ #include <linux/swap.h>
++#include <linux/vs_memory.h>
+ #include <asm/pgalloc.h>
+ #include <asm/tlbflush.h>
+
+--- linux-2.6.20/include/asm-i386/elf.h 2007-02-06 03:01:37 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/asm-i386/elf.h 2007-02-06 03:05:22 +0100
+@@ -75,7 +75,7 @@ typedef struct user_fxsr_struct elf_fpxr
+ the loader. We need to make sure that it is out of the way of the program
+ that it will "exec", and that there is sufficient room for the brk. */
+
+-#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
++#define ELF_ET_DYN_BASE ((TASK_UNMAPPED_BASE) * 2)
+
+ /* regs is struct pt_regs, pr_reg is elf_gregset_t (which is
+ now struct_user_regs, they are different) */
+--- linux-2.6.20/include/asm-ia64/tlb.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.20-vs2.2.0-pre1/include/asm-ia64/tlb.h 2007-02-06 03:05:22 +0100
+@@ -40,6 +40,7 @@
+ #include <linux/mm.h>
+ #include <linux/pagemap.h>
+ #include <linux/swap.h>
++#include <linux/vs_memory.h>
+
+ #include <asm/pgalloc.h>
+ #include <asm/processor.h>
+--- linux-2.6.20/include/asm-powerpc/systbl.h 2006-11-30 21:19:33 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/asm-powerpc/systbl.h 2007-02-06 03:05:22 +0100
+@@ -260,7 +260,7 @@ COMPAT_SYS_SPU(fstatfs64)
+ SYSX(sys_ni_syscall, ppc_fadvise64_64, ppc_fadvise64_64)
+ PPC_SYS_SPU(rtas)
+ OLDSYS(debug_setcontext)
+-SYSCALL(ni_syscall)
++SYSX(sys_vserver, sys32_vserver, sys_vserver)
+ COMPAT_SYS(migrate_pages)
+ COMPAT_SYS(mbind)
+ COMPAT_SYS(get_mempolicy)
+--- linux-2.6.20/include/asm-powerpc/unistd.h 2007-02-06 03:01:44 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/asm-powerpc/unistd.h 2007-02-06 03:05:22 +0100
+@@ -275,7 +275,7 @@
+ #endif
+ #define __NR_rtas 255
+ #define __NR_sys_debug_setcontext 256
+-/* Number 257 is reserved for vserver */
++#define __NR_vserver 257
+ #define __NR_migrate_pages 258
+ #define __NR_mbind 259
+ #define __NR_get_mempolicy 260
+--- linux-2.6.20/include/asm-s390/unistd.h 2007-02-06 03:01:45 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/asm-s390/unistd.h 2007-02-06 03:05:22 +0100
+@@ -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
+--- linux-2.6.20/include/asm-sparc/unistd.h 2007-02-06 03:01:49 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/asm-sparc/unistd.h 2007-02-06 03:05:22 +0100
+@@ -283,7 +283,7 @@
+ #define __NR_timer_getoverrun 264
+ #define __NR_timer_delete 265
+ #define __NR_timer_create 266
+-/* #define __NR_vserver 267 Reserved for VSERVER */
++#define __NR_vserver 267
+ #define __NR_io_setup 268
+ #define __NR_io_destroy 269
+ #define __NR_io_submit 270
+--- linux-2.6.20/include/asm-sparc64/tlb.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.20-vs2.2.0-pre1/include/asm-sparc64/tlb.h 2007-02-06 03:05:22 +0100
+@@ -2,6 +2,7 @@
+ #define _SPARC64_TLB_H
+
+ #include <linux/swap.h>
++#include <linux/vs_memory.h>
+ #include <asm/pgalloc.h>
+ #include <asm/tlbflush.h>
+ #include <asm/mmu_context.h>
+--- linux-2.6.20/include/asm-sparc64/unistd.h 2007-02-06 03:01:49 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/asm-sparc64/unistd.h 2007-02-06 03:05:22 +0100
+@@ -285,7 +285,7 @@
+ #define __NR_timer_getoverrun 264
+ #define __NR_timer_delete 265
+ #define __NR_timer_create 266
+-/* #define __NR_vserver 267 Reserved for VSERVER */
++#define __NR_vserver 267
+ #define __NR_io_setup 268
+ #define __NR_io_destroy 269
+ #define __NR_io_submit 270
+--- linux-2.6.20/include/asm-x86_64/unistd.h 2007-02-06 03:01:50 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/asm-x86_64/unistd.h 2007-02-06 03:05:22 +0100
+@@ -532,7 +532,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
+ #define __NR_utimes 235
+ __SYSCALL(__NR_utimes, sys_utimes)
+ #define __NR_vserver 236
+-__SYSCALL(__NR_vserver, sys_ni_syscall)
++__SYSCALL(__NR_vserver, sys_vserver)
+ #define __NR_mbind 237
+ __SYSCALL(__NR_mbind, sys_mbind)
+ #define __NR_set_mempolicy 238
+--- linux-2.6.20/include/linux/Kbuild 2007-02-06 03:01:50 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/Kbuild 2007-02-06 03:05:22 +0100
+@@ -339,3 +339,6 @@ unifdef-y += wireless.h
+ unifdef-y += xfrm.h
+
+ objhdr-y += version.h
++
++header-y += vserver/
++
+--- linux-2.6.20/include/linux/capability.h 2006-06-18 04:55:15 +0200
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/capability.h 2007-02-06 03:05:22 +0100
+@@ -235,6 +235,7 @@ typedef __u32 kernel_cap_t;
+ arbitrary SCSI commands */
+ /* Allow setting encryption key on loopback filesystem */
+ /* Allow setting zone reclaim policy */
++/* Allow the selection of a security context */
+
+ #define CAP_SYS_ADMIN 21
+
+@@ -288,6 +289,11 @@ typedef __u32 kernel_cap_t;
+
+ #define CAP_AUDIT_CONTROL 30
+
++/* Allow context manipulations */
++/* Allow changing context info on files */
++
++#define CAP_CONTEXT 31
++
+ #ifdef __KERNEL__
+ /*
+ * Bounding set
+--- linux-2.6.20/include/linux/devpts_fs.h 2004-08-14 12:55:59 +0200
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/devpts_fs.h 2007-02-06 03:05:22 +0100
+@@ -30,5 +30,7 @@ static inline void devpts_pty_kill(int n
+
+ #endif
+
++#define DEVPTS_SUPER_MAGIC 0x00001cd1
++
+
+ #endif /* _LINUX_DEVPTS_FS_H */
+--- linux-2.6.20/include/linux/ext2_fs.h 2006-11-30 21:19:37 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/ext2_fs.h 2007-02-06 03:05:22 +0100
+@@ -188,6 +188,8 @@ struct ext2_group_desc
+ #define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
+ #define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
+ #define EXT2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
++#define EXT2_BARRIER_FL FS_BARRIER_FL /* Barrier for chroot() */
++#define EXT2_IUNLINK_FL FS_IUNLINK_FL /* Immutable unlink */
+ #define EXT2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
+
+ #define EXT2_FL_USER_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
+@@ -244,7 +246,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 */
+ __le16 l_i_uid_high; /* these 2 fields */
+ __le16 l_i_gid_high; /* were reserved2[0] */
+ __u32 l_i_reserved2;
+@@ -276,6 +278,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_raw_tag osd2.linux2.l_i_tag
+ #define i_reserved2 osd2.linux2.l_i_reserved2
+ #endif
+
+@@ -317,8 +320,9 @@ struct ext2_inode {
+ #define EXT2_MOUNT_XATTR_USER 0x004000 /* Extended user attributes */
+ #define EXT2_MOUNT_POSIX_ACL 0x008000 /* POSIX Access Control Lists */
+ #define EXT2_MOUNT_XIP 0x010000 /* Execute in place */
+-#define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */
+-#define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */
++#define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */
++#define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */
++#define EXT2_MOUNT_TAGGED (1<<24) /* Enable Context Tags */
+
+
+ #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
+--- linux-2.6.20/include/linux/ext3_fs.h 2006-11-30 21:19:37 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/ext3_fs.h 2007-02-06 03:05:22 +0100
+@@ -177,10 +177,20 @@ struct ext3_group_desc
+ #define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
+ #define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
+ #define EXT3_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
++#define EXT3_BARRIER_FL 0x04000000 /* Barrier for chroot() */
++#define EXT3_IUNLINK_FL 0x08000000 /* Immutable unlink */
+ #define EXT3_RESERVED_FL 0x80000000 /* reserved for ext3 lib */
+
++#ifdef CONFIG_VSERVER_LEGACY
++#define EXT3_FL_USER_VISIBLE 0x0803DFFF /* User visible flags */
++#define EXT3_FL_USER_MODIFIABLE 0x080380FF /* User modifiable flags */
++#else
+ #define EXT3_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
+ #define EXT3_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
++#endif
++#ifdef CONFIG_VSERVER_LEGACY
++#define EXT3_IOC_SETTAG FIOC_SETTAGJ
++#endif
+
+ /*
+ * Inode dynamic state flags
+@@ -296,7 +306,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 */
+ __le16 l_i_uid_high; /* these 2 fields */
+ __le16 l_i_gid_high; /* were reserved2[0] */
+ __u32 l_i_reserved2;
+@@ -330,6 +340,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_raw_tag osd2.linux2.l_i_tag
+ #define i_reserved2 osd2.linux2.l_i_reserved2
+
+ #elif defined(__GNU__)
+@@ -384,6 +395,7 @@ struct ext3_inode {
+ #define EXT3_MOUNT_QUOTA 0x80000 /* Some quota option set */
+ #define EXT3_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
+ #define EXT3_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
++#define EXT3_MOUNT_TAGGED (1<<24) /* Enable Context Tags */
+
+ /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
+ #ifndef _LINUX_EXT2_FS_H
+@@ -812,6 +824,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 void ext3_read_inode (struct inode *);
+ extern int ext3_write_inode (struct inode *, int);
+--- linux-2.6.20/include/linux/ext4_fs.h 2006-11-30 21:19:37 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/ext4_fs.h 2007-02-06 03:05:22 +0100
+@@ -189,11 +189,21 @@ struct ext4_group_desc
+ #define EXT4_NOTAIL_FL 0x00008000 /* file tail should not be merged */
+ #define EXT4_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
+ #define EXT4_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
+-#define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */
+ #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
++#define EXT4_BARRIER_FL 0x04000000 /* Barrier for chroot() */
++#define EXT4_IUNLINK_FL 0x08000000 /* Immutable unlink */
++#define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */
+
++#ifdef CONFIG_VSERVER_LEGACY
++#define EXT4_FL_USER_VISIBLE 0x080BDFFF /* User visible flags */
++#define EXT4_FL_USER_MODIFIABLE 0x080380FF /* User modifiable flags */
++#else
+ #define EXT4_FL_USER_VISIBLE 0x000BDFFF /* User visible flags */
+ #define EXT4_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
++#endif
++#ifdef CONFIG_VSERVER_LEGACY
++#define EXT4_IOC_SETTAG FIOC_SETTAGJ
++#endif
+
+ /*
+ * Inode dynamic state flags
+@@ -312,7 +322,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;
++ __u16 l_i_tag; /* Context Tag */
++ __u16 l_i_reserved2;
+ } linux2;
+ struct {
+ __u8 h_i_frag; /* Fragment number */
+@@ -344,6 +355,7 @@ struct ext4_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_raw_tag osd2.linux2.l_i_tag
+ #define i_reserved2 osd2.linux2.l_i_reserved2
+
+ #elif defined(__GNU__)
+@@ -400,6 +412,7 @@ struct ext4_inode {
+ #define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
+ #define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
+ #define EXT4_MOUNT_EXTENTS 0x400000 /* Extents support */
++#define EXT4_MOUNT_TAGGED (1<<24) /* Enable Context Tags */
+
+ /* Compatibility, for having both ext2_fs.h and ext4_fs.h included at once */
+ #ifndef _LINUX_EXT2_FS_H
+@@ -843,6 +856,7 @@ struct buffer_head * ext4_bread (handle_
+ int ext4_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 ext4_sync_flags(struct inode *inode);
+
+ extern void ext4_read_inode (struct inode *);
+ extern int ext4_write_inode (struct inode *, int);
+--- linux-2.6.20/include/linux/fs.h 2007-02-06 03:01:50 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/fs.h 2007-02-06 03:39:12 +0100
+@@ -121,6 +121,8 @@ extern int dir_notify_enable;
+ #define MS_SLAVE (1<<19) /* change to slave */
+ #define MS_SHARED (1<<20) /* change to shared */
+ #define MS_RELATIME (1<<21) /* Update atime relative to mtime/ctime. */
++#define MS_TAGGED (1<<24) /* use generic inode tagging */
++#define MS_TAGID (1<<25) /* use specific tag for this mount */
+ #define MS_ACTIVE (1<<30)
+ #define MS_NOUSER (1<<31)
+
+@@ -147,6 +149,8 @@ extern int dir_notify_enable;
+ #define S_NOCMTIME 128 /* Do not update file c/mtime */
+ #define S_SWAPFILE 256 /* Do not truncate: swapon got its bmaps */
+ #define S_PRIVATE 512 /* Inode is fs-internal */
++#define S_BARRIER 1024 /* Barrier for chroot() */
++#define S_IUNLINK 2048 /* Immutable unlink */
+
+ /*
+ * Note that nosuid etc flags are inode-specific: setting some file-system
+@@ -163,23 +167,35 @@ extern int dir_notify_enable;
+ */
+ #define __IS_FLG(inode,flg) ((inode)->i_sb->s_flags & (flg))
+
+-#define IS_RDONLY(inode) ((inode)->i_sb->s_flags & MS_RDONLY)
++#define IS_RDONLY(inode) __IS_FLG(inode, MS_RDONLY)
+ #define IS_SYNC(inode) (__IS_FLG(inode, MS_SYNCHRONOUS) || \
+ ((inode)->i_flags & S_SYNC))
+ #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_TAGGED(inode) __IS_FLG(inode, MS_TAGGED)
+
+ #define IS_NOQUOTA(inode) ((inode)->i_flags & S_NOQUOTA)
+ #define IS_APPEND(inode) ((inode)->i_flags & S_APPEND)
+ #define IS_IMMUTABLE(inode) ((inode)->i_flags & S_IMMUTABLE)
++#define IS_IUNLINK(inode) ((inode)->i_flags & S_IUNLINK)
++#define IS_IXORUNLINK(inode) ((IS_IUNLINK(inode) ? S_IMMUTABLE : 0) ^ IS_IMMUTABLE(inode))
+ #define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
+
++#define IS_BARRIER(inode) (S_ISDIR((inode)->i_mode) && ((inode)->i_flags & S_BARRIER))
+ #define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
+ #define IS_NOCMTIME(inode) ((inode)->i_flags & S_NOCMTIME)
+ #define IS_SWAPFILE(inode) ((inode)->i_flags & S_SWAPFILE)
+ #define IS_PRIVATE(inode) ((inode)->i_flags & S_PRIVATE)
+
++#ifdef CONFIG_VSERVER_COWBL
++# define IS_COW(inode) (IS_IUNLINK(inode) && IS_IMMUTABLE(inode))
++# define IS_COW_LINK(inode) (S_ISREG((inode)->i_mode) && ((inode)->i_nlink > 1))
++#else
++# define IS_COW(inode) (0)
++# define IS_COW_LINK(inode) (0)
++#endif
++
+ /* 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. */
+
+@@ -253,11 +269,17 @@ extern int dir_notify_enable;
+ #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 FS_BARRIER_FL 0x04000000 /* Barrier for chroot() */
++#define FS_IUNLINK_FL 0x08000000 /* Immutable unlink */
+ #define FS_RESERVED_FL 0x80000000 /* reserved for ext2 lib */
+
++#ifdef CONFIG_VSERVER_LEGACY
++#define FS_FL_USER_VISIBLE 0x0803DFFF /* User visible flags */
++#define FS_FL_USER_MODIFIABLE 0x080380FF /* User modifiable flags */
++#else
+ #define FS_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
+ #define FS_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
+-
++#endif
+
+ #define SYNC_FILE_RANGE_WAIT_BEFORE 1
+ #define SYNC_FILE_RANGE_WRITE 2
+@@ -324,6 +346,7 @@ typedef void (dio_iodone_t)(struct kiocb
+ #define ATTR_KILL_SUID 2048
+ #define ATTR_KILL_SGID 4096
+ #define ATTR_FILE 8192
++#define ATTR_TAG 16384
+
+ /*
+ * This is the Inode Attributes structure, used for notify_change(). It
+@@ -339,6 +362,7 @@ struct iattr {
+ umode_t ia_mode;
+ uid_t ia_uid;
+ gid_t ia_gid;
++ tag_t ia_tag;
+ loff_t ia_size;
+ struct timespec ia_atime;
+ struct timespec ia_mtime;
+@@ -352,6 +376,9 @@ struct iattr {
+ struct file *ia_file;
+ };
+
++#define ATTR_FLAG_BARRIER 512 /* Barrier for chroot() */
++#define ATTR_FLAG_IUNLINK 1024 /* Immutable unlink */
++
+ /*
+ * Includes for diskquotas.
+ */
+@@ -534,6 +561,7 @@ struct inode {
+ unsigned int i_nlink;
+ uid_t i_uid;
+ gid_t i_gid;
++ tag_t i_tag;
+ dev_t i_rdev;
+ unsigned long i_version;
+ loff_t i_size;
+@@ -724,6 +752,7 @@ struct file {
+ loff_t f_pos;
+ struct fown_struct f_owner;
+ unsigned int f_uid, f_gid;
++ xid_t f_xid;
+ struct file_ra_state f_ra;
+
+ unsigned long f_version;
+@@ -806,6 +835,7 @@ struct file_lock {
+ unsigned char fl_type;
+ loff_t fl_start;
+ loff_t fl_end;
++ xid_t fl_xid;
+
+ struct fasync_struct * fl_fasync; /* for lease break notifications */
+ unsigned long fl_break_time; /* for nonblocking lease breaks */
+@@ -979,12 +1009,12 @@ extern void unlock_super(struct super_bl
+ */
+ extern int vfs_permission(struct nameidata *, int);
+ extern int vfs_create(struct inode *, struct dentry *, int, struct nameidata *);
+-extern int vfs_mkdir(struct inode *, struct dentry *, int);
+-extern int vfs_mknod(struct inode *, struct dentry *, int, dev_t);
+-extern int vfs_symlink(struct inode *, struct dentry *, const char *, int);
+-extern int vfs_link(struct dentry *, struct inode *, struct dentry *);
+-extern int vfs_rmdir(struct inode *, struct dentry *);
+-extern int vfs_unlink(struct inode *, struct dentry *);
++extern int vfs_mkdir(struct inode *, struct dentry *, int, struct nameidata *);
++extern int vfs_mknod(struct inode *, struct dentry *, int, dev_t, struct nameidata *);
++extern int vfs_symlink(struct inode *, struct dentry *, const char *, int, struct nameidata *);
++extern int vfs_link(struct dentry *, struct inode *, struct dentry *, struct nameidata *);
++extern int vfs_rmdir(struct inode *, struct dentry *, struct nameidata *);
++extern int vfs_unlink(struct inode *, struct dentry *, struct nameidata *);
+ extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
+
+ /*
+@@ -1124,6 +1154,7 @@ struct inode_operations {
+ ssize_t (*listxattr) (struct dentry *, char *, size_t);
+ int (*removexattr) (struct dentry *, const char *);
+ void (*truncate_range)(struct inode *, loff_t, loff_t);
++ int (*sync_flags) (struct inode *);
+ };
+
+ struct seq_file;
+@@ -1139,6 +1170,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 *);
++ssize_t vfs_sendfile(struct file *, struct file *, loff_t *, size_t, loff_t);
+
+ /*
+ * NOTE: write_inode, delete_inode, clear_inode, put_inode can be called
+@@ -1717,6 +1749,7 @@ extern ssize_t generic_file_buffered_wri
+ extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos);
+ extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos);
+ extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *);
++extern ssize_t generic_file_sendpage(struct file *, struct page *, int, size_t, loff_t *, int);
+ extern void do_generic_mapping_read(struct address_space *mapping,
+ struct file_ra_state *, struct file *,
+ loff_t *, read_descriptor_t *, read_actor_t);
+@@ -1850,6 +1883,7 @@ extern int dcache_dir_open(struct inode
+ extern int dcache_dir_close(struct inode *, struct file *);
+ extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
+ extern int dcache_readdir(struct file *, void *, filldir_t);
++extern int dcache_readdir_filter(struct file *, void *, filldir_t, int (*)(struct dentry *));
+ extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
+ extern int simple_statfs(struct dentry *, struct kstatfs *);
+ extern int simple_link(struct dentry *, struct inode *, struct dentry *);
+--- linux-2.6.20/include/linux/init_task.h 2007-02-06 03:01:51 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/init_task.h 2007-02-06 03:05:22 +0100
+@@ -141,6 +141,10 @@ extern struct group_info init_groups;
+ .pi_lock = SPIN_LOCK_UNLOCKED, \
+ INIT_TRACE_IRQFLAGS \
+ INIT_LOCKDEP \
++ .xid = 0, \
++ .vx_info = NULL, \
++ .nid = 0, \
++ .nx_info = NULL, \
+ }
+
+
+--- linux-2.6.20/include/linux/ipc.h 2006-11-30 21:19:38 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/ipc.h 2007-02-06 03:05:22 +0100
+@@ -63,6 +63,7 @@ struct kern_ipc_perm
+ key_t key;
+ uid_t uid;
+ gid_t gid;
++ xid_t xid;
+ uid_t cuid;
+ gid_t cgid;
+ mode_t mode;
+--- linux-2.6.20/include/linux/loop.h 2006-11-30 21:19:38 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/loop.h 2007-02-06 03:05:22 +0100
+@@ -45,6 +45,7 @@ struct loop_device {
+ struct loop_func_table *lo_encryption;
+ __u32 lo_init[2];
+ uid_t lo_key_owner; /* Who set the key */
++ xid_t lo_xid;
+ int (*ioctl)(struct loop_device *, int cmd,
+ unsigned long arg);
+
+--- linux-2.6.20/include/linux/major.h 2006-06-18 04:55:19 +0200
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/major.h 2007-02-06 03:05:22 +0100
+@@ -15,6 +15,7 @@
+ #define HD_MAJOR IDE0_MAJOR
+ #define PTY_SLAVE_MAJOR 3
+ #define TTY_MAJOR 4
++#define VROOT_MAJOR 4
+ #define TTYAUX_MAJOR 5
+ #define LP_MAJOR 6
+ #define VCS_MAJOR 7
+--- linux-2.6.20/include/linux/mount.h 2007-02-06 03:01:51 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/mount.h 2007-02-06 03:41:22 +0100
+@@ -28,12 +28,16 @@ struct mnt_namespace;
+ #define MNT_NOATIME 0x08
+ #define MNT_NODIRATIME 0x10
+ #define MNT_RELATIME 0x20
++#define MNT_RDONLY 0x40
++
++#define MNT_IS_RDONLY(m) ((m) && ((m)->mnt_flags & MNT_RDONLY))
+
+ #define MNT_SHRINKABLE 0x100
+
+ #define MNT_SHARED 0x1000 /* if the vfsmount is a shared mount */
+ #define MNT_UNBINDABLE 0x2000 /* if the vfsmount is a unbindable mount */
+ #define MNT_PNODE_MASK 0x3000 /* propogation flag mask */
++#define MNT_TAGID 0x8000
+
+ struct vfsmount {
+ struct list_head mnt_hash;
+@@ -55,6 +59,7 @@ struct vfsmount {
+ struct vfsmount *mnt_master; /* slave is on master->mnt_slave_list */
+ struct mnt_namespace *mnt_ns; /* containing namespace */
+ int mnt_pinned;
++ tag_t mnt_tag; /* tagging used for vfsmount */
+ };
+
+ static inline struct vfsmount *mntget(struct vfsmount *mnt)
+--- linux-2.6.20/include/linux/net.h 2007-02-06 03:01:51 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/net.h 2007-02-06 03:05:22 +0100
+@@ -63,6 +63,7 @@ typedef enum {
+ #define SOCK_NOSPACE 2
+ #define SOCK_PASSCRED 3
+ #define SOCK_PASSSEC 4
++#define SOCK_USER_SOCKET 5
+
+ #ifndef ARCH_HAS_SOCKET_TYPES
+ /**
+--- linux-2.6.20/include/linux/nfs_mount.h 2005-08-29 22:25:42 +0200
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/nfs_mount.h 2007-02-06 03:05:22 +0100
+@@ -61,6 +61,7 @@ struct nfs_mount_data {
+ #define NFS_MOUNT_NOACL 0x0800 /* 4 */
+ #define NFS_MOUNT_STRICTLOCK 0x1000 /* reserved for NFSv4 */
+ #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
++#define NFS_MOUNT_TAGGED 0x8000 /* context tagging */
+ #define NFS_MOUNT_FLAGMASK 0xFFFF
+
+ #endif
+--- linux-2.6.20/include/linux/nsproxy.h 2007-02-06 03:01:51 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/nsproxy.h 2007-02-06 05:43:36 +0100
+@@ -36,6 +36,11 @@ int copy_namespaces(int flags, struct ta
+ void get_task_namespaces(struct task_struct *tsk);
+ void free_nsproxy(struct nsproxy *ns);
+
++static inline void get_nsproxy(struct nsproxy *ns)
++{
++ atomic_inc(&ns->count);
++}
++
+ static inline void put_nsproxy(struct nsproxy *ns)
+ {
+ if (atomic_dec_and_test(&ns->count)) {
+--- linux-2.6.20/include/linux/percpu.h 2006-11-30 21:19:39 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/percpu.h 2007-02-06 03:05:22 +0100
+@@ -11,7 +11,7 @@
+
+ /* Enough to cover all DEFINE_PER_CPUs in kernel, including modules. */
+ #ifndef PERCPU_ENOUGH_ROOM
+-#define PERCPU_ENOUGH_ROOM 32768
++#define PERCPU_ENOUGH_ROOM 65536
+ #endif
+
+ /*
+--- linux-2.6.20/include/linux/pid.h 2007-02-06 03:01:51 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/pid.h 2007-02-06 03:05:22 +0100
+@@ -8,7 +8,8 @@ enum pid_type
+ PIDTYPE_PID,
+ PIDTYPE_PGID,
+ PIDTYPE_SID,
+- PIDTYPE_MAX
++ PIDTYPE_MAX,
++ PIDTYPE_REALPID
+ };
+
+ /*
+--- linux-2.6.20/include/linux/proc_fs.h 2006-11-30 21:19:39 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/proc_fs.h 2007-02-06 05:02:33 +0100
+@@ -54,6 +54,7 @@ struct proc_dir_entry {
+ nlink_t nlink;
+ uid_t uid;
+ gid_t gid;
++ int vx_flags;
+ loff_t size;
+ struct inode_operations * proc_iops;
+ const struct file_operations * proc_fops;
+@@ -244,13 +245,20 @@ static inline void kclist_add(struct kco
+ extern void kclist_add(struct kcore_list *, void *, size_t);
+ #endif
+
++struct vx_info;
++struct nx_info;
++
+ union proc_op {
+ int (*proc_get_link)(struct inode *, struct dentry **, struct vfsmount **);
+ int (*proc_read)(struct task_struct *task, char *page);
++ int (*proc_vs_read)(char *page);
++ int (*proc_vxi_read)(struct vx_info *vxi, char *page);
++ int (*proc_nxi_read)(struct nx_info *nxi, char *page);
+ };
+
+ struct proc_inode {
+ struct pid *pid;
++ int vx_flags;
+ int fd;
+ union proc_op op;
+ struct proc_dir_entry *pde;
+--- linux-2.6.20/include/linux/reiserfs_fs.h 2007-02-06 03:01:52 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/reiserfs_fs.h 2007-02-06 03:05:22 +0100
+@@ -821,6 +821,10 @@ struct stat_data_v1 {
+ #define REISERFS_COMPR_FL FS_COMPR_FL
+ #define REISERFS_NOTAIL_FL FS_NOTAIL_FL
+
++/* unfortunately reiserfs sdattr is only 16 bit */
++#define REISERFS_BARRIER_FL (FS_BARRIER_FL >> 16)
++#define REISERFS_IUNLINK_FL (FS_IUNLINK_FL >> 16)
++
+ /* persistent flags that file inherits from the parent directory */
+ #define REISERFS_INHERIT_MASK ( REISERFS_IMMUTABLE_FL | \
+ REISERFS_SYNC_FL | \
+@@ -830,6 +834,14 @@ struct stat_data_v1 {
+ REISERFS_COMPR_FL | \
+ REISERFS_NOTAIL_FL )
+
++#ifdef CONFIG_VSERVER_LEGACY
++#define REISERFS_FL_USER_VISIBLE (REISERFS_IUNLINK_FL|0x80FF)
++#define REISERFS_FL_USER_MODIFIABLE (REISERFS_IUNLINK_FL|0x80FF)
++#else
++#define REISERFS_FL_USER_VISIBLE 0x80FF
++#define REISERFS_FL_USER_MODIFIABLE 0x80FF
++#endif
++
+ /* Stat Data on disk (reiserfs version of UFS disk inode minus the
+ address blocks) */
+ struct stat_data {
+@@ -1901,6 +1913,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);
+
+ /* namei.c */
+ void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
+--- linux-2.6.20/include/linux/reiserfs_fs_sb.h 2007-02-06 03:01:52 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/reiserfs_fs_sb.h 2007-02-06 03:05:22 +0100
+@@ -457,6 +457,7 @@ enum reiserfs_mount_options {
+ REISERFS_POSIXACL,
+ REISERFS_BARRIER_NONE,
+ REISERFS_BARRIER_FLUSH,
++ REISERFS_TAGGED,
+
+ /* Actions on error */
+ REISERFS_ERROR_PANIC,
+--- linux-2.6.20/include/linux/sched.h 2007-02-06 03:01:52 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/sched.h 2007-02-06 03:42:34 +0100
+@@ -26,6 +26,7 @@
+ #define CLONE_STOPPED 0x02000000 /* Start in stopped state */
+ #define CLONE_NEWUTS 0x04000000 /* New utsname group? */
+ #define CLONE_NEWIPC 0x08000000 /* New ipcs */
++#define CLONE_KTHREAD 0x10000000 /* clone a kernel thread */
+
+ /*
+ * Scheduling policies
+@@ -54,6 +55,7 @@ struct sched_param {
+ #include <linux/cpumask.h>
+ #include <linux/errno.h>
+ #include <linux/nodemask.h>
++// #include <linux/vs_base.h>
+
+ #include <asm/system.h>
+ #include <asm/semaphore.h>
+@@ -93,7 +95,7 @@ struct futex_pi_state;
+ * List of flags we want to share for kernel threads,
+ * if only because they are not used by them anyway.
+ */
+-#define CLONE_KERNEL (CLONE_FS | CLONE_FILES | CLONE_SIGHAND)
++#define CLONE_KERNEL (CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_KTHREAD)
+
+ /*
+ * These are the constant used to fake the fixed-point load-average
+@@ -145,12 +147,13 @@ extern unsigned long weighted_cpuload(co
+ #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_NONINTERACTIVE 64
+-#define TASK_DEAD 128
++#define TASK_NONINTERACTIVE 128
++#define TASK_DEAD 256
+
+ #define __set_task_state(tsk, state_value) \
+ do { (tsk)->state = (state_value); } while (0)
+@@ -274,27 +277,30 @@ extern void arch_unmap_area_topdown(stru
+ * The mm counters are not protected by its page_table_lock,
+ * so must be incremented atomically.
+ */
+-#define set_mm_counter(mm, member, value) atomic_long_set(&(mm)->_##member, value)
+-#define get_mm_counter(mm, member) ((unsigned long)atomic_long_read(&(mm)->_##member))
+-#define add_mm_counter(mm, member, value) atomic_long_add(value, &(mm)->_##member)
+-#define inc_mm_counter(mm, member) atomic_long_inc(&(mm)->_##member)
+-#define dec_mm_counter(mm, member) atomic_long_dec(&(mm)->_##member)
+ typedef atomic_long_t mm_counter_t;
++#define __set_mm_counter(mm, member, value) \
++ atomic_long_set(&(mm)->_##member, value)
++#define get_mm_counter(mm, member) \
++ ((unsigned long)atomic_long_read(&(mm)->_##member))
+
+ #else /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
+ /*
+ * The mm counters are protected by its page_table_lock,
+ * so can be incremented directly.
+ */
+-#define set_mm_counter(mm, member, value) (mm)->_##member = (value)
+-#define get_mm_counter(mm, member) ((mm)->_##member)
+-#define add_mm_counter(mm, member, value) (mm)->_##member += (value)
+-#define inc_mm_counter(mm, member) (mm)->_##member++
+-#define dec_mm_counter(mm, member) (mm)->_##member--
+ typedef unsigned long mm_counter_t;
++#define __set_mm_counter(mm, member, value) (mm)->_##member = (value)
++#define get_mm_counter(mm, member) ((mm)->_##member)
+
+ #endif /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
+
++#define set_mm_counter(mm, member, value) \
++ vx_ ## member ## pages_sub((mm), (get_mm_counter(mm, member) - value))
++#define add_mm_counter(mm, member, value) \
++ vx_ ## member ## pages_add((mm), (value))
++#define inc_mm_counter(mm, member) vx_ ## member ## pages_inc((mm))
++#define dec_mm_counter(mm, member) vx_ ## member ## pages_dec((mm))
++
+ #define get_mm_rss(mm) \
+ (get_mm_counter(mm, file_rss) + get_mm_counter(mm, anon_rss))
+ #define update_hiwater_rss(mm) do { \
+@@ -352,6 +358,7 @@ struct mm_struct {
+
+ /* Architecture-specific MM context */
+ mm_context_t context;
++ struct vx_info *mm_vx_info;
+
+ /* Swap token stuff */
+ /*
+@@ -555,9 +562,10 @@ struct user_struct {
+ /* Hash table maintenance information */
+ struct list_head uidhash_list;
+ uid_t uid;
++ xid_t xid;
+ };
+
+-extern struct user_struct *find_user(uid_t);
++extern struct user_struct *find_user(xid_t, uid_t);
+
+ extern struct user_struct root_user;
+ #define INIT_USER (&root_user)
+@@ -949,6 +957,14 @@ struct task_struct {
+
+ void *security;
+ struct audit_context *audit_context;
++
++/* vserver context data */
++ struct vx_info *vx_info;
++ struct nx_info *nx_info;
++
++ xid_t xid;
++ nid_t nid;
++
+ seccomp_t seccomp;
+
+ /* Thread group tracking */
+@@ -1263,12 +1279,16 @@ extern struct task_struct init_task;
+
+ extern struct mm_struct init_mm;
+
+-#define find_task_by_pid(nr) find_task_by_pid_type(PIDTYPE_PID, nr)
++#define find_task_by_real_pid(nr) \
++ find_task_by_pid_type(PIDTYPE_REALPID, nr)
++#define find_task_by_pid(nr) \
++ find_task_by_pid_type(PIDTYPE_PID, nr)
++
+ extern struct task_struct *find_task_by_pid_type(int type, int pid);
+ extern void __set_special_pids(pid_t session, pid_t pgrp);
+
+ /* per-UID process charging. */
+-extern struct user_struct * alloc_uid(uid_t);
++extern struct user_struct * alloc_uid(xid_t, uid_t);
+ static inline struct user_struct *get_uid(struct user_struct *u)
+ {
+ atomic_inc(&u->__count);
+--- linux-2.6.20/include/linux/shmem_fs.h 2006-11-30 21:19:39 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/shmem_fs.h 2007-02-06 03:05:22 +0100
+@@ -8,6 +8,9 @@
+
+ #define SHMEM_NR_DIRECT 16
+
++#define TMPFS_SUPER_MAGIC 0x01021994
++
++
+ struct shmem_inode_info {
+ spinlock_t lock;
+ unsigned long flags;
+--- linux-2.6.20/include/linux/stat.h 2006-11-30 21:19:40 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/stat.h 2007-02-06 03:05:22 +0100
+@@ -63,6 +63,7 @@ struct kstat {
+ unsigned int nlink;
+ uid_t uid;
+ gid_t gid;
++ tag_t tag;
+ dev_t rdev;
+ loff_t size;
+ struct timespec atime;
+--- linux-2.6.20/include/linux/sunrpc/auth.h 2006-11-30 21:19:40 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/sunrpc/auth.h 2007-02-06 03:05:22 +0100
+@@ -24,6 +24,7 @@
+ struct auth_cred {
+ uid_t uid;
+ gid_t gid;
++ tag_t tag;
+ struct group_info *group_info;
+ };
+
+--- linux-2.6.20/include/linux/sunrpc/clnt.h 2007-02-06 03:01:52 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/sunrpc/clnt.h 2007-02-06 03:05:22 +0100
+@@ -42,7 +42,8 @@ struct rpc_clnt {
+ cl_intr : 1,/* interruptible */
+ cl_autobind : 1,/* use getport() */
+ cl_oneshot : 1,/* dispose after use */
+- cl_dead : 1;/* abandoned */
++ cl_dead : 1,/* abandoned */
++ cl_tag : 1;/* context tagging */
+
+ struct rpc_rtt * cl_rtt; /* RTO estimator data */
+
+--- linux-2.6.20/include/linux/syscalls.h 2006-11-30 21:19:40 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/syscalls.h 2007-02-06 03:05:22 +0100
+@@ -294,6 +294,8 @@ asmlinkage long sys_symlink(const char _
+ asmlinkage long sys_unlink(const char __user *pathname);
+ asmlinkage long sys_rename(const char __user *oldname,
+ const char __user *newname);
++asmlinkage long sys_copyfile(const char __user *from, const char __user *to,
++ umode_t mode);
+ asmlinkage long sys_chmod(const char __user *filename, mode_t mode);
+ asmlinkage long sys_fchmod(unsigned int fd, mode_t mode);
+
+--- linux-2.6.20/include/linux/sysctl.h 2007-02-06 03:01:52 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/sysctl.h 2007-02-06 03:05:22 +0100
+@@ -101,6 +101,7 @@ enum
+ KERN_CAP_BSET=14, /* int: capability bounding set */
+ KERN_PANIC=15, /* int: panic timeout */
+ KERN_REALROOTDEV=16, /* real root device to mount after initrd */
++ KERN_VSHELPER=17, /* string: path to vshelper policy agent */
+
+ KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
+ KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
+@@ -923,6 +924,9 @@ typedef int ctl_handler (ctl_table *tabl
+ typedef int proc_handler (ctl_table *ctl, int write, struct file * filp,
+ void __user *buffer, size_t *lenp, loff_t *ppos);
+
++typedef int virt_handler (struct ctl_table *ctl, int write, xid_t xid,
++ void **datap, size_t *lenp);
++
+ extern int proc_dostring(ctl_table *, int, struct file *,
+ void __user *, size_t *, loff_t *);
+ extern int proc_dointvec(ctl_table *, int, struct file *,
+@@ -1007,6 +1011,7 @@ struct ctl_table
+ mode_t mode;
+ ctl_table *child;
+ proc_handler *proc_handler; /* Callback for text formatting */
++ virt_handler *virt_handler; /* Context virtualization */
+ ctl_handler *strategy; /* Callback function for all r/w */
+ struct proc_dir_entry *de; /* /proc control block */
+ void *extra1;
+--- linux-2.6.20/include/linux/sysfs.h 2007-02-06 03:01:52 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/sysfs.h 2007-02-06 03:05:22 +0100
+@@ -13,6 +13,8 @@
+ #include <linux/compiler.h>
+ #include <asm/atomic.h>
+
++#define SYSFS_SUPER_MAGIC 0x62656572
++
+ struct kobject;
+ struct module;
+
+--- linux-2.6.20/include/linux/time.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/time.h 2007-02-06 03:05:22 +0100
+@@ -174,6 +174,9 @@ static inline void timespec_add_ns(struc
+ }
+ a->tv_nsec = ns;
+ }
++
++#include <linux/vs_time.h>
++
+ #endif /* __KERNEL__ */
+
+ #define NFDBITS __NFDBITS
+--- linux-2.6.20/include/linux/types.h 2007-02-06 03:01:52 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/types.h 2007-02-06 03:05:22 +0100
+@@ -39,6 +39,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 int xid_t;
++typedef unsigned int nid_t;
++typedef unsigned int tag_t;
#ifdef CONFIG_UID16
/* This is defined by include/asm-{arch}/posix_types.h */
---- linux-2.6.18.5/include/linux/vroot.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vroot.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/include/linux/vroot.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vroot.h 2007-02-06 03:05:22 +0100
@@ -0,0 +1,51 @@
+
-+/*
-+ * include/linux/vroot.h
-+ *
-+ * written by Herbert Pötzl, 9/11/2002
-+ * ported to 2.6 by Herbert Pötzl, 30/12/2004
-+ *
-+ * Copyright (C) 2002-2005 by Herbert Pötzl.
-+ * Redistribution of this file is permitted under the
-+ * GNU General Public License.
-+ */
++/*
++ * include/linux/vroot.h
++ *
++ * written by Herbert Pötzl, 9/11/2002
++ * ported to 2.6 by Herbert Pötzl, 30/12/2004
++ *
++ * Copyright (C) 2002-2005 by Herbert Pötzl.
++ * Redistribution of this file is permitted under the
++ * GNU General Public License.
++ */
++
++#ifndef _LINUX_VROOT_H
++#define _LINUX_VROOT_H
++
++
++#ifdef __KERNEL__
++
++/* Possible states of device */
++enum {
++ Vr_unbound,
++ Vr_bound,
++};
++
++struct vroot_device {
++ int vr_number;
++ int vr_refcnt;
++
++ struct semaphore vr_ctl_mutex;
++ struct block_device *vr_device;
++ int vr_state;
++};
++
++
++typedef struct block_device *(vroot_grb_func)(struct block_device *);
++
++extern int register_vroot_grb(vroot_grb_func *);
++extern int unregister_vroot_grb(vroot_grb_func *);
++
++#endif /* __KERNEL__ */
++
++#define MAX_VROOT_DEFAULT 8
++
++/*
++ * IOCTL commands --- we will commandeer 0x56 ('V')
++ */
++
++#define VROOT_SET_DEV 0x5600
++#define VROOT_CLR_DEV 0x5601
++
++#endif /* _LINUX_VROOT_H */
+--- linux-2.6.20/include/linux/vs_base.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vs_base.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,9 @@
++#ifndef _VS_BASE_H
++#define _VS_BASE_H
++
++#include "vserver/base.h"
++#include "vserver/debug.h"
++
++#else
++#warning duplicate inclusion
++#endif
+--- linux-2.6.20/include/linux/vs_context.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vs_context.h 2007-02-06 04:58:45 +0100
+@@ -0,0 +1,220 @@
++#ifndef _VS_CONTEXT_H
++#define _VS_CONTEXT_H
++
++#include "vserver/base.h"
++#include "vserver/context.h"
++#include "vserver/history.h"
++#include "vserver/debug.h"
++
++
++#define get_vx_info(i) __get_vx_info(i,__FILE__,__LINE__,__HERE__)
++
++static inline struct vx_info *__get_vx_info(struct vx_info *vxi,
++ const char *_file, int _line, void *_here)
++{
++ if (!vxi)
++ return NULL;
++
++ vxlprintk(VXD_CBIT(xid, 2), "get_vx_info(%p[#%d.%d])",
++ vxi, vxi?vxi->vx_id:0, vxi?atomic_read(&vxi->vx_usecnt):0,
++ _file, _line);
++ __vxh_get_vx_info(vxi, _here);
++
++ atomic_inc(&vxi->vx_usecnt);
++ return vxi;
++}
++
++
++extern void free_vx_info(struct vx_info *);
++
++#define put_vx_info(i) __put_vx_info(i,__FILE__,__LINE__,__HERE__)
++
++static inline void __put_vx_info(struct vx_info *vxi,
++ const char *_file, int _line, void *_here)
++{
++ if (!vxi)
++ return;
++
++ vxlprintk(VXD_CBIT(xid, 2), "put_vx_info(%p[#%d.%d])",
++ vxi, vxi?vxi->vx_id:0, vxi?atomic_read(&vxi->vx_usecnt):0,
++ _file, _line);
++ __vxh_put_vx_info(vxi, _here);
++
++ if (atomic_dec_and_test(&vxi->vx_usecnt))
++ free_vx_info(vxi);
++}
++
++
++#define init_vx_info(p,i) __init_vx_info(p,i,__FILE__,__LINE__,__HERE__)
++
++static inline void __init_vx_info(struct vx_info **vxp, struct vx_info *vxi,
++ const char *_file, int _line, void *_here)
++{
++ if (vxi) {
++ vxlprintk(VXD_CBIT(xid, 3),
++ "init_vx_info(%p[#%d.%d])",
++ vxi, vxi?vxi->vx_id:0,
++ vxi?atomic_read(&vxi->vx_usecnt):0,
++ _file, _line);
++ __vxh_init_vx_info(vxi, vxp, _here);
++
++ atomic_inc(&vxi->vx_usecnt);
++ }
++ *vxp = vxi;
++}
++
++
++#define set_vx_info(p,i) __set_vx_info(p,i,__FILE__,__LINE__,__HERE__)
++
++static inline void __set_vx_info(struct vx_info **vxp, struct vx_info *vxi,
++ const char *_file, int _line, void *_here)
++{
++ struct vx_info *vxo;
++
++ if (!vxi)
++ return;
++
++ vxlprintk(VXD_CBIT(xid, 3), "set_vx_info(%p[#%d.%d])",
++ vxi, vxi?vxi->vx_id:0,
++ vxi?atomic_read(&vxi->vx_usecnt):0,
++ _file, _line);
++ __vxh_set_vx_info(vxi, vxp, _here);
++
++ atomic_inc(&vxi->vx_usecnt);
++ vxo = xchg(vxp, vxi);
++ BUG_ON(vxo);
++}
++
++
++#define clr_vx_info(p) __clr_vx_info(p,__FILE__,__LINE__,__HERE__)
++
++static inline void __clr_vx_info(struct vx_info **vxp,
++ const char *_file, int _line, void *_here)
++{
++ struct vx_info *vxo;
++
++ vxo = xchg(vxp, NULL);
++ if (!vxo)
++ return;
++
++ vxlprintk(VXD_CBIT(xid, 3), "clr_vx_info(%p[#%d.%d])",
++ vxo, vxo?vxo->vx_id:0,
++ vxo?atomic_read(&vxo->vx_usecnt):0,
++ _file, _line);
++ __vxh_clr_vx_info(vxo, vxp, _here);
++
++ if (atomic_dec_and_test(&vxo->vx_usecnt))
++ free_vx_info(vxo);
++}
++
++
++#define claim_vx_info(v,p) \
++ __claim_vx_info(v,p,__FILE__,__LINE__,__HERE__)
++
++static inline void __claim_vx_info(struct vx_info *vxi,
++ struct task_struct *task,
++ const char *_file, int _line, void *_here)
++{
++ vxlprintk(VXD_CBIT(xid, 3), "claim_vx_info(%p[#%d.%d.%d]) %p",
++ vxi, vxi?vxi->vx_id:0,
++ vxi?atomic_read(&vxi->vx_usecnt):0,
++ vxi?atomic_read(&vxi->vx_tasks):0,
++ task, _file, _line);
++ __vxh_claim_vx_info(vxi, task, _here);
++
++ atomic_inc(&vxi->vx_tasks);
++}
++
++
++extern void unhash_vx_info(struct vx_info *);
++
++#define release_vx_info(v,p) \
++ __release_vx_info(v,p,__FILE__,__LINE__,__HERE__)
++
++static inline void __release_vx_info(struct vx_info *vxi,
++ struct task_struct *task,
++ const char *_file, int _line, void *_here)
++{
++ vxlprintk(VXD_CBIT(xid, 3), "release_vx_info(%p[#%d.%d.%d]) %p",
++ vxi, vxi?vxi->vx_id:0,
++ vxi?atomic_read(&vxi->vx_usecnt):0,
++ vxi?atomic_read(&vxi->vx_tasks):0,
++ task, _file, _line);
++ __vxh_release_vx_info(vxi, task, _here);
++
++ might_sleep();
++
++ if (atomic_dec_and_test(&vxi->vx_tasks))
++ unhash_vx_info(vxi);
++}
++
++
++#define task_get_vx_info(p) \
++ __task_get_vx_info(p,__FILE__,__LINE__,__HERE__)
++
++static inline struct vx_info *__task_get_vx_info(struct task_struct *p,
++ const char *_file, int _line, void *_here)
++{
++ struct vx_info *vxi;
++
++ task_lock(p);
++ vxlprintk(VXD_CBIT(xid, 5), "task_get_vx_info(%p)",
++ p, _file, _line);
++ vxi = __get_vx_info(p->vx_info, _file, _line, _here);
++ task_unlock(p);
++ return vxi;
++}
++
++
++static inline void __wakeup_vx_info(struct vx_info *vxi)
++{
++ if (waitqueue_active(&vxi->vx_wait))
++ wake_up_interruptible(&vxi->vx_wait);
++}
++
++
++#define enter_vx_info(v,s) __enter_vx_info(v,s,__FILE__,__LINE__)
++
++static inline void __enter_vx_info(struct vx_info *vxi,
++ struct vx_info_save *vxis, const char *_file, int _line)
++{
++ vxlprintk(VXD_CBIT(xid, 5), "enter_vx_info(%p[#%d],%p) %p[#%d,%p]",
++ vxi, vxi ? vxi->vx_id : 0, vxis, current,
++ current->xid, current->vx_info, _file, _line);
++ vxis->vxi = xchg(¤t->vx_info, vxi);
++ vxis->xid = current->xid;
++ current->xid = vxi ? vxi->vx_id : 0;
++}
++
++#define leave_vx_info(s) __leave_vx_info(s,__FILE__,__LINE__)
++
++static inline void __leave_vx_info(struct vx_info_save *vxis,
++ const char *_file, int _line)
++{
++ vxlprintk(VXD_CBIT(xid, 5), "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]",
++ vxis, vxis->xid, vxis->vxi, current,
++ current->xid, current->vx_info, _file, _line);
++ (void)xchg(¤t->vx_info, vxis->vxi);
++ current->xid = vxis->xid;
++}
++
++
++static inline void __enter_vx_admin(struct vx_info_save *vxis)
++{
++ vxis->vxi = xchg(¤t->vx_info, NULL);
++ vxis->xid = xchg(¤t->xid, (xid_t)0);
++}
++
++static inline void __leave_vx_admin(struct vx_info_save *vxis)
++{
++ (void)xchg(¤t->xid, vxis->xid);
++ (void)xchg(¤t->vx_info, vxis->vxi);
++}
++
++extern void exit_vx_info(struct task_struct *, int);
++extern void exit_vx_info_early(struct task_struct *, int);
++
++
++#else
++#warning duplicate inclusion
++#endif
+--- linux-2.6.20/include/linux/vs_cowbl.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vs_cowbl.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,44 @@
++#ifndef _VS_COWBL_H
++#define _VS_COWBL_H
++
++#include <linux/fs.h>
++#include <linux/dcache.h>
++#include <linux/namei.h>
++
++extern struct dentry *cow_break_link(const char *pathname);
++
++static inline int cow_check_and_break(struct nameidata *nd)
++{
++ struct inode *inode = nd->dentry->d_inode;
++ int error = 0;
++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd->mnt))
++ return -EROFS;
++ if (IS_COW(inode)) {
++ if (IS_COW_LINK(inode)) {
++ struct dentry *new_dentry, *old_dentry = nd->dentry;
++ char *path, *buf;
++
++ buf = kmalloc(PATH_MAX, GFP_KERNEL);
++ if (!buf) {
++ return -ENOMEM;
++ }
++ path = d_path(nd->dentry, nd->mnt, buf, PATH_MAX);
++ new_dentry = cow_break_link(path);
++ kfree(buf);
++ if (!IS_ERR(new_dentry)) {
++ nd->dentry = new_dentry;
++ dput(old_dentry);
++ } else
++ error = PTR_ERR(new_dentry);
++ } else {
++ inode->i_flags &= ~(S_IUNLINK|S_IMMUTABLE);
++ inode->i_ctime = CURRENT_TIME;
++ mark_inode_dirty(inode);
++ }
++ }
++ return error;
++}
++
++#else
++#warning duplicate inclusion
++#endif
+--- linux-2.6.20/include/linux/vs_cvirt.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vs_cvirt.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,49 @@
++#ifndef _VS_CVIRT_H
++#define _VS_CVIRT_H
++
++#include "vserver/cvirt.h"
++#include "vserver/context.h"
++#include "vserver/base.h"
++#include "vserver/debug.h"
++
++
++static inline void vx_activate_task(struct task_struct *p)
++{
++ struct vx_info *vxi;
++
++ if ((vxi = p->vx_info)) {
++ vx_update_load(vxi);
++ atomic_inc(&vxi->cvirt.nr_running);
++ }
++}
++
++static inline void vx_deactivate_task(struct task_struct *p)
++{
++ struct vx_info *vxi;
++
++ if ((vxi = p->vx_info)) {
++ vx_update_load(vxi);
++ atomic_dec(&vxi->cvirt.nr_running);
++ }
++}
++
++static inline void vx_uninterruptible_inc(struct task_struct *p)
++{
++ struct vx_info *vxi;
++
++ if ((vxi = p->vx_info))
++ atomic_inc(&vxi->cvirt.nr_uninterruptible);
++}
++
++static inline void vx_uninterruptible_dec(struct task_struct *p)
++{
++ struct vx_info *vxi;
++
++ if ((vxi = p->vx_info))
++ atomic_dec(&vxi->cvirt.nr_uninterruptible);
++}
++
++
++#else
++#warning duplicate inclusion
++#endif
+--- linux-2.6.20/include/linux/vs_dlimit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vs_dlimit.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,214 @@
++#ifndef _VS_DLIMIT_H
++#define _VS_DLIMIT_H
++
++#include "vserver/dlimit.h"
++#include "vserver/base.h"
++#include "vserver/debug.h"
++
++
++#define get_dl_info(i) __get_dl_info(i,__FILE__,__LINE__)
++
++static inline struct dl_info *__get_dl_info(struct dl_info *dli,
++ const char *_file, int _line)
++{
++ if (!dli)
++ return NULL;
++ vxlprintk(VXD_CBIT(dlim, 4), "get_dl_info(%p[#%d.%d])",
++ dli, dli?dli->dl_tag:0, dli?atomic_read(&dli->dl_usecnt):0,
++ _file, _line);
++ atomic_inc(&dli->dl_usecnt);
++ return dli;
++}
++
++
++#define free_dl_info(i) \
++ call_rcu(&i->dl_rcu, rcu_free_dl_info);
++
++#define put_dl_info(i) __put_dl_info(i,__FILE__,__LINE__)
++
++static inline void __put_dl_info(struct dl_info *dli,
++ const char *_file, int _line)
++{
++ if (!dli)
++ return;
++ vxlprintk(VXD_CBIT(dlim, 4), "put_dl_info(%p[#%d.%d])",
++ dli, dli?dli->dl_tag:0, dli?atomic_read(&dli->dl_usecnt):0,
++ _file, _line);
++ if (atomic_dec_and_test(&dli->dl_usecnt))
++ free_dl_info(dli);
++}
++
++
++#define __dlimit_char(d) ((d)?'*':' ')
++
++static inline int __dl_alloc_space(struct super_block *sb,
++ tag_t tag, dlsize_t nr, const char *file, int line)
++{
++ struct dl_info *dli = NULL;
++ int ret = 0;
++
++ if (nr == 0)
++ goto out;
++ dli = locate_dl_info(sb, tag);
++ if (!dli)
++ goto out;
++
++ spin_lock(&dli->dl_lock);
++ ret = (dli->dl_space_used + nr > dli->dl_space_total);
++ if (!ret)
++ dli->dl_space_used += nr;
++ spin_unlock(&dli->dl_lock);
++ put_dl_info(dli);
++out:
++ vxlprintk(VXD_CBIT(dlim, 1),
++ "ALLOC (%p,#%d)%c %lld bytes (%d)",
++ sb, tag, __dlimit_char(dli), (long long)nr,
++ ret, file, line);
++ return ret;
++}
++
++static inline void __dl_free_space(struct super_block *sb,
++ tag_t tag, dlsize_t nr, const char *_file, int _line)
++{
++ struct dl_info *dli = NULL;
++
++ if (nr == 0)
++ goto out;
++ dli = locate_dl_info(sb, tag);
++ if (!dli)
++ goto out;
++
++ spin_lock(&dli->dl_lock);
++ if (dli->dl_space_used > nr)
++ dli->dl_space_used -= nr;
++ else
++ dli->dl_space_used = 0;
++ spin_unlock(&dli->dl_lock);
++ put_dl_info(dli);
++out:
++ vxlprintk(VXD_CBIT(dlim, 1),
++ "FREE (%p,#%d)%c %lld bytes",
++ sb, tag, __dlimit_char(dli), (long long)nr,
++ _file, _line);
++}
++
++static inline int __dl_alloc_inode(struct super_block *sb,
++ tag_t tag, const char *_file, int _line)
++{
++ struct dl_info *dli;
++ int ret = 0;
++
++ dli = locate_dl_info(sb, tag);
++ if (!dli)
++ goto out;
++
++ spin_lock(&dli->dl_lock);
++ ret = (dli->dl_inodes_used >= dli->dl_inodes_total);
++ if (!ret)
++ dli->dl_inodes_used++;
++#if 0
++ else
++ vxwprintk("DLIMIT hit (%p,#%d), inode %d>=%d @ %s:%d",
++ sb, tag,
++ dli->dl_inodes_used, dli->dl_inodes_total,
++ file, line);
++#endif
++ spin_unlock(&dli->dl_lock);
++ put_dl_info(dli);
++out:
++ vxlprintk(VXD_CBIT(dlim, 0),
++ "ALLOC (%p,#%d)%c inode (%d)",
++ sb, tag, __dlimit_char(dli), ret, _file, _line);
++ return ret;
++}
++
++static inline void __dl_free_inode(struct super_block *sb,
++ tag_t tag, const char *_file, int _line)
++{
++ struct dl_info *dli;
++
++ dli = locate_dl_info(sb, tag);
++ if (!dli)
++ goto out;
++
++ spin_lock(&dli->dl_lock);
++ if (dli->dl_inodes_used > 1)
++ dli->dl_inodes_used--;
++ else
++ dli->dl_inodes_used = 0;
++ spin_unlock(&dli->dl_lock);
++ put_dl_info(dli);
++out:
++ vxlprintk(VXD_CBIT(dlim, 0),
++ "FREE (%p,#%d)%c inode",
++ sb, tag, __dlimit_char(dli), _file, _line);
++}
++
++static inline void __dl_adjust_block(struct super_block *sb, tag_t tag,
++ unsigned long long *free_blocks, unsigned long long *root_blocks,
++ const char *_file, int _line)
++{
++ struct dl_info *dli;
++ uint64_t broot, bfree;
++
++ dli = locate_dl_info(sb, tag);
++ if (!dli)
++ return;
++
++ spin_lock(&dli->dl_lock);
++ broot = (dli->dl_space_total -
++ (dli->dl_space_total >> 10) * dli->dl_nrlmult)
++ >> sb->s_blocksize_bits;
++ bfree = (dli->dl_space_total - dli->dl_space_used)
++ >> sb->s_blocksize_bits;
++ spin_unlock(&dli->dl_lock);
++
++ vxlprintk(VXD_CBIT(dlim, 2),
++ "ADJUST: %lld,%lld on %lld,%lld [mult=%d]",
++ (long long)bfree, (long long)broot,
++ *free_blocks, *root_blocks, dli->dl_nrlmult,
++ _file, _line);
++ if (free_blocks) {
++ if (*free_blocks > bfree)
++ *free_blocks = bfree;
++ }
++ if (root_blocks) {
++ if (*root_blocks > broot)
++ *root_blocks = broot;
++ }
++ put_dl_info(dli);
++}
++
++#define DLIMIT_ALLOC_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), \
++ __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, \
++ __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, \
++ __FILE__, __LINE__ )
++
++
++#define DLIMIT_ALLOC_INODE(in) \
++ __dl_alloc_inode((in)->i_sb, (in)->i_tag, __FILE__, __LINE__ )
++
++#define DLIMIT_FREE_INODE(in) \
++ __dl_free_inode((in)->i_sb, (in)->i_tag, __FILE__, __LINE__ )
++
++
++#define DLIMIT_ADJUST_BLOCK(sb, tag, fb, rb) \
++ __dl_adjust_block(sb, tag, fb, rb, __FILE__, __LINE__ )
++
++
++#else
++#warning duplicate inclusion
++#endif
+--- linux-2.6.20/include/linux/vs_limit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vs_limit.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,140 @@
++#ifndef _VS_LIMIT_H
++#define _VS_LIMIT_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"
++
++
++#define vx_acc_cres(v,d,p,r) \
++ __vx_acc_cres(v, r, d, p, __FILE__, __LINE__)
++
++#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 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)
++
++#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)
++
+
-+#ifndef _LINUX_VROOT_H
-+#define _LINUX_VROOT_H
++/* process and file limits */
+
++#define vx_nproc_inc(p) \
++ vx_acc_cres((p)->vx_info, 1, p, RLIMIT_NPROC)
+
-+#ifdef __KERNEL__
++#define vx_nproc_dec(p) \
++ vx_acc_cres((p)->vx_info,-1, p, RLIMIT_NPROC)
+
-+/* Possible states of device */
-+enum {
-+ Vr_unbound,
-+ Vr_bound,
-+};
++#define vx_files_inc(f) \
++ vx_acc_cres_cond((f)->f_xid, 1, f, RLIMIT_NOFILE)
+
-+struct vroot_device {
-+ int vr_number;
-+ int vr_refcnt;
++#define vx_files_dec(f) \
++ vx_acc_cres_cond((f)->f_xid,-1, f, RLIMIT_NOFILE)
+
-+ struct semaphore vr_ctl_mutex;
-+ struct block_device *vr_device;
-+ int vr_state;
-+};
++#define vx_locks_inc(l) \
++ vx_acc_cres_cond((l)->fl_xid, 1, l, RLIMIT_LOCKS)
+
++#define vx_locks_dec(l) \
++ vx_acc_cres_cond((l)->fl_xid,-1, l, RLIMIT_LOCKS)
+
-+typedef struct block_device *(vroot_grb_func)(struct block_device *);
++#define vx_openfd_inc(f) \
++ vx_acc_cres(current->vx_info, 1, (void *)(long)(f), VLIMIT_OPENFD)
+
-+extern int register_vroot_grb(vroot_grb_func *);
-+extern int unregister_vroot_grb(vroot_grb_func *);
++#define vx_openfd_dec(f) \
++ vx_acc_cres(current->vx_info,-1, (void *)(long)(f), VLIMIT_OPENFD)
+
-+#endif /* __KERNEL__ */
+
-+#define MAX_VROOT_DEFAULT 8
++#define vx_cres_avail(v,n,r) \
++ __vx_cres_avail(v, r, n, __FILE__, __LINE__)
+
-+/*
-+ * IOCTL commands --- we will commandeer 0x56 ('V')
-+ */
+
-+#define VROOT_SET_DEV 0x5600
-+#define VROOT_CLR_DEV 0x5601
++#define vx_nproc_avail(n) \
++ vx_cres_avail(current->vx_info, n, RLIMIT_NPROC)
+
-+#endif /* _LINUX_VROOT_H */
---- linux-2.6.18.5/include/linux/vs_base.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vs_base.h 2006-11-21 02:45:10 +0100
-@@ -0,0 +1,109 @@
-+#ifndef _VX_VS_BASE_H
-+#define _VX_VS_BASE_H
++#define vx_files_avail(n) \
++ vx_cres_avail(current->vx_info, n, RLIMIT_NOFILE)
+
-+#include "vserver/context.h"
++#define vx_locks_avail(n) \
++ vx_cres_avail(current->vx_info, n, RLIMIT_LOCKS)
+
++#define vx_openfd_avail(n) \
++ vx_cres_avail(current->vx_info, n, VLIMIT_OPENFD)
+
-+#define vx_task_xid(t) ((t)->xid)
+
-+#define vx_current_xid() vx_task_xid(current)
++/* dentry limits */
+
-+#define current_vx_info() (current->vx_info)
++#define vx_dentry_inc(d) do { \
++ if (atomic_read(&d->d_count) == 1) \
++ vx_acc_cres(current->vx_info, 1, d, VLIMIT_DENTRY); \
++ } while (0)
+
++#define 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_check(c,m) __vx_check(vx_current_xid(),c,m)
++#define vx_dentry_avail(n) \
++ vx_cres_avail(current->vx_info, n, VLIMIT_DENTRY)
+
-+#define vx_weak_check(c,m) ((m) ? vx_check(c,m) : 1)
+
++/* socket limits */
+
-+/*
-+ * check current context for ADMIN/WATCH and
-+ * optionally against supplied argument
-+ */
-+static inline int __vx_check(xid_t cid, xid_t id, unsigned int mode)
-+{
-+ if (mode & VX_ARG_MASK) {
-+ if ((mode & VX_IDENT) &&
-+ (id == cid))
-+ return 1;
-+ }
-+ if (mode & VX_ATR_MASK) {
-+ if ((mode & VX_DYNAMIC) &&
-+ (id >= MIN_D_CONTEXT) &&
-+ (id <= MAX_S_CONTEXT))
-+ return 1;
-+ if ((mode & VX_STATIC) &&
-+ (id > 1) && (id < MIN_D_CONTEXT))
-+ return 1;
-+ }
-+ return (((mode & VX_ADMIN) && (cid == 0)) ||
-+ ((mode & VX_WATCH) && (cid == 1)) ||
-+ ((mode & VX_HOSTID) && (id == 0)));
-+}
++#define vx_sock_inc(s) \
++ vx_acc_cres((s)->sk_vx_info, 1, s, VLIMIT_NSOCK)
+
++#define vx_sock_dec(s) \
++ vx_acc_cres((s)->sk_vx_info,-1, s, VLIMIT_NSOCK)
+
-+#define __vx_state(v) ((v) ? ((v)->vx_state) : 0)
++#define vx_sock_avail(n) \
++ vx_cres_avail(current->vx_info, n, VLIMIT_NSOCK)
+
-+#define vx_info_state(v,m) (__vx_state(v) & (m))
+
++/* ipc resource limits */
+
-+/* generic flag merging */
++#define vx_ipcmsg_add(v,u,a) \
++ vx_add_cres(v, a, u, RLIMIT_MSGQUEUE)
+
-+#define vx_check_flags(v,m,f) (((v) & (m)) ^ (f))
++#define vx_ipcmsg_sub(v,u,a) \
++ vx_sub_cres(v, a, u, RLIMIT_MSGQUEUE)
+
-+#define vx_mask_flags(v,f,m) (((v) & ~(m)) | ((f) & (m)))
++#define vx_ipcmsg_avail(v,a) \
++ vx_cres_avail(v, a, RLIMIT_MSGQUEUE)
+
-+#define vx_mask_mask(v,f,m) (((v) & ~(m)) | ((v) & (f) & (m)))
+
-+#define vx_check_bit(v,n) ((v) & (1LL << (n)))
++#define vx_ipcshm_add(v,k,a) \
++ vx_add_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
+
++#define vx_ipcshm_sub(v,k,a) \
++ vx_sub_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
+
-+/* context flags */
++#define vx_ipcshm_avail(v,a) \
++ vx_cres_avail(v, a, VLIMIT_SHMEM)
+
-+#define __vx_flags(v) ((v) ? (v)->vx_flags : 0)
+
-+#define vx_current_flags() __vx_flags(current->vx_info)
++#define vx_semary_inc(a) \
++ vx_acc_cres(current->vx_info, 1, a, VLIMIT_SEMARY)
+
-+#define vx_info_flags(v,m,f) \
-+ vx_check_flags(__vx_flags(v),(m),(f))
++#define vx_semary_dec(a) \
++ vx_acc_cres(current->vx_info,-1, a, VLIMIT_SEMARY)
+
-+#define task_vx_flags(t,m,f) \
-+ ((t) && vx_info_flags((t)->vx_info, (m), (f)))
+
-+#define vx_flags(m,f) vx_info_flags(current->vx_info,(m),(f))
++#define vx_nsems_add(a,n) \
++ vx_add_cres(current->vx_info, n, a, VLIMIT_NSEMS)
+
++#define vx_nsems_sub(a,n) \
++ vx_sub_cres(current->vx_info, n, a, VLIMIT_NSEMS)
+
-+/* context caps */
+
-+#define __vx_ccaps(v) ((v) ? (v)->vx_ccaps : 0)
++#else
++#warning duplicate inclusion
++#endif
+--- linux-2.6.20/include/linux/vs_memory.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vs_memory.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,159 @@
++#ifndef _VS_MEMORY_H
++#define _VS_MEMORY_H
+
-+#define vx_current_ccaps() __vx_ccaps(current->vx_info)
++#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 vx_info_ccaps(v,c) (__vx_ccaps(v) & (c))
+
-+#define vx_ccaps(c) vx_info_ccaps(current->vx_info,(c))
++#define __acc_add_long(a,v) (*(v) += (a))
++#define __acc_inc_long(v) (++*(v))
++#define __acc_dec_long(v) (--*(v))
+
++#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 __vx_mcaps(v) ((v) ? (v)->vx_ccaps >> 32UL : ~0 )
+
-+#define vx_info_mcaps(v,c) (__vx_mcaps(v) & (c))
++#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)
+
-+#define vx_mcaps(c) vx_info_mcaps(current->vx_info,(c))
+
++#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_current_bcaps() \
-+ (((current->vx_info) && !vx_flags(VXF_STATE_SETUP, 0)) ? \
-+ current->vx_info->vx_bcaps : cap_bset)
++#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)
+
+
-+#define vx_current_initpid(n) \
-+ (current->vx_info && \
-+ (current->vx_info->vx_initpid == (n)))
+
-+#define vx_capable(b,c) (capable(b) || \
-+ ((current->euid == 0) && vx_ccaps(c)))
++#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 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 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))
++
++#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 vx_vmlocked_inc(m) vx_acc_vmlpage(m, 1)
++#define vx_vmlocked_dec(m) vx_acc_vmlpage(m,-1)
++#define vx_vmlocked_add(m,p) vx_acc_vmlpages(m, p)
++#define vx_vmlocked_sub(m,p) vx_acc_vmlpages(m,-(p))
++
++#define vx_file_rsspages_inc(m) vx_acc_file_rsspage(m, 1)
++#define vx_file_rsspages_dec(m) vx_acc_file_rsspage(m,-1)
++#define vx_file_rsspages_add(m,p) vx_acc_file_rsspages(m, p)
++#define vx_file_rsspages_sub(m,p) vx_acc_file_rsspages(m,-(p))
++
++#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_pages_avail(m,p,r) \
++ __vx_cres_avail((m)->mm_vx_info, r, p, __FILE__, __LINE__)
++
++#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__)
++
++
++enum {
++ VXPT_UNKNOWN = 0,
++ VXPT_ANON,
++ VXPT_NONE,
++ VXPT_FILE,
++ VXPT_SWAP,
++ VXPT_WRITE
++};
++
++#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" };
++*/
++
++ if (!vxi)
++ return;
++
++ 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]);
++}
++
++#define vx_page_fault(mm,vma,type,ret) __vx_page_fault(mm,vma,type,ret)
++#endif
++
+
++extern unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm);
+
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.18.5/include/linux/vs_context.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vs_context.h 2006-11-21 02:45:10 +0100
-@@ -0,0 +1,242 @@
-+#ifndef _VX_VS_CONTEXT_H
-+#define _VX_VS_CONTEXT_H
+--- linux-2.6.20/include/linux/vs_network.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vs_network.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,183 @@
++#ifndef _NX_VS_NETWORK_H
++#define _NX_VS_NETWORK_H
+
-+#include <linux/kernel.h>
++#include "vserver/context.h"
++#include "vserver/network.h"
++#include "vserver/base.h"
+#include "vserver/debug.h"
+
+
-+#define get_vx_info(i) __get_vx_info(i,__FILE__,__LINE__,__HERE__)
++#define get_nx_info(i) __get_nx_info(i,__FILE__,__LINE__)
+
-+static inline struct vx_info *__get_vx_info(struct vx_info *vxi,
-+ const char *_file, int _line, void *_here)
++static inline struct nx_info *__get_nx_info(struct nx_info *nxi,
++ const char *_file, int _line)
+{
-+ if (!vxi)
++ if (!nxi)
+ return NULL;
+
-+ vxlprintk(VXD_CBIT(xid, 2), "get_vx_info(%p[#%d.%d])",
-+ vxi, vxi?vxi->vx_id:0, vxi?atomic_read(&vxi->vx_usecnt):0,
++ 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);
-+ __vxh_get_vx_info(vxi, _here);
+
-+ atomic_inc(&vxi->vx_usecnt);
-+ return vxi;
++ atomic_inc(&nxi->nx_usecnt);
++ return nxi;
+}
+
+
-+extern void free_vx_info(struct vx_info *);
++extern void free_nx_info(struct nx_info *);
+
-+#define put_vx_info(i) __put_vx_info(i,__FILE__,__LINE__,__HERE__)
++#define put_nx_info(i) __put_nx_info(i,__FILE__,__LINE__)
+
-+static inline void __put_vx_info(struct vx_info *vxi,
-+ const char *_file, int _line, void *_here)
++static inline void __put_nx_info(struct nx_info *nxi, const char *_file, int _line)
+{
-+ if (!vxi)
++ if (!nxi)
+ return;
+
-+ vxlprintk(VXD_CBIT(xid, 2), "put_vx_info(%p[#%d.%d])",
-+ vxi, vxi?vxi->vx_id:0, vxi?atomic_read(&vxi->vx_usecnt):0,
++ 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);
-+ __vxh_put_vx_info(vxi, _here);
+
-+ if (atomic_dec_and_test(&vxi->vx_usecnt))
-+ free_vx_info(vxi);
++ if (atomic_dec_and_test(&nxi->nx_usecnt))
++ free_nx_info(nxi);
+}
+
+
-+#define init_vx_info(p,i) __init_vx_info(p,i,__FILE__,__LINE__,__HERE__)
++#define init_nx_info(p,i) __init_nx_info(p,i,__FILE__,__LINE__)
+
-+static inline void __init_vx_info(struct vx_info **vxp, struct vx_info *vxi,
-+ const char *_file, int _line, void *_here)
++static inline void __init_nx_info(struct nx_info **nxp, struct nx_info *nxi,
++ const char *_file, int _line)
+{
-+ if (vxi) {
-+ vxlprintk(VXD_CBIT(xid, 3),
-+ "init_vx_info(%p[#%d.%d])",
-+ vxi, vxi?vxi->vx_id:0,
-+ vxi?atomic_read(&vxi->vx_usecnt):0,
++ 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);
-+ __vxh_init_vx_info(vxi, vxp, _here);
+
-+ atomic_inc(&vxi->vx_usecnt);
++ atomic_inc(&nxi->nx_usecnt);
+ }
-+ *vxp = vxi;
++ *nxp = nxi;
+}
+
+
-+#define set_vx_info(p,i) __set_vx_info(p,i,__FILE__,__LINE__,__HERE__)
++#define set_nx_info(p,i) __set_nx_info(p,i,__FILE__,__LINE__)
+
-+static inline void __set_vx_info(struct vx_info **vxp, struct vx_info *vxi,
-+ const char *_file, int _line, void *_here)
++static inline void __set_nx_info(struct nx_info **nxp, struct nx_info *nxi,
++ const char *_file, int _line)
+{
-+ struct vx_info *vxo;
++ struct nx_info *nxo;
+
-+ if (!vxi)
++ if (!nxi)
+ return;
+
-+ vxlprintk(VXD_CBIT(xid, 3), "set_vx_info(%p[#%d.%d])",
-+ vxi, vxi?vxi->vx_id:0,
-+ vxi?atomic_read(&vxi->vx_usecnt):0,
++ 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);
-+ __vxh_set_vx_info(vxi, vxp, _here);
+
-+ atomic_inc(&vxi->vx_usecnt);
-+ vxo = xchg(vxp, vxi);
-+ BUG_ON(vxo);
++ atomic_inc(&nxi->nx_usecnt);
++ nxo = xchg(nxp, nxi);
++ BUG_ON(nxo);
+}
+
++#define clr_nx_info(p) __clr_nx_info(p,__FILE__,__LINE__)
+
-+#define clr_vx_info(p) __clr_vx_info(p,__FILE__,__LINE__,__HERE__)
-+
-+static inline void __clr_vx_info(struct vx_info **vxp,
-+ const char *_file, int _line, void *_here)
++static inline void __clr_nx_info(struct nx_info **nxp,
++ const char *_file, int _line)
+{
-+ struct vx_info *vxo;
++ struct nx_info *nxo;
+
-+ vxo = xchg(vxp, NULL);
-+ if (!vxo)
++ nxo = xchg(nxp, NULL);
++ if (!nxo)
+ return;
+
-+ vxlprintk(VXD_CBIT(xid, 3), "clr_vx_info(%p[#%d.%d])",
-+ vxo, vxo?vxo->vx_id:0,
-+ vxo?atomic_read(&vxo->vx_usecnt):0,
++ 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);
-+ __vxh_clr_vx_info(vxo, vxp, _here);
+
-+ if (atomic_dec_and_test(&vxo->vx_usecnt))
-+ free_vx_info(vxo);
++ if (atomic_dec_and_test(&nxo->nx_usecnt))
++ free_nx_info(nxo);
+}
+
+
-+#define claim_vx_info(v,p) \
-+ __claim_vx_info(v,p,__FILE__,__LINE__,__HERE__)
++#define claim_nx_info(v,p) __claim_nx_info(v,p,__FILE__,__LINE__)
+
-+static inline void __claim_vx_info(struct vx_info *vxi,
-+ struct task_struct *task,
-+ const char *_file, int _line, void *_here)
++static inline void __claim_nx_info(struct nx_info *nxi,
++ struct task_struct *task, const char *_file, int _line)
+{
-+ vxlprintk(VXD_CBIT(xid, 3), "claim_vx_info(%p[#%d.%d.%d]) %p",
-+ vxi, vxi?vxi->vx_id:0,
-+ vxi?atomic_read(&vxi->vx_usecnt):0,
-+ vxi?atomic_read(&vxi->vx_tasks):0,
++ 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);
-+ __vxh_claim_vx_info(vxi, task, _here);
+
-+ atomic_inc(&vxi->vx_tasks);
++ atomic_inc(&nxi->nx_tasks);
+}
+
+
-+extern void unhash_vx_info(struct vx_info *);
++extern void unhash_nx_info(struct nx_info *);
+
-+#define release_vx_info(v,p) \
-+ __release_vx_info(v,p,__FILE__,__LINE__,__HERE__)
++#define release_nx_info(v,p) __release_nx_info(v,p,__FILE__,__LINE__)
+
-+static inline void __release_vx_info(struct vx_info *vxi,
-+ struct task_struct *task,
-+ const char *_file, int _line, void *_here)
++static inline void __release_nx_info(struct nx_info *nxi,
++ struct task_struct *task, const char *_file, int _line)
+{
-+ vxlprintk(VXD_CBIT(xid, 3), "release_vx_info(%p[#%d.%d.%d]) %p",
-+ vxi, vxi?vxi->vx_id:0,
-+ vxi?atomic_read(&vxi->vx_usecnt):0,
-+ vxi?atomic_read(&vxi->vx_tasks):0,
++ 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);
-+ __vxh_release_vx_info(vxi, task, _here);
+
+ might_sleep();
+
-+ if (atomic_dec_and_test(&vxi->vx_tasks))
-+ unhash_vx_info(vxi);
++ if (atomic_dec_and_test(&nxi->nx_tasks))
++ unhash_nx_info(nxi);
+}
+
+
-+#define task_get_vx_info(p) \
-+ __task_get_vx_info(p,__FILE__,__LINE__,__HERE__)
++#define task_get_nx_info(i) __task_get_nx_info(i,__FILE__,__LINE__)
+
-+static inline struct vx_info *__task_get_vx_info(struct task_struct *p,
-+ const char *_file, int _line, void *_here)
++static __inline__ struct nx_info *__task_get_nx_info(struct task_struct *p,
++ const char *_file, int _line)
+{
-+ struct vx_info *vxi;
++ struct nx_info *nxi;
+
+ task_lock(p);
-+ vxlprintk(VXD_CBIT(xid, 5), "task_get_vx_info(%p)",
++ vxlprintk(VXD_CBIT(nid, 5), "task_get_nx_info(%p)",
+ p, _file, _line);
-+ vxi = __get_vx_info(p->vx_info, _file, _line, _here);
++ nxi = __get_nx_info(p->nx_info, _file, _line);
+ task_unlock(p);
-+ return vxi;
-+}
-+
-+
-+static inline void __wakeup_vx_info(struct vx_info *vxi)
-+{
-+ if (waitqueue_active(&vxi->vx_wait))
-+ wake_up_interruptible(&vxi->vx_wait);
++ return nxi;
+}
+
+
-+#define enter_vx_info(v,s) __enter_vx_info(v,s,__FILE__,__LINE__)
-+
-+static inline void __enter_vx_info(struct vx_info *vxi,
-+ struct vx_info_save *vxis, const char *_file, int _line)
-+{
-+ vxlprintk(VXD_CBIT(xid, 5), "enter_vx_info(%p[#%d],%p) %p[#%d,%p]",
-+ vxi, vxi ? vxi->vx_id : 0, vxis, current,
-+ current->xid, current->vx_info, _file, _line);
-+ vxis->vxi = xchg(¤t->vx_info, vxi);
-+ vxis->xid = current->xid;
-+ current->xid = vxi ? vxi->vx_id : 0;
-+}
+
-+#define leave_vx_info(s) __leave_vx_info(s,__FILE__,__LINE__)
+
-+static inline void __leave_vx_info(struct vx_info_save *vxis,
-+ const char *_file, int _line)
++static inline int addr_in_nx_info(struct nx_info *nxi, uint32_t addr)
+{
-+ vxlprintk(VXD_CBIT(xid, 5), "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]",
-+ vxis, vxis->xid, vxis->vxi, current,
-+ current->xid, current->vx_info, _file, _line);
-+ (void)xchg(¤t->vx_info, vxis->vxi);
-+ current->xid = vxis->xid;
-+}
-+
++ int n,i;
+
-+static inline void __enter_vx_admin(struct vx_info_save *vxis)
-+{
-+ vxis->vxi = xchg(¤t->vx_info, NULL);
-+ vxis->xid = xchg(¤t->xid, (xid_t)0);
-+}
++ if (!nxi)
++ return 1;
+
-+static inline void __leave_vx_admin(struct vx_info_save *vxis)
-+{
-+ (void)xchg(¤t->xid, vxis->xid);
-+ (void)xchg(¤t->vx_info, vxis->vxi);
++ n = nxi->nbipv4;
++ if (n && (nxi->ipv4[0] == 0))
++ return 1;
++ for (i=0; i<n; i++) {
++ if (nxi->ipv4[i] == addr)
++ return 1;
++ }
++ return 0;
+}
+
-+extern void exit_vx_info(struct task_struct *, int);
-+extern void exit_vx_info_early(struct task_struct *, int);
-+
-+
-+static inline
-+struct task_struct *vx_child_reaper(struct task_struct *p)
++static inline void exit_nx_info(struct task_struct *p)
+{
-+ struct vx_info *vxi = p->vx_info;
-+ struct task_struct *reaper = child_reaper;
-+
-+ if (!vxi)
-+ goto out;
-+
-+ BUG_ON(!p->vx_info->vx_reaper);
-+
-+ /* child reaper for the guest reaper */
-+ if (vxi->vx_reaper == p)
-+ goto out;
-+
-+ reaper = vxi->vx_reaper;
-+out:
-+ vxdprintk(VXD_CBIT(xid, 3),
-+ "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]\n",
-+ p, p->xid, p->pid, reaper, reaper->xid, reaper->pid);
-+ return reaper;
++ if (p->nx_info)
++ release_nx_info(p->nx_info, p);
+}
+
+
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.18.5/include/linux/vs_cvirt.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vs_cvirt.h 2006-11-07 19:01:49 +0100
-@@ -0,0 +1,157 @@
-+#ifndef _VX_VS_CVIRT_H
-+#define _VX_VS_CVIRT_H
+--- linux-2.6.20/include/linux/vs_pid.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vs_pid.h 2007-02-06 05:47:37 +0100
+@@ -0,0 +1,133 @@
++#ifndef _VS_PID_H
++#define _VS_PID_H
+
-+#include "vserver/cvirt.h"
++#include "vserver/base.h"
++#include "vserver/context.h"
+#include "vserver/debug.h"
-+
-+
-+/* utsname virtualization */
-+
-+static inline struct new_utsname *vx_new_utsname(void)
-+{
-+ if (current->vx_info)
-+ return ¤t->vx_info->cvirt.utsname;
-+ return &system_utsname;
-+}
-+
-+#define vx_new_uts(x) ((vx_new_utsname())->x)
++#include <linux/pid_namespace.h>
+
+
+/* pid faking stuff */
@@ -9400,55 +12210,16 @@
+}
+
+
-+static inline void vx_activate_task(struct task_struct *p)
-+{
-+ struct vx_info *vxi;
-+
-+ if ((vxi = p->vx_info)) {
-+ vx_update_load(vxi);
-+ atomic_inc(&vxi->cvirt.nr_running);
-+ }
-+}
-+
-+static inline void vx_deactivate_task(struct task_struct *p)
-+{
-+ struct vx_info *vxi;
-+
-+ if ((vxi = p->vx_info)) {
-+ vx_update_load(vxi);
-+ atomic_dec(&vxi->cvirt.nr_running);
-+ }
-+}
-+
-+static inline void vx_uninterruptible_inc(struct task_struct *p)
-+{
-+ struct vx_info *vxi;
-+
-+ if ((vxi = p->vx_info))
-+ atomic_inc(&vxi->cvirt.nr_uninterruptible);
-+}
-+
-+static inline void vx_uninterruptible_dec(struct task_struct *p)
-+{
-+ struct vx_info *vxi;
-+
-+ if ((vxi = p->vx_info))
-+ atomic_dec(&vxi->cvirt.nr_uninterruptible);
-+}
-+
-+
-+struct inode;
-+
+#define VXF_FAKE_INIT (VXF_INFO_INIT|VXF_STATE_INIT)
+
+static inline
-+int proc_pid_visible(struct task_struct *task, int pid)
++int vx_proc_task_visible(struct task_struct *task)
+{
-+ if ((pid == 1) &&
++ 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), VX_WATCH|VX_IDENT))
++ if (vx_check(vx_task_xid(task), VS_WATCH|VS_IDENT))
+ goto visible;
+ return 0;
+visible:
@@ -9456,13 +12227,13 @@
+}
+
+static inline
-+struct task_struct *find_proc_task_by_pid(int pid)
++struct task_struct *vx_find_proc_task_by_pid(int pid)
+{
+ struct task_struct *task = find_task_by_pid(pid);
+
-+ if (task && !proc_pid_visible(task, pid)) {
++ if (task && !vx_proc_task_visible(task)) {
+ vxdprintk(VXD_CBIT(misc, 6),
-+ "dropping task %p[#%u,%u] for %p[#%u,%u]",
++ "dropping task (find) %p[#%u,%u] for %p[#%u,%u]",
+ task, task->xid, task->pid,
+ current, current->xid, current->pid);
+ task = NULL;
@@ -9475,9 +12246,9 @@
+{
+ struct task_struct *task = get_pid_task(pid, PIDTYPE_PID);
+
-+ if (task && !proc_pid_visible(task, pid->nr)) {
++ if (task && !vx_proc_task_visible(task)) {
+ vxdprintk(VXD_CBIT(misc, 6),
-+ "dropping task %p[#%u,%u] for %p[#%u,%u]",
++ "dropping task (get) %p[#%u,%u] for %p[#%u,%u]",
+ task, task->xid, task->pid,
+ current, current->xid, current->pid);
+ put_task_struct(task);
@@ -9486,623 +12257,463 @@
+ return task;
+}
+
-+#else
-+#warning duplicate inclusion
-+#endif
---- linux-2.6.18.5/include/linux/vs_dlimit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vs_dlimit.h 2006-10-16 19:04:59 +0200
-@@ -0,0 +1,213 @@
-+#ifndef _VX_VS_DLIMIT_H
-+#define _VX_VS_DLIMIT_H
-+
-+#include "vserver/dlimit.h"
-+#include "vserver/debug.h"
-+
-+
-+#define get_dl_info(i) __get_dl_info(i,__FILE__,__LINE__)
-+
-+static inline struct dl_info *__get_dl_info(struct dl_info *dli,
-+ const char *_file, int _line)
-+{
-+ if (!dli)
-+ return NULL;
-+ vxlprintk(VXD_CBIT(dlim, 4), "get_dl_info(%p[#%d.%d])",
-+ dli, dli?dli->dl_xid:0, dli?atomic_read(&dli->dl_usecnt):0,
-+ _file, _line);
-+ atomic_inc(&dli->dl_usecnt);
-+ return dli;
-+}
-+
-+
-+#define free_dl_info(i) \
-+ call_rcu(&i->dl_rcu, rcu_free_dl_info);
-+
-+#define put_dl_info(i) __put_dl_info(i,__FILE__,__LINE__)
-+
-+static inline void __put_dl_info(struct dl_info *dli,
-+ const char *_file, int _line)
-+{
-+ if (!dli)
-+ return;
-+ vxlprintk(VXD_CBIT(dlim, 4), "put_dl_info(%p[#%d.%d])",
-+ dli, dli?dli->dl_xid:0, dli?atomic_read(&dli->dl_usecnt):0,
-+ _file, _line);
-+ if (atomic_dec_and_test(&dli->dl_usecnt))
-+ free_dl_info(dli);
-+}
-+
-+
-+#define __dlimit_char(d) ((d)?'*':' ')
-+
-+static inline int __dl_alloc_space(struct super_block *sb,
-+ xid_t xid, dlsize_t nr, const char *file, int line)
-+{
-+ struct dl_info *dli = NULL;
-+ int ret = 0;
-+
-+ if (nr == 0)
-+ goto out;
-+ dli = locate_dl_info(sb, xid);
-+ if (!dli)
-+ goto out;
-+
-+ spin_lock(&dli->dl_lock);
-+ ret = (dli->dl_space_used + nr > dli->dl_space_total);
-+ if (!ret)
-+ dli->dl_space_used += nr;
-+ spin_unlock(&dli->dl_lock);
-+ put_dl_info(dli);
-+out:
-+ vxlprintk(VXD_CBIT(dlim, 1),
-+ "ALLOC (%p,#%d)%c %lld bytes (%d)",
-+ sb, xid, __dlimit_char(dli), (long long)nr,
-+ ret, file, line);
-+ return ret;
-+}
-+
-+static inline void __dl_free_space(struct super_block *sb,
-+ xid_t xid, dlsize_t nr, const char *_file, int _line)
-+{
-+ struct dl_info *dli = NULL;
-+
-+ if (nr == 0)
-+ goto out;
-+ dli = locate_dl_info(sb, xid);
-+ if (!dli)
-+ goto out;
-+
-+ spin_lock(&dli->dl_lock);
-+ if (dli->dl_space_used > nr)
-+ dli->dl_space_used -= nr;
-+ else
-+ dli->dl_space_used = 0;
-+ spin_unlock(&dli->dl_lock);
-+ put_dl_info(dli);
-+out:
-+ vxlprintk(VXD_CBIT(dlim, 1),
-+ "FREE (%p,#%d)%c %lld bytes",
-+ sb, xid, __dlimit_char(dli), (long long)nr,
-+ _file, _line);
-+}
+
-+static inline int __dl_alloc_inode(struct super_block *sb,
-+ xid_t xid, const char *_file, int _line)
++static inline
++struct task_struct *vx_child_reaper(struct task_struct *p)
+{
-+ struct dl_info *dli;
-+ int ret = 0;
++ struct vx_info *vxi = p->vx_info;
++ struct task_struct *reaper = child_reaper(p);
+
-+ dli = locate_dl_info(sb, xid);
-+ if (!dli)
++ if (!vxi)
+ goto out;
+
-+ spin_lock(&dli->dl_lock);
-+ ret = (dli->dl_inodes_used >= dli->dl_inodes_total);
-+ if (!ret)
-+ dli->dl_inodes_used++;
-+#if 0
-+ else
-+ vxwprintk("DLIMIT hit (%p,#%d), inode %d>=%d @ %s:%d",
-+ sb, xid,
-+ dli->dl_inodes_used, dli->dl_inodes_total,
-+ file, line);
-+#endif
-+ spin_unlock(&dli->dl_lock);
-+ put_dl_info(dli);
-+out:
-+ vxlprintk(VXD_CBIT(dlim, 0),
-+ "ALLOC (%p,#%d)%c inode (%d)",
-+ sb, xid, __dlimit_char(dli), ret, _file, _line);
-+ return ret;
-+}
-+
-+static inline void __dl_free_inode(struct super_block *sb,
-+ xid_t xid, const char *_file, int _line)
-+{
-+ struct dl_info *dli;
++ BUG_ON(!p->vx_info->vx_reaper);
+
-+ dli = locate_dl_info(sb, xid);
-+ if (!dli)
++ /* child reaper for the guest reaper */
++ if (vxi->vx_reaper == p)
+ goto out;
+
-+ spin_lock(&dli->dl_lock);
-+ if (dli->dl_inodes_used > 1)
-+ dli->dl_inodes_used--;
-+ else
-+ dli->dl_inodes_used = 0;
-+ spin_unlock(&dli->dl_lock);
-+ put_dl_info(dli);
++ reaper = vxi->vx_reaper;
+out:
-+ vxlprintk(VXD_CBIT(dlim, 0),
-+ "FREE (%p,#%d)%c inode",
-+ sb, xid, __dlimit_char(dli), _file, _line);
-+}
-+
-+static inline void __dl_adjust_block(struct super_block *sb, xid_t xid,
-+ unsigned long *free_blocks, unsigned long *root_blocks,
-+ const char *_file, int _line)
-+{
-+ struct dl_info *dli;
-+ uint64_t broot, bfree;
-+
-+ dli = locate_dl_info(sb, xid);
-+ if (!dli)
-+ return;
-+
-+ spin_lock(&dli->dl_lock);
-+ broot = (dli->dl_space_total -
-+ (dli->dl_space_total >> 10) * dli->dl_nrlmult)
-+ >> sb->s_blocksize_bits;
-+ bfree = (dli->dl_space_total - dli->dl_space_used)
-+ >> sb->s_blocksize_bits;
-+ spin_unlock(&dli->dl_lock);
-+
-+ vxlprintk(VXD_CBIT(dlim, 2),
-+ "ADJUST: %lld,%lld on %ld,%ld [mult=%d]",
-+ (long long)bfree, (long long)broot,
-+ *free_blocks, *root_blocks, dli->dl_nrlmult,
-+ _file, _line);
-+ if (free_blocks) {
-+ if (*free_blocks > bfree)
-+ *free_blocks = bfree;
-+ }
-+ if (root_blocks) {
-+ if (*root_blocks > broot)
-+ *root_blocks = broot;
-+ }
-+ put_dl_info(dli);
++ 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;
+}
+
-+#define DLIMIT_ALLOC_SPACE(in, bytes) \
-+ __dl_alloc_space((in)->i_sb, (in)->i_xid, (dlsize_t)(bytes), \
-+ __FILE__, __LINE__ )
-+
-+#define DLIMIT_FREE_SPACE(in, bytes) \
-+ __dl_free_space((in)->i_sb, (in)->i_xid, (dlsize_t)(bytes), \
-+ __FILE__, __LINE__ )
-+
-+#define DLIMIT_ALLOC_BLOCK(in, nr) \
-+ __dl_alloc_space((in)->i_sb, (in)->i_xid, \
-+ ((dlsize_t)(nr)) << (in)->i_sb->s_blocksize_bits, \
-+ __FILE__, __LINE__ )
-+
-+#define DLIMIT_FREE_BLOCK(in, nr) \
-+ __dl_free_space((in)->i_sb, (in)->i_xid, \
-+ ((dlsize_t)(nr)) << (in)->i_sb->s_blocksize_bits, \
-+ __FILE__, __LINE__ )
-+
-+
-+#define DLIMIT_ALLOC_INODE(in) \
-+ __dl_alloc_inode((in)->i_sb, (in)->i_xid, __FILE__, __LINE__ )
-+
-+#define DLIMIT_FREE_INODE(in) \
-+ __dl_free_inode((in)->i_sb, (in)->i_xid, __FILE__, __LINE__ )
-+
-+
-+#define DLIMIT_ADJUST_BLOCK(sb, xid, fb, rb) \
-+ __dl_adjust_block(sb, xid, fb, rb, __FILE__, __LINE__ )
-+
+
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.18.5/include/linux/vs_limit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vs_limit.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,107 @@
-+#ifndef _VX_VS_LIMIT_H
-+#define _VX_VS_LIMIT_H
-+
-+#include "vserver/limit.h"
-+#include "vserver/debug.h"
-+#include "vserver/limit_int.h"
-+
-+
-+#define vx_acc_cres(v,d,p,r) \
-+ __vx_acc_cres(v, r, d, p, __FILE__, __LINE__)
+--- linux-2.6.20/include/linux/vs_sched.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vs_sched.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,110 @@
++#ifndef _VS_SCHED_H
++#define _VS_SCHED_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__)
-+
-+
-+#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)
++#include "vserver/base.h"
++#include "vserver/context.h"
++#include "vserver/sched.h"
+
-+#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 VAVAVOOM_RATIO 50
+
-+/* process and file limits */
++#define MAX_PRIO_BIAS 20
++#define MIN_PRIO_BIAS -20
+
-+#define vx_nproc_inc(p) \
-+ vx_acc_cres((p)->vx_info, 1, p, RLIMIT_NPROC)
+
-+#define vx_nproc_dec(p) \
-+ vx_acc_cres((p)->vx_info,-1, p, RLIMIT_NPROC)
++#ifdef CONFIG_VSERVER_HARDCPU
+
-+#define vx_files_inc(f) \
-+ vx_acc_cres_cond((f)->f_xid, 1, f, RLIMIT_NOFILE)
++/*
++ * effective_prio - return the priority that is based on the static
++ * priority but is modified by bonuses/penalties.
++ *
++ * We scale the actual sleep average [0 .... MAX_SLEEP_AVG]
++ * into a -4 ... 0 ... +4 bonus/penalty range.
++ *
++ * Additionally, we scale another amount based on the number of
++ * CPU tokens currently held by the context, if the process is
++ * part of a context (and the appropriate SCHED flag is set).
++ * This ranges from -5 ... 0 ... +15, quadratically.
++ *
++ * So, the total bonus is -9 .. 0 .. +19
++ * We use ~50% of the full 0...39 priority range so that:
++ *
++ * 1) nice +19 interactive tasks do not preempt nice 0 CPU hogs.
++ * 2) nice -20 CPU hogs do not get preempted by nice 0 tasks.
++ * unless that context is far exceeding its CPU allocation.
++ *
++ * Both properties are important to certain workloads.
++ */
++static inline
++int vx_effective_vavavoom(struct _vx_sched_pc *sched_pc, int max_prio)
++{
++ int vavavoom, max;
+
-+#define vx_files_dec(f) \
-+ vx_acc_cres_cond((f)->f_xid,-1, f, RLIMIT_NOFILE)
++ /* 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;
++}
+
-+#define vx_locks_inc(l) \
-+ vx_acc_cres_cond((l)->fl_xid, 1, l, RLIMIT_LOCKS)
+
-+#define vx_locks_dec(l) \
-+ vx_acc_cres_cond((l)->fl_xid,-1, l, RLIMIT_LOCKS)
++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;
+
-+#define vx_openfd_inc(f) \
-+ vx_acc_cres(current->vx_info, 1, (void *)(long)(f), VLIMIT_OPENFD)
++ if (!vxi)
++ return prio;
+
-+#define vx_openfd_dec(f) \
-+ vx_acc_cres(current->vx_info,-1, (void *)(long)(f), VLIMIT_OPENFD)
++ 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 vx_cres_avail(v,n,r) \
-+ __vx_cres_avail(v, r, n, __FILE__, __LINE__)
++#else /* !CONFIG_VSERVER_HARDCPU */
+
++static inline
++int vx_adjust_prio(struct task_struct *p, int prio, int max_user)
++{
++ struct vx_info *vxi = p->vx_info;
+
-+#define vx_nproc_avail(n) \
-+ vx_cres_avail(current->vx_info, n, RLIMIT_NPROC)
++ if (vxi)
++ prio += vx_cpu(vxi, sched_pc).prio_bias;
++ return prio;
++}
+
-+#define vx_files_avail(n) \
-+ vx_cres_avail(current->vx_info, n, RLIMIT_NOFILE)
++#endif /* CONFIG_VSERVER_HARDCPU */
+
-+#define vx_locks_avail(n) \
-+ vx_cres_avail(current->vx_info, n, RLIMIT_LOCKS)
+
-+#define vx_openfd_avail(n) \
-+ vx_cres_avail(current->vx_info, n, VLIMIT_OPENFD)
++static inline void vx_account_user(struct vx_info *vxi,
++ cputime_t cputime, int nice)
++{
++ if (!vxi)
++ return;
++ vx_cpu(vxi, sched_pc).user_ticks += cputime;
++}
+
++static inline void vx_account_system(struct vx_info *vxi,
++ cputime_t cputime, int idle)
++{
++ if (!vxi)
++ return;
++ vx_cpu(vxi, sched_pc).sys_ticks += cputime;
++}
+
-+/* socket limits */
++#else
++#warning duplicate inclusion
++#endif
+--- linux-2.6.20/include/linux/vs_socket.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vs_socket.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,67 @@
++#ifndef _VS_SOCKET_H
++#define _VS_SOCKET_H
+
-+#define vx_sock_inc(s) \
-+ vx_acc_cres((s)->sk_vx_info, 1, s, VLIMIT_NSOCK)
++#include "vserver/debug.h"
++#include "vserver/base.h"
++#include "vserver/cacct.h"
++#include "vserver/context.h"
+
-+#define vx_sock_dec(s) \
-+ vx_acc_cres((s)->sk_vx_info,-1, s, VLIMIT_NSOCK)
+
-+#define vx_sock_avail(n) \
-+ vx_cres_avail(current->vx_info, n, VLIMIT_NSOCK)
++/* socket accounting */
+
++#include <linux/socket.h>
+
-+/* ipc resource limits */
++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 vx_ipcmsg_add(v,u,a) \
-+ vx_add_cres(v, a, u, RLIMIT_MSGQUEUE)
++#define vx_acc_sock(v,f,p,s) \
++ __vx_acc_sock((v), (f), (p), (s), __FILE__, __LINE__)
+
-+#define vx_ipcmsg_sub(v,u,a) \
-+ vx_sub_cres(v, a, u, RLIMIT_MSGQUEUE)
++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_ipcmsg_avail(v,a) \
-+ vx_cres_avail(v, a, RLIMIT_MSGQUEUE)
++ atomic_long_inc(&vxi->cacct.sock[type][pos].count);
++ atomic_long_add(size, &vxi->cacct.sock[type][pos].total);
++ }
++}
+
++#define vx_sock_recv(sk,s) \
++ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 0, (s))
++#define vx_sock_send(sk,s) \
++ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 1, (s))
++#define vx_sock_fail(sk,s) \
++ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 2, (s))
+
-+#define vx_ipcshm_add(v,k,a) \
-+ vx_add_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
+
-+#define vx_ipcshm_sub(v,k,a) \
-+ vx_sub_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
++#define sock_vx_init(s) do { \
++ (s)->sk_xid = 0; \
++ (s)->sk_vx_info = NULL; \
++ } while (0)
+
-+#define vx_ipcshm_avail(v,a) \
-+ vx_cres_avail(v, a, VLIMIT_SHMEM)
++#define sock_nx_init(s) do { \
++ (s)->sk_nid = 0; \
++ (s)->sk_nx_info = NULL; \
++ } while (0)
+
+
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.18.5/include/linux/vs_memory.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vs_memory.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,107 @@
-+#ifndef _VX_VS_MEMORY_H
-+#define _VX_VS_MEMORY_H
-+
-+#include "vserver/limit.h"
-+#include "vserver/debug.h"
-+#include "vserver/limit_int.h"
-+
-+
-+#define __vx_add_long(a,v) (*(v) += (a))
-+#define __vx_inc_long(v) (++*(v))
-+#define __vx_dec_long(v) (--*(v))
-+
-+#if NR_CPUS >= CONFIG_SPLIT_PTLOCK_CPUS
-+#define __vx_add_value(a,v) atomic_long_add(a,v)
-+#define __vx_inc_value(v) atomic_long_inc(v)
-+#define __vx_dec_value(v) atomic_long_dec(v)
-+#else /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
-+#define __vx_add_value(a,v) __vx_add_long(a,v)
-+#define __vx_inc_value(v) __vx_inc_long(v)
-+#define __vx_dec_value(v) __vx_dec_long(v)
-+#endif /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
+--- linux-2.6.20/include/linux/vs_tag.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vs_tag.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,44 @@
++#ifndef _VS_TAG_H
++#define _VS_TAG_H
+
++#include <linux/vserver/tag.h>
+
-+#define vx_acc_page(m,d,v,r) do { \
-+ if ((d) > 0) \
-+ __vx_inc_long(&(m->v)); \
-+ else \
-+ __vx_dec_long(&(m->v)); \
-+ __vx_acc_cres(m->mm_vx_info, r, d, m, __FILE__, __LINE__); \
-+} while (0)
++/* check conditions */
+
-+#define vx_acc_page_atomic(m,d,v,r) do { \
-+ if ((d) > 0) \
-+ __vx_inc_value(&(m->v)); \
-+ else \
-+ __vx_dec_value(&(m->v)); \
-+ __vx_acc_cres(m->mm_vx_info, r, d, m, __FILE__, __LINE__); \
-+} while (0)
++#define DX_ADMIN 0x0001
++#define DX_WATCH 0x0002
++#define DX_HOSTID 0x0008
+
++#define DX_IDENT 0x0010
+
-+#define vx_acc_pages(m,p,v,r) do { \
-+ unsigned long __p = (p); \
-+ __vx_add_long(__p, &(m->v)); \
-+ __vx_add_cres(m->mm_vx_info, r, __p, m, __FILE__, __LINE__); \
-+} while (0)
++#define DX_ARG_MASK 0x0010
+
-+#define vx_acc_pages_atomic(m,p,v,r) do { \
-+ unsigned long __p = (p); \
-+ __vx_add_value(__p, &(m->v)); \
-+ __vx_add_cres(m->mm_vx_info, r, __p, m, __FILE__, __LINE__); \
-+} while (0)
+
++#define dx_task_tag(t) ((t)->xid)
+
++#define dx_current_tag() dx_task_tag(current)
+
-+#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, RLIMIT_RSS)
-+#define vx_acc_anon_rsspage(m,d) \
-+ vx_acc_page_atomic(m, d, _anon_rss, VLIMIT_ANON)
++#define dx_check(c,m) __dx_check(dx_current_tag(),c,m)
+
-+#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, RLIMIT_RSS)
-+#define vx_acc_anon_rsspages(m,p) \
-+ vx_acc_pages_atomic(m, p, _anon_rss, VLIMIT_ANON)
++#define dx_weak_check(c,m) ((m) ? dx_check(c,m) : 1)
+
-+#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))
+
-+#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))
++/*
++ * check current context for ADMIN/WATCH and
++ * optionally against supplied argument
++ */
++static inline int __dx_check(tag_t cid, tag_t id, unsigned int mode)
++{
++ if (mode & DX_ARG_MASK) {
++ if ((mode & DX_IDENT) &&
++ (id == cid))
++ return 1;
++ }
++ return (((mode & DX_ADMIN) && (cid == 0)) ||
++ ((mode & DX_WATCH) && (cid == 1)) ||
++ ((mode & DX_HOSTID) && (id == 0)));
++}
+
-+#define 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))
++#else
++#warning duplicate inclusion
++#endif
+--- linux-2.6.20/include/linux/vs_time.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vs_time.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,19 @@
++#ifndef _VS_TIME_H
++#define _VS_TIME_H
+
-+#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 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))
++/* time faking stuff */
+
++#ifdef CONFIG_VSERVER_VTIME
+
-+#define vx_pages_avail(m,p,r) \
-+ __vx_cres_avail((m)->mm_vx_info, r, p, __FILE__, __LINE__)
++extern void vx_gettimeofday(struct timeval *tv);
++extern int vx_settimeofday(struct timespec *ts);
+
-+#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_rsspages_avail(m,p) vx_pages_avail(m, p, RLIMIT_RSS)
-+#define vx_anonpages_avail(m,p) vx_pages_avail(m, p, VLIMIT_ANON)
++#else
++#define vx_gettimeofday(t) do_gettimeofday(t)
++#define vx_settimeofday(t) do_settimeofday(t)
++#endif
+
+#else
+#warning duplicate inclusion
+#endif
---- linux-2.6.18.5/include/linux/vs_network.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vs_network.h 2006-11-21 02:45:10 +0100
-@@ -0,0 +1,220 @@
-+#ifndef _NX_VS_NETWORK_H
-+#define _NX_VS_NETWORK_H
-+
-+#include "vserver/network.h"
-+#include "vserver/debug.h"
-+
+--- linux-2.6.20/include/linux/vserver/Kbuild 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/Kbuild 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,9 @@
++
++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 sched_cmd.h signal_cmd.h debug_cmd.h
++
++unifdef-y += switch.h network.h monitor.h inode.h
++
++unifdef-y += legacy.h
++
+--- linux-2.6.20/include/linux/vserver/base.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/base.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,237 @@
++#ifndef _VX_BASE_H
++#define _VX_BASE_H
+
-+#define get_nx_info(i) __get_nx_info(i,__FILE__,__LINE__)
+
-+static inline struct nx_info *__get_nx_info(struct nx_info *nxi,
-+ const char *_file, int _line)
-+{
-+ if (!nxi)
-+ return NULL;
++/* context state changes */
+
-+ 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);
++enum {
++ VSC_STARTUP = 1,
++ VSC_SHUTDOWN,
+
-+ atomic_inc(&nxi->nx_usecnt);
-+ return nxi;
-+}
++ VSC_NETUP,
++ VSC_NETDOWN,
++};
+
+
-+extern void free_nx_info(struct nx_info *);
++#define MAX_S_CONTEXT 65535 /* Arbitrary limit */
+
-+#define put_nx_info(i) __put_nx_info(i,__FILE__,__LINE__)
++#ifdef CONFIG_VSERVER_DYNAMIC_IDS
++#define MIN_D_CONTEXT 49152 /* dynamic contexts start here */
++#else
++#define MIN_D_CONTEXT 65536
++#endif
+
-+static inline void __put_nx_info(struct nx_info *nxi, const char *_file, int _line)
-+{
-+ if (!nxi)
-+ return;
++/* check conditions */
+
-+ 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 VS_ADMIN 0x0001
++#define VS_WATCH 0x0002
++#define VS_HIDE 0x0004
++#define VS_HOSTID 0x0008
++
++#define VS_IDENT 0x0010
++#define VS_EQUIV 0x0020
++#define VS_PARENT 0x0040
++#define VS_CHILD 0x0080
++
++#define VS_ARG_MASK 0x00F0
++
++#define VS_DYNAMIC 0x0100
++#define VS_STATIC 0x0200
++
++#define VS_ATR_MASK 0x0F00
++
++#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
+
-+ if (atomic_dec_and_test(&nxi->nx_usecnt))
-+ free_nx_info(nxi);
-+}
++#define VS_HARDIRQ 0x1000
++#define VS_SOFTIRQ 0x2000
++#define VS_IRQ 0x4000
+
++#define VS_IRQ_MASK 0xF000
+
-+#define init_nx_info(p,i) __init_nx_info(p,i,__FILE__,__LINE__)
++#include <linux/hardirq.h>
+
-+static inline void __init_nx_info(struct nx_info **nxp, struct nx_info *nxi,
-+ const char *_file, int _line)
++/*
++ * check current context for ADMIN/WATCH and
++ * optionally against supplied argument
++ */
++static inline int __vs_check(int cid, int id, unsigned int mode)
+{
-+ 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);
-+
-+ atomic_inc(&nxi->nx_usecnt);
++ if (mode & VS_ARG_MASK) {
++ if ((mode & VS_IDENT) &&
++ (id == cid))
++ return 1;
+ }
-+ *nxp = nxi;
++ if (mode & VS_ATR_MASK) {
++ if ((mode & VS_DYNAMIC) &&
++ (id >= MIN_D_CONTEXT) &&
++ (id <= MAX_S_CONTEXT))
++ return 1;
++ if ((mode & VS_STATIC) &&
++ (id > 1) && (id < MIN_D_CONTEXT))
++ return 1;
++ }
++ if (mode & VS_IRQ_MASK) {
++ if ((mode & VS_IRQ) && unlikely(in_interrupt()))
++ return 1;
++ if ((mode & VS_HARDIRQ) && unlikely(in_irq()))
++ return 1;
++ if ((mode & VS_SOFTIRQ) && unlikely(in_softirq()))
++ return 1;
++ }
++ return (((mode & VS_ADMIN) && (cid == 0)) ||
++ ((mode & VS_WATCH) && (cid == 1)) ||
++ ((mode & VS_HOSTID) && (id == 0)));
+}
+
++#define vx_task_xid(t) ((t)->xid)
+
-+#define set_nx_info(p,i) __set_nx_info(p,i,__FILE__,__LINE__)
++#define vx_current_xid() vx_task_xid(current)
+
-+static inline void __set_nx_info(struct nx_info **nxp, struct nx_info *nxi,
-+ const char *_file, int _line)
-+{
-+ struct nx_info *nxo;
++#define current_vx_info() (current->vx_info)
+
-+ if (!nxi)
-+ return;
+
-+ vxlprintk(VXD_CBIT(nid, 3), "set_nx_info(%p[#%d.%d])",
-+ nxi, nxi?nxi->nx_id:0,
-+ nxi?atomic_read(&nxi->nx_usecnt):0,
-+ _file, _line);
++#define vx_check(c,m) __vs_check(vx_current_xid(),c,(m)|VS_IRQ)
+
-+ atomic_inc(&nxi->nx_usecnt);
-+ nxo = xchg(nxp, nxi);
-+ BUG_ON(nxo);
-+}
++#define vx_weak_check(c,m) ((m) ? vx_check(c,m) : 1)
+
-+#define clr_nx_info(p) __clr_nx_info(p,__FILE__,__LINE__)
+
-+static inline void __clr_nx_info(struct nx_info **nxp,
-+ const char *_file, int _line)
-+{
-+ struct nx_info *nxo;
++#define nx_task_nid(t) ((t)->nid)
+
-+ nxo = xchg(nxp, NULL);
-+ if (!nxo)
-+ return;
++#define nx_current_nid() nx_task_nid(current)
+
-+ vxlprintk(VXD_CBIT(nid, 3), "clr_nx_info(%p[#%d.%d])",
-+ nxo, nxo?nxo->nx_id:0,
-+ nxo?atomic_read(&nxo->nx_usecnt):0,
-+ _file, _line);
++#define current_nx_info() (current->nx_info)
+
-+ if (atomic_dec_and_test(&nxo->nx_usecnt))
-+ free_nx_info(nxo);
-+}
+
++#define nx_check(c,m) __vs_check(nx_current_nid(),c,m)
+
-+#define claim_nx_info(v,p) __claim_nx_info(v,p,__FILE__,__LINE__)
++#define nx_weak_check(c,m) ((m) ? nx_check(c,m) : 1)
+
-+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);
+
-+ atomic_inc(&nxi->nx_tasks);
-+}
+
++/* generic flag merging */
+
-+extern void unhash_nx_info(struct nx_info *);
++#define vs_check_flags(v,m,f) (((v) & (m)) ^ (f))
+
-+#define release_nx_info(v,p) __release_nx_info(v,p,__FILE__,__LINE__)
++#define vs_mask_flags(v,f,m) (((v) & ~(m)) | ((f) & (m)))
+
-+static inline void __release_nx_info(struct nx_info *nxi,
-+ struct task_struct *task, const char *_file, int _line)
-+{
-+ vxlprintk(VXD_CBIT(nid, 3), "release_nx_info(%p[#%d.%d.%d]) %p",
-+ nxi, nxi?nxi->nx_id:0,
-+ nxi?atomic_read(&nxi->nx_usecnt):0,
-+ nxi?atomic_read(&nxi->nx_tasks):0,
-+ task, _file, _line);
++#define vs_mask_mask(v,f,m) (((v) & ~(m)) | ((v) & (f) & (m)))
+
-+ might_sleep();
++#define vs_check_bit(v,n) ((v) & (1LL << (n)))
+
-+ if (atomic_dec_and_test(&nxi->nx_tasks))
-+ unhash_nx_info(nxi);
-+}
+
++/* context flags */
+
-+#define task_get_nx_info(i) __task_get_nx_info(i,__FILE__,__LINE__)
++#define __vx_flags(v) ((v) ? (v)->vx_flags : 0)
+
-+static __inline__ struct nx_info *__task_get_nx_info(struct task_struct *p,
-+ const char *_file, int _line)
-+{
-+ struct nx_info *nxi;
++#define vx_current_flags() __vx_flags(current->vx_info)
+
-+ 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;
-+}
++#define vx_info_flags(v,m,f) \
++ vs_check_flags(__vx_flags(v),(m),(f))
+
++#define task_vx_flags(t,m,f) \
++ ((t) && vx_info_flags((t)->vx_info, (m), (f)))
+
-+#define nx_task_nid(t) ((t)->nid)
++#define vx_flags(m,f) vx_info_flags(current->vx_info,(m),(f))
+
-+#define nx_current_nid() nx_task_nid(current)
+
-+#define current_nx_info() (current->nx_info)
++/* context caps */
+
++#define __vx_ccaps(v) ((v) ? (v)->vx_ccaps : 0)
+
-+#define nx_check(c,m) __nx_check(nx_current_nid(),c,m)
++#define vx_current_ccaps() __vx_ccaps(current->vx_info)
+
-+#define nx_weak_check(c,m) ((m) ? nx_check(c,m) : 1)
++#define vx_info_ccaps(v,c) (__vx_ccaps(v) & (c))
+
++#define vx_ccaps(c) vx_info_ccaps(current->vx_info,(c))
+
-+#define __nx_state(v) ((v) ? ((v)->nx_state) : 0)
+
-+#define nx_info_state(v,m) (__nx_state(v) & (m))
+
++/* network flags */
+
+#define __nx_flags(v) ((v) ? (v)->nx_flags : 0)
+
+#define nx_current_flags() __nx_flags(current->nx_info)
+
+#define nx_info_flags(v,m,f) \
-+ vx_check_flags(__nx_flags(v),(m),(f))
++ vs_check_flags(__nx_flags(v),(m),(f))
+
+#define task_nx_flags(t,m,f) \
+ ((t) && nx_info_flags((t)->nx_info, (m), (f)))
@@ -10110,7 +12721,7 @@
+#define nx_flags(m,f) nx_info_flags(current->nx_info,(m),(f))
+
+
-+/* context caps */
++/* network caps */
+
+#define __nx_ncaps(v) ((v) ? (v)->nx_ncaps : 0)
+
@@ -10121,226 +12732,187 @@
+#define nx_ncaps(c) nx_info_ncaps(current->nx_info,(c))
+
+
-+static inline int addr_in_nx_info(struct nx_info *nxi, uint32_t addr)
-+{
-+ int n,i;
++/* context mask capabilities */
+
-+ if (!nxi)
-+ return 1;
++#define __vx_mcaps(v) ((v) ? (v)->vx_ccaps >> 32UL : ~0 )
+
-+ n = nxi->nbipv4;
-+ if (n && (nxi->ipv4[0] == 0))
-+ return 1;
-+ for (i=0; i<n; i++) {
-+ if (nxi->ipv4[i] == addr)
-+ return 1;
-+ }
-+ return 0;
-+}
++#define vx_info_mcaps(v,c) (__vx_mcaps(v) & (c))
+
-+static inline void exit_nx_info(struct task_struct *p)
-+{
-+ if (p->nx_info)
-+ release_nx_info(p->nx_info, p);
-+}
++#define vx_mcaps(c) vx_info_mcaps(current->vx_info,(c))
+
+
-+#else
-+#warning duplicate inclusion
-+#endif
---- linux-2.6.18.5/include/linux/vs_sched.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vs_sched.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,92 @@
-+#ifndef _VX_VS_SCHED_H
-+#define _VX_VS_SCHED_H
++/* context bcap mask */
+
-+#include "vserver/sched.h"
++#define __vx_bcaps(v) ((v) ? (v)->vx_bcaps : ~0 )
+
++#define vx_current_bcaps() __vx_bcaps(current->vx_info)
+
-+#define VAVAVOOM_RATIO 50
++#define vx_info_bcaps(v,c) (__vx_bcaps(v) & (c))
+
-+#define MAX_PRIO_BIAS 20
-+#define MIN_PRIO_BIAS -20
++#define vx_bcaps(c) vx_info_bcaps(current->vx_info,(c))
+
+
-+static inline int vx_tokens_avail(struct vx_info *vxi)
-+{
-+ return atomic_read(&vxi->sched.tokens);
-+}
++#define vx_info_cap_bset(v) ((v) ? (v)->vx_cap_bset : cap_bset)
+
-+static inline void vx_consume_token(struct vx_info *vxi)
-+{
-+ atomic_dec(&vxi->sched.tokens);
-+}
++#define vx_current_cap_bset() vx_info_cap_bset(current->vx_info)
+
-+static inline int vx_need_resched(struct task_struct *p)
-+{
-+#ifdef CONFIG_VSERVER_HARDCPU
-+ struct vx_info *vxi = p->vx_info;
-+#endif
-+ int slice = --p->time_slice;
+
-+#ifdef CONFIG_VSERVER_HARDCPU
-+ if (vxi) {
-+ int tokens;
++#define __vx_info_mbcap(v,b) \
++ (!vx_info_flags(v, VXF_STATE_SETUP, 0) ? \
++ vx_info_bcaps(v, b) : (b))
+
-+ if ((tokens = vx_tokens_avail(vxi)) > 0)
-+ vx_consume_token(vxi);
-+ /* for tokens > 0, one token was consumed */
-+ if (tokens < 2)
-+ return 1;
-+ }
-+#endif
-+ return (slice == 0);
-+}
++#define vx_info_mbcap(v,b) __vx_info_mbcap(v,cap_t(b))
+
++#define task_vx_mbcap(t,b) \
++ vx_info_mbcap((t)->vx_info, (t)->b)
+
-+static inline void vx_onhold_inc(struct vx_info *vxi)
-+{
-+ int onhold = atomic_read(&vxi->cvirt.nr_onhold);
++#define vx_mbcap(b) task_vx_mbcap(current,b)
+
-+ atomic_inc(&vxi->cvirt.nr_onhold);
-+ if (!onhold)
-+ vxi->cvirt.onhold_last = jiffies;
-+}
++#define vx_cap_raised(v,c,f) (vx_info_mbcap(v,c) & CAP_TO_MASK(f))
+
-+static inline void __vx_onhold_update(struct vx_info *vxi)
-+{
-+ int cpu = smp_processor_id();
-+ uint32_t now = jiffies;
-+ uint32_t delta = now - vxi->cvirt.onhold_last;
++#define vx_capable(b,c) (capable(b) || \
++ (cap_raised(current->cap_effective,b) && vx_ccaps(c)))
+
-+ vxi->cvirt.onhold_last = now;
-+ vxi->sched.cpu[cpu].hold_ticks += delta;
-+}
+
-+static inline void vx_onhold_dec(struct vx_info *vxi)
-+{
-+ if (atomic_dec_and_test(&vxi->cvirt.nr_onhold))
-+ __vx_onhold_update(vxi);
-+}
++#define vx_current_initpid(n) \
++ (current->vx_info && \
++ (current->vx_info->vx_initpid == (n)))
+
-+static inline void vx_account_user(struct vx_info *vxi,
-+ cputime_t cputime, int nice)
-+{
-+ int cpu = smp_processor_id();
+
-+ if (!vxi)
-+ return;
-+ vxi->sched.cpu[cpu].user_ticks += cputime;
-+}
++#define __vx_state(v) ((v) ? ((v)->vx_state) : 0)
+
-+static inline void vx_account_system(struct vx_info *vxi,
-+ cputime_t cputime, int idle)
-+{
-+ int cpu = smp_processor_id();
++#define vx_info_state(v,m) (__vx_state(v) & (m))
+
-+ if (!vxi)
-+ return;
-+ vxi->sched.cpu[cpu].sys_ticks += cputime;
-+}
+
-+#else
-+#warning duplicate inclusion
++#define __nx_state(v) ((v) ? ((v)->nx_state) : 0)
++
++#define nx_info_state(v,m) (__nx_state(v) & (m))
++
+#endif
---- linux-2.6.18.5/include/linux/vs_socket.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vs_socket.h 2006-11-21 04:54:54 +0100
-@@ -0,0 +1,65 @@
-+#ifndef _VX_VS_SOCKET_H
-+#define _VX_VS_SOCKET_H
+--- linux-2.6.20/include/linux/vserver/cacct.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/cacct.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,15 @@
++#ifndef _VX_CACCT_H
++#define _VX_CACCT_H
+
-+#include "vserver/debug.h"
+
++enum sock_acc_field {
++ VXA_SOCK_UNSPEC = 0,
++ VXA_SOCK_UNIX,
++ VXA_SOCK_INET,
++ VXA_SOCK_INET6,
++ VXA_SOCK_PACKET,
++ VXA_SOCK_OTHER,
++ VXA_SOCK_SIZE /* array size */
++};
++
++#endif /* _VX_CACCT_H */
+--- linux-2.6.20/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/cacct_cmd.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,23 @@
++#ifndef _VX_CACCT_CMD_H
++#define _VX_CACCT_CMD_H
+
-+/* socket accounting */
+
-+#include <linux/socket.h>
++/* virtual host info name commands */
++
++#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0)
++
++struct vcmd_sock_stat_v0 {
++ uint32_t field;
++ uint32_t count[3];
++ uint64_t total[3];
++};
++
++
++#ifdef __KERNEL__
++
++#include <linux/compiler.h>
++
++extern int vc_sock_stat(struct vx_info *, void __user *);
++
++#endif /* __KERNEL__ */
++#endif /* _VX_CACCT_CMD_H */
+--- linux-2.6.20/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/cacct_def.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,43 @@
++#ifndef _VX_CACCT_DEF_H
++#define _VX_CACCT_DEF_H
++
++#include <asm/atomic.h>
+#include <linux/vserver/cacct.h>
+
-+static inline int vx_sock_type(int family)
-+{
-+ switch (family) {
-+ case PF_UNSPEC:
-+ return VXA_SOCK_UNSPEC;
-+ case PF_UNIX:
-+ return VXA_SOCK_UNIX;
-+ case PF_INET:
-+ return VXA_SOCK_INET;
-+ case PF_INET6:
-+ return VXA_SOCK_INET6;
-+ case PF_PACKET:
-+ return VXA_SOCK_PACKET;
-+ default:
-+ return VXA_SOCK_OTHER;
-+ }
-+}
+
-+#define vx_acc_sock(v,f,p,s) \
-+ __vx_acc_sock((v), (f), (p), (s), __FILE__, __LINE__)
++struct _vx_sock_acc {
++ atomic_long_t count;
++ atomic_long_t total;
++};
+
-+static inline void __vx_acc_sock(struct vx_info *vxi,
-+ int family, int pos, int size, char *file, int line)
++/* context sub struct */
++
++struct _vx_cacct {
++ struct _vx_sock_acc sock[VXA_SOCK_SIZE][3];
++ atomic_t slab[8];
++ atomic_t page[6][8];
++};
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++static inline void __dump_vx_cacct(struct _vx_cacct *cacct)
+{
-+ if (vxi) {
-+ int type = vx_sock_type(family);
++ int i,j;
+
-+ atomic_inc(&vxi->cacct.sock[type][pos].count);
-+ atomic_add(size, &vxi->cacct.sock[type][pos].total);
++ printk("\t_vx_cacct:");
++ for (i=0; i<6; i++) {
++ struct _vx_sock_acc *ptr = cacct->sock[i];
++
++ 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 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 sock_vx_init(s) do { \
-+ (s)->sk_xid = 0; \
-+ (s)->sk_vx_info = NULL; \
-+ } while (0)
++#endif
+
-+#define sock_nx_init(s) do { \
-+ (s)->sk_nid = 0; \
-+ (s)->sk_nx_info = NULL; \
-+ } while (0)
++#endif /* _VX_CACCT_DEF_H */
+--- linux-2.6.20/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/cacct_int.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,21 @@
++#ifndef _VX_CACCT_INT_H
++#define _VX_CACCT_INT_H
+
+
-+#else
-+#warning duplicate inclusion
-+#endif
---- linux-2.6.18.5/include/linux/vserver/cacct.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/cacct.h 2006-11-21 02:45:10 +0100
-@@ -0,0 +1,15 @@
-+#ifndef _VX_CACCT_H
-+#define _VX_CACCT_H
++#ifdef __KERNEL__
+
++static inline
++unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
++{
++ return atomic_long_read(&cacct->sock[type][pos].count);
++}
+
-+enum sock_acc_field {
-+ VXA_SOCK_UNSPEC = 0,
-+ VXA_SOCK_UNIX,
-+ VXA_SOCK_INET,
-+ VXA_SOCK_INET6,
-+ VXA_SOCK_PACKET,
-+ VXA_SOCK_OTHER,
-+ VXA_SOCK_SIZE /* array size */
-+};
+
-+#endif /* _VX_CACCT_H */
---- linux-2.6.18.5/include/linux/vserver/context.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/context.h 2006-11-23 16:37:07 +0100
-@@ -0,0 +1,177 @@
++static inline
++unsigned long vx_sock_total(struct _vx_cacct *cacct, int type, int pos)
++{
++ return atomic_long_read(&cacct->sock[type][pos].total);
++}
++
++#endif /* __KERNEL__ */
++#endif /* _VX_CACCT_INT_H */
+--- linux-2.6.20/include/linux/vserver/context.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/context.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,172 @@
+#ifndef _VX_CONTEXT_H
+#define _VX_CONTEXT_H
+
+#include <linux/types.h>
++#include <linux/capability.h>
+
+
-+#define MAX_S_CONTEXT 65535 /* Arbitrary limit */
-+#define MIN_D_CONTEXT 49152 /* dynamic contexts start here */
-+
+#define VX_DYNAMIC_ID ((uint32_t)-1) /* id for dynamic context */
+
+/* context flags */
@@ -10362,12 +12934,15 @@
+#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
+#define VXF_HIDE_NETIF 0x02000000
++#define VXF_HIDE_VINFO 0x04000000
+
+#define VXF_STATE_SETUP (1ULL<<32)
+#define VXF_STATE_INIT (1ULL<<33)
++#define VXF_STATE_ADMIN (1ULL<<34)
+
+#define VXF_SC_HELPER (1ULL<<36)
+#define VXF_REBOOT_KILL (1ULL<<37)
@@ -10378,9 +12953,9 @@
+
+#define VXF_IGNEG_NICE (1ULL<<52)
+
-+#define VXF_ONE_TIME (0x0003ULL<<32)
++#define VXF_ONE_TIME (0x0007ULL<<32)
+
-+#define VXF_INIT_SET (VXF_STATE_SETUP|VXF_STATE_INIT)
++#define VXF_INIT_SET (VXF_STATE_SETUP|VXF_STATE_INIT|VXF_STATE_ADMIN)
+
+
+/* context migration */
@@ -10403,17 +12978,8 @@
+#define VXC_BINARY_MOUNT 0x00040000
+
+#define VXC_QUOTA_CTL 0x00100000
-+
-+
-+/* context state changes */
-+
-+enum {
-+ VSC_STARTUP = 1,
-+ VSC_SHUTDOWN,
-+
-+ VSC_NETUP,
-+ VSC_NETDOWN,
-+};
++#define VXC_ADMIN_MAPPER 0x00200000
++#define VXC_ADMIN_CLOOP 0x00400000
+
+
+#ifdef __KERNEL__
@@ -10425,6 +12991,12 @@
+#include "limit_def.h"
+#include "sched_def.h"
+#include "cvirt_def.h"
++#include "cacct_def.h"
++
++struct _vx_info_pc {
++ struct _vx_sched_pc sched_pc;
++ struct _vx_cvirt_pc cvirt_pc;
++};
+
+struct vx_info {
+ struct hlist_node vx_hlist; /* linked list of contexts */
@@ -10434,11 +13006,14 @@
+ struct vx_info *vx_parent; /* parent context */
+ int vx_state; /* context state */
+
-+ struct namespace *vx_namespace; /* private namespace */
++ unsigned long vx_nsmask; /* assignment mask */
++ struct nsproxy *vx_nsproxy; /* private namespace */
+ struct fs_struct *vx_fs; /* private namespace fs */
++
+ uint64_t vx_flags; /* context flags */
+ uint64_t vx_bcaps; /* bounding caps (system) */
+ uint64_t vx_ccaps; /* context caps (vserver) */
++ kernel_cap_t vx_cap_bset; /* the guest's bset */
+
+ struct task_struct *vx_reaper; /* guest reaper process */
+ pid_t vx_initpid; /* PID of guest init */
@@ -10448,6 +13023,12 @@
+ struct _vx_cvirt cvirt; /* virtual/bias stuff */
+ struct _vx_cacct cacct; /* context accounting */
+
++#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 */
@@ -10455,6 +13036,16 @@
+ char vx_name[65]; /* vserver name */
+};
+
++#ifndef CONFIG_SMP
++#define vx_ptr_pc(vxi) (&(vxi)->info_pc)
++#define vx_per_cpu(vxi, v, id) vx_ptr_pc(vxi)->v
++#else
++#define vx_ptr_pc(vxi) ((vxi)->ptr_pc)
++#define vx_per_cpu(vxi, v, id) per_cpu_ptr(vx_ptr_pc(vxi), id)->v
++#endif
++
++#define vx_cpu(vxi, v) vx_per_cpu(vxi, v, smp_processor_id())
++
+
+struct vx_info_save {
+ struct vx_info *vxi;
@@ -10466,30 +13057,10 @@
+
+#define VXS_HASHED 0x0001
+#define VXS_PAUSED 0x0010
-+#define VXS_ONHOLD 0x0020
+#define VXS_SHUTDOWN 0x0100
+#define VXS_HELPER 0x1000
+#define VXS_RELEASED 0x8000
+
-+/* check conditions */
-+
-+#define VX_ADMIN 0x0001
-+#define VX_WATCH 0x0002
-+#define VX_HIDE 0x0004
-+#define VX_HOSTID 0x0008
-+
-+#define VX_IDENT 0x0010
-+#define VX_EQUIV 0x0020
-+#define VX_PARENT 0x0040
-+#define VX_CHILD 0x0080
-+
-+#define VX_ARG_MASK 0x00F0
-+
-+#define VX_DYNAMIC 0x0100
-+#define VX_STATIC 0x0200
-+
-+#define VX_ATR_MASK 0x0F00
-+
+
+extern void claim_vx_info(struct vx_info *, struct task_struct *);
+extern void release_vx_info(struct vx_info *, struct task_struct *);
@@ -10500,18 +13071,16 @@
+extern int get_xid_list(int, unsigned int *, int);
+extern int xid_is_hashed(xid_t);
+
-+extern int vx_migrate_task(struct task_struct *, struct vx_info *);
++extern int vx_migrate_task(struct task_struct *, struct vx_info *, int);
+
+extern long vs_state_change(struct vx_info *, unsigned int);
+
+
+#endif /* __KERNEL__ */
-+#else /* _VX_CONTEXT_H */
-+#warning duplicate inclusion
+#endif /* _VX_CONTEXT_H */
---- linux-2.6.18.5/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/context_cmd.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,84 @@
+--- linux-2.6.20/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/context_cmd.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,123 @@
+#ifndef _VX_CONTEXT_CMD_H
+#define _VX_CONTEXT_CMD_H
+
@@ -10534,10 +13103,22 @@
+};
+
+#ifdef __KERNEL__
-+extern int vc_vx_info(uint32_t, void __user *);
++extern int vc_vx_info(struct vx_info *, void __user *);
+
+#endif /* __KERNEL__ */
+
++#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0)
++
++struct vcmd_ctx_stat_v0 {
++ uint32_t usecnt;
++ uint32_t tasks;
++ /* more to come */
++};
++
++#ifdef __KERNEL__
++extern int vc_ctx_stat(struct vx_info *, void __user *);
++
++#endif /* __KERNEL__ */
+
+/* context commands */
+
@@ -10557,7 +13138,7 @@
+
+#ifdef __KERNEL__
+extern int vc_ctx_create(uint32_t, void __user *);
-+extern int vc_ctx_migrate(uint32_t, void __user *);
++extern int vc_ctx_migrate(struct vx_info *, void __user *);
+
+#endif /* __KERNEL__ */
+
@@ -10573,16 +13154,16 @@
+};
+
+#ifdef __KERNEL__
-+extern int vc_get_cflags(uint32_t, void __user *);
-+extern int vc_set_cflags(uint32_t, void __user *);
++extern int vc_get_cflags(struct vx_info *, void __user *);
++extern int vc_set_cflags(struct vx_info *, void __user *);
+
+#endif /* __KERNEL__ */
+
+
+/* context caps commands */
+
-+#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 0)
-+#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 0)
++#define VCMD_get_ccaps_v0 VC_CMD(FLAGS, 3, 0)
++#define VCMD_set_ccaps_v0 VC_CMD(FLAGS, 4, 0)
+
+struct vcmd_ctx_caps_v0 {
+ uint64_t bcaps;
@@ -10590,15 +13171,42 @@
+ uint64_t cmask;
+};
+
++#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;
++};
++
++#ifdef __KERNEL__
++extern int vc_get_ccaps_v0(struct vx_info *, void __user *);
++extern int vc_set_ccaps_v0(struct vx_info *, void __user *);
++extern int vc_get_ccaps(struct vx_info *, void __user *);
++extern int vc_set_ccaps(struct vx_info *, void __user *);
++
++#endif /* __KERNEL__ */
++
++
++/* bcaps commands */
++
++#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0)
++#define VCMD_set_bcaps VC_CMD(FLAGS,10, 0)
++
++struct vcmd_bcaps {
++ uint64_t bcaps;
++ uint64_t bmask;
++};
++
+#ifdef __KERNEL__
-+extern int vc_get_ccaps(uint32_t, void __user *);
-+extern int vc_set_ccaps(uint32_t, void __user *);
++extern int vc_get_bcaps(struct vx_info *, void __user *);
++extern int vc_set_bcaps(struct vx_info *, void __user *);
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
---- linux-2.6.18.5/include/linux/vserver/cvirt.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/cvirt.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,26 @@
+--- linux-2.6.20/include/linux/vserver/cvirt.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/cvirt.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,20 @@
+#ifndef _VX_CVIRT_H
+#define _VX_CVIRT_H
+
@@ -10615,19 +13223,13 @@
+void vx_update_load(struct vx_info *);
+
+
-+int vx_uts_virt_handler(struct ctl_table *ctl, int write, xid_t xid,
-+ void **datap, size_t *lenp);
-+
-+
+int vx_do_syslog(int, char __user *, int);
+
+#endif /* __KERNEL__ */
-+#else /* _VX_CVIRT_H */
-+#warning duplicate inclusion
+#endif /* _VX_CVIRT_H */
---- linux-2.6.18.5/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/cvirt_cmd.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,35 @@
+--- linux-2.6.20/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/cvirt_cmd.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,53 @@
+#ifndef _VX_CVIRT_CMD_H
+#define _VX_CVIRT_CMD_H
+
@@ -10658,26 +13260,42 @@
+
+#include <linux/compiler.h>
+
-+extern int vc_set_vhi_name(uint32_t, void __user *);
-+extern int vc_get_vhi_name(uint32_t, void __user *);
++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_virt_stat VC_CMD(VSTAT, 3, 0)
++
++struct vcmd_virt_stat_v0 {
++ uint64_t offset;
++ uint64_t uptime;
++ uint32_t nr_threads;
++ uint32_t nr_running;
++ uint32_t nr_uninterruptible;
++ uint32_t nr_onhold;
++ uint32_t nr_forks;
++ uint32_t load[3];
++};
++
++#ifdef __KERNEL__
++extern int vc_virt_stat(struct vx_info *, void __user *);
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
---- linux-2.6.18.5/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/cvirt_def.h 2006-12-10 02:48:07 +0100
-@@ -0,0 +1,77 @@
+--- linux-2.6.20/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/cvirt_def.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,82 @@
+#ifndef _VX_CVIRT_DEF_H
+#define _VX_CVIRT_DEF_H
+
+#include <linux/jiffies.h>
-+#include <linux/utsname.h>
+#include <linux/spinlock.h>
+#include <linux/wait.h>
+#include <linux/time.h>
++#include <linux/utsname.h>
+#include <asm/atomic.h>
+
-+#include "cacct.h"
-+
+
+struct _vx_usage_stat {
+ uint64_t user;
@@ -10705,7 +13323,7 @@
+/* context sub struct */
+
+struct _vx_cvirt {
-+ int max_threads; /* maximum allowed threads */
++// int max_threads; /* maximum allowed threads */
+ atomic_t nr_threads; /* number of current threads */
+ atomic_t nr_running; /* number of running threads */
+ atomic_t nr_uninterruptible; /* number of uninterruptible threads */
@@ -10713,15 +13331,14 @@
+ atomic_t nr_onhold; /* processes on hold */
+ uint32_t onhold_last; /* jiffies when put on hold */
+
++ struct timeval bias_tv; /* time offset to the host */
+ struct timespec bias_idle;
+ struct timespec bias_uptime; /* context creation point */
+ uint64_t bias_clock; /* offset in clock_t */
+
-+ struct new_utsname utsname;
-+
+ 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 cacled */
++ uint32_t load_last; /* last time load was calculated */
+ uint32_t load[3]; /* load averages 1,5,15 */
+
+ atomic_t total_forks; /* number of forks so far */
@@ -10729,23 +13346,31 @@
+ struct _vx_syslog syslog;
+};
+
-+struct _vx_sock_acc {
-+ atomic_t count;
-+ atomic_t total;
++struct _vx_cvirt_pc {
++ struct _vx_usage_stat cpustat;
+};
+
-+/* context sub struct */
+
-+struct _vx_cacct {
-+ unsigned long total_forks;
++#ifdef CONFIG_VSERVER_DEBUG
+
-+ struct _vx_sock_acc sock[VXA_SOCK_SIZE][3];
-+};
++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));
++}
++
++#endif
+
+#endif /* _VX_CVIRT_DEF_H */
---- linux-2.6.18.5/include/linux/vserver/debug.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/debug.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,298 @@
+--- linux-2.6.20/include/linux/vserver/debug.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/debug.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,112 @@
+#ifndef _VX_DEBUG_H
+#define _VX_DEBUG_H
+
@@ -10772,10 +13397,12 @@
+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_misc;
+
@@ -10795,69 +13422,288 @@
+ 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 vxfprintk(c,f,x...) \
++ do { \
++ if (c) \
++ printk(VX_LOGLEVEL f " %s@%s:%d\n", x); \
++ } while (0)
++
++
++#define vxwprintk(c,f,x...) \
++ do { \
++ if (c) \
++ printk(VX_WARNLEVEL f "\n" , ##x); \
++ } while (0)
++
++
++#define vxd_path(d,m) \
++ ({ static char _buffer[PATH_MAX]; \
++ d_path((d), (m), _buffer, sizeof(_buffer)); })
++
++#define vxd_cond_path(n) \
++ ((n) ? vxd_path((n)->dentry, (n)->mnt) : "<null>" )
++
++
++struct vx_info;
++
++void dump_vx_info(struct vx_info *, int);
++void dump_vx_info_inactive(int);
++
++#else /* CONFIG_VSERVER_DEBUG */
++
++#define vx_debug_switch 0
++#define vx_debug_xid 0
++#define vx_debug_nid 0
++#define vx_debug_tag 0
++#define vx_debug_net 0
++#define vx_debug_limit 0
++#define vx_debug_cres 0
++#define vx_debug_dlim 0
++#define vx_debug_cvirt 0
++
++#define vxdprintk(x...) do { } while (0)
++#define vxlprintk(x...) do { } while (0)
++#define vxfprintk(x...) do { } while (0)
++#define vxwprintk(x...) do { } while (0)
++
++#define vxd_path "<none>"
++#define vxd_cond_path vxd_path
++
++#endif /* CONFIG_VSERVER_DEBUG */
++
++
++#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
++
++
++#endif /* _VX_DEBUG_H */
+--- linux-2.6.20/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/debug_cmd.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,58 @@
++#ifndef _VX_DEBUG_CMD_H
++#define _VX_DEBUG_CMD_H
++
++
++/* debug commands */
++
++#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)
++
++struct vcmd_read_history_v0 {
++ uint32_t index;
++ uint32_t count;
++ char __user *data;
++};
++
++struct vcmd_read_monitor_v0 {
++ uint32_t index;
++ uint32_t count;
++ char __user *data;
++};
++
++
++#ifdef __KERNEL__
++
++#ifdef CONFIG_COMPAT
++
++#include <asm/compat.h>
++
++struct vcmd_read_history_v0_x32 {
++ uint32_t index;
++ uint32_t count;
++ compat_uptr_t data_ptr;
++};
++
++struct vcmd_read_monitor_v0_x32 {
++ uint32_t index;
++ uint32_t count;
++ compat_uptr_t data_ptr;
++};
++
++#endif /* CONFIG_COMPAT */
++
++extern int vc_dump_history(uint32_t);
++
++extern int vc_read_history(uint32_t, void __user *);
++extern int vc_read_monitor(uint32_t, void __user *);
++
++#ifdef CONFIG_COMPAT
++
++extern int vc_read_history_x32(uint32_t, void __user *);
++extern int vc_read_monitor_x32(uint32_t, void __user *);
++
++#endif /* CONFIG_COMPAT */
++
++#endif /* __KERNEL__ */
++#endif /* _VX_DEBUG_CMD_H */
+--- linux-2.6.20/include/linux/vserver/dlimit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/dlimit.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,53 @@
++#ifndef _VX_DLIMIT_H
++#define _VX_DLIMIT_H
++
++#include "switch.h"
++
++
++#ifdef __KERNEL__
++
++/* keep in sync with CDLIM_INFINITY */
++
++#define DLIM_INFINITY (~0ULL)
++
++#include <linux/spinlock.h>
++
++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 */
++
++ struct super_block *dl_sb; /* associated superblock */
++
++ spinlock_t dl_lock; /* protect the values */
++
++ unsigned long long dl_space_used; /* used space in bytes */
++ unsigned long long dl_space_total; /* maximum space in bytes */
++ unsigned long dl_inodes_used; /* used inodes */
++ unsigned long dl_inodes_total; /* maximum inodes */
++
++ unsigned int dl_nrlmult; /* non root limit mult */
++};
++
++struct rcu_head;
++
++extern void rcu_free_dl_info(struct rcu_head *);
++extern void unhash_dl_info(struct dl_info *);
++
++extern struct dl_info *locate_dl_info(struct super_block *, tag_t);
++
++
++struct kstatfs;
++
++extern void vx_vsi_statfs(struct super_block *, struct kstatfs *);
++
++typedef uint64_t dlsize_t;
++
++#endif /* __KERNEL__ */
++#else /* _VX_DLIMIT_H */
++#warning duplicate inclusion
++#endif /* _VX_DLIMIT_H */
+--- linux-2.6.20/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/dlimit_cmd.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,74 @@
++#ifndef _VX_DLIMIT_CMD_H
++#define _VX_DLIMIT_CMD_H
++
++
++/* dlimit vserver commands */
++
++#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0)
++#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0)
++
++#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0)
++#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0)
+
++struct vcmd_ctx_dlimit_base_v0 {
++ const char __user *name;
++ uint32_t flags;
++};
+
-+#define vxwprintk(c,f,x...) \
-+ do { \
-+ if (c) \
-+ printk(VX_WARNLEVEL f "\n" , ##x); \
-+ } while (0)
++struct vcmd_ctx_dlimit_v0 {
++ const char __user *name;
++ uint32_t space_used; /* used space in kbytes */
++ uint32_t space_total; /* maximum space in kbytes */
++ uint32_t inodes_used; /* used inodes */
++ uint32_t inodes_total; /* maximum inodes */
++ uint32_t reserved; /* reserved for root in % */
++ uint32_t flags;
++};
+
-+#define vxd_path(d,m) \
-+ ({ static char _buffer[PATH_MAX]; \
-+ d_path((d), (m), _buffer, sizeof(_buffer)); })
++#define CDLIM_UNSET ((uint32_t)0UL)
++#define CDLIM_INFINITY ((uint32_t)~0UL)
++#define CDLIM_KEEP ((uint32_t)~1UL)
+
-+#define vxd_cond_path(n) \
-+ ((n) ? vxd_path((n)->dentry, (n)->mnt) : "<null>" )
++#ifdef __KERNEL__
+
-+#else /* CONFIG_VSERVER_DEBUG */
++#ifdef CONFIG_COMPAT
+
-+#define vx_debug_switch 0
-+#define vx_debug_xid 0
-+#define vx_debug_nid 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
++#include <asm/compat.h>
+
-+#define vxdprintk(x...) do { } while (0)
-+#define vxlprintk(x...) do { } while (0)
-+#define vxfprintk(x...) do { } while (0)
-+#define vxwprintk(x...) do { } while (0)
++struct vcmd_ctx_dlimit_base_v0_x32 {
++ compat_uptr_t name_ptr;
++ uint32_t flags;
++};
+
-+#define vxd_path "<none>"
-+#define vxd_cond_path vxd_path
++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;
++};
+
-+#endif /* CONFIG_VSERVER_DEBUG */
++#endif /* CONFIG_COMPAT */
+
++#include <linux/compiler.h>
+
-+/* history stuff */
++extern int vc_add_dlimit(uint32_t, void __user *);
++extern int vc_rem_dlimit(uint32_t, void __user *);
+
-+#ifdef CONFIG_VSERVER_HISTORY
++extern int vc_set_dlimit(uint32_t, void __user *);
++extern int vc_get_dlimit(uint32_t, void __user *);
+
++#ifdef CONFIG_COMPAT
+
-+extern unsigned volatile int vxh_active;
++extern int vc_add_dlimit_x32(uint32_t, void __user *);
++extern int vc_rem_dlimit_x32(uint32_t, void __user *);
+
-+struct _vxhe_vxi {
-+ struct vx_info *ptr;
-+ unsigned xid;
-+ unsigned usecnt;
-+ unsigned tasks;
-+};
++extern int vc_set_dlimit_x32(uint32_t, void __user *);
++extern int vc_get_dlimit_x32(uint32_t, void __user *);
+
-+struct _vxhe_set_clr {
-+ void *data;
-+};
++#endif /* CONFIG_COMPAT */
++
++#endif /* __KERNEL__ */
++#endif /* _VX_DLIMIT_CMD_H */
+--- linux-2.6.20/include/linux/vserver/global.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/global.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,18 @@
++#ifndef _VX_GLOBAL_H
++#define _VX_GLOBAL_H
++
++
++extern atomic_t vx_global_ctotal;
++extern atomic_t vx_global_cactive;
++
++extern atomic_t nx_global_ctotal;
++extern atomic_t nx_global_cactive;
++
++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;
++
++
++#endif /* _VX_GLOBAL_H */
+--- linux-2.6.20/include/linux/vserver/history.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/history.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,197 @@
++#ifndef _VX_HISTORY_H
++#define _VX_HISTORY_H
+
-+struct _vxhe_loc_lookup {
-+ unsigned arg;
-+};
+
+enum {
+ VXH_UNUSED=0,
@@ -10879,6 +13725,21 @@
+ VXH_CREATE_VX_INFO,
+};
+
++struct _vxhe_vxi {
++ struct vx_info *ptr;
++ unsigned xid;
++ unsigned usecnt;
++ unsigned tasks;
++};
++
++struct _vxhe_set_clr {
++ void *data;
++};
++
++struct _vxhe_loc_lookup {
++ unsigned arg;
++};
++
+struct _vx_hist_entry {
+ void *loc;
+ unsigned short seq;
@@ -10890,6 +13751,10 @@
+ };
+};
+
++#ifdef CONFIG_VSERVER_HISTORY
++
++extern unsigned volatile int vxh_active;
++
+struct _vx_hist_entry *vxh_advance(void *loc);
+
+
@@ -10905,7 +13770,7 @@
+}
+
+
-+#define __HERE__ current_text_addr()
++#define __HERE__ current_text_addr()
+
+#define __VXH_BODY(__type, __data, __here) \
+ struct _vx_hist_entry *entry; \
@@ -11011,194 +13876,36 @@
+#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)
-+
-+#define __vxh_claim_vx_info(v,d,h) do { } while (0)
-+#define __vxh_release_vx_info(v,d,h) do { } while (0)
-+
-+#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)
-+
-+#define vxh_loc_vx_info(a,v) do { } while (0)
-+#define vxh_lookup_vx_info(a,v) do { } while (0)
-+#define vxh_create_vx_info(a,v) do { } while (0)
-+
-+#define vxh_dump_history() do { } while (0)
-+
-+
-+#endif /* CONFIG_VSERVER_HISTORY */
-+
-+
-+#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
-+
-+
-+#endif /* _VX_DEBUG_H */
---- linux-2.6.18.5/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/debug_cmd.h 2006-11-06 05:08:58 +0100
-@@ -0,0 +1,14 @@
-+#ifndef _VX_DEBUG_CMD_H
-+#define _VX_DEBUG_CMD_H
-+
-+
-+/* debug commands */
-+
-+#define VCMD_dump_history VC_CMD(DEBUG, 1, 0)
-+
-+#ifdef __KERNEL__
-+
-+extern int vc_dump_history(uint32_t);
-+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_DEBUG_CMD_H */
---- linux-2.6.18.5/include/linux/vserver/dlimit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/dlimit.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,53 @@
-+#ifndef _VX_DLIMIT_H
-+#define _VX_DLIMIT_H
-+
-+#include "switch.h"
-+
-+#define CDLIM_UNSET (0ULL)
-+#define CDLIM_INFINITY (~0ULL)
-+#define CDLIM_KEEP (~1ULL)
-+
-+
-+#ifdef __KERNEL__
-+
-+#include <linux/spinlock.h>
-+
-+struct super_block;
-+
-+struct dl_info {
-+ struct hlist_node dl_hlist; /* linked list of contexts */
-+ struct rcu_head dl_rcu; /* the rcu head */
-+ xid_t dl_xid; /* context id */
-+ atomic_t dl_usecnt; /* usage count */
-+ atomic_t dl_refcnt; /* reference count */
-+
-+ struct super_block *dl_sb; /* associated superblock */
-+
-+ spinlock_t dl_lock; /* protect the values */
-+
-+ uint64_t dl_space_used; /* used space in bytes */
-+ uint64_t dl_space_total; /* maximum space in bytes */
-+ uint32_t dl_inodes_used; /* used inodes */
-+ uint32_t dl_inodes_total; /* maximum inodes */
-+
-+ unsigned int dl_nrlmult; /* non root limit mult */
-+};
-+
-+struct rcu_head;
-+
-+extern void rcu_free_dl_info(struct rcu_head *);
-+extern void unhash_dl_info(struct dl_info *);
-+
-+extern struct dl_info *locate_dl_info(struct super_block *, xid_t);
-+
-+
-+struct kstatfs;
-+
-+extern void vx_vsi_statfs(struct super_block *, struct kstatfs *);
-+
-+typedef uint64_t dlsize_t;
-+
-+#endif /* __KERNEL__ */
-+#else /* _VX_DLIMIT_H */
-+#warning duplicate inclusion
-+#endif /* _VX_DLIMIT_H */
---- linux-2.6.18.5/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/dlimit_cmd.h 2006-11-06 05:31:43 +0100
-@@ -0,0 +1,71 @@
-+#ifndef _VX_DLIMIT_CMD_H
-+#define _VX_DLIMIT_CMD_H
-+
-+
-+/* dlimit vserver commands */
-+
-+#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0)
-+#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0)
-+
-+#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0)
-+#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0)
-+
-+struct vcmd_ctx_dlimit_base_v0 {
-+ const char __user *name;
-+ uint32_t flags;
-+};
-+
-+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;
-+};
-+
-+
-+#ifdef __KERNEL__
-+
-+#ifdef CONFIG_COMPAT
-+
-+#include <asm/compat.h>
-+
-+struct vcmd_ctx_dlimit_base_v0_x32 {
-+ compat_uptr_t name_ptr;
-+ uint32_t flags;
-+};
-+
-+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;
-+};
-+
-+#endif /* CONFIG_COMPAT */
++#define __vxh_set_vx_info(v,d,h) do { } while (0)
++#define __vxh_clr_vx_info(v,d,h) do { } while (0)
+
-+#include <linux/compiler.h>
++#define __vxh_claim_vx_info(v,d,h) do { } while (0)
++#define __vxh_release_vx_info(v,d,h) do { } while (0)
+
-+extern int vc_add_dlimit(uint32_t, void __user *);
-+extern int vc_rem_dlimit(uint32_t, void __user *);
++#define vxh_alloc_vx_info(v) do { } while (0)
++#define vxh_dealloc_vx_info(v) do { } while (0)
+
-+extern int vc_set_dlimit(uint32_t, void __user *);
-+extern int vc_get_dlimit(uint32_t, void __user *);
++#define vxh_hash_vx_info(v) do { } while (0)
++#define vxh_unhash_vx_info(v) do { } while (0)
+
-+#ifdef CONFIG_COMPAT
++#define vxh_loc_vx_info(a,v) do { } while (0)
++#define vxh_lookup_vx_info(a,v) do { } while (0)
++#define vxh_create_vx_info(a,v) do { } while (0)
+
-+extern int vc_add_dlimit_x32(uint32_t, void __user *);
-+extern int vc_rem_dlimit_x32(uint32_t, void __user *);
++#define vxh_dump_history() do { } while (0)
+
-+extern int vc_set_dlimit_x32(uint32_t, void __user *);
-+extern int vc_get_dlimit_x32(uint32_t, void __user *);
+
-+#endif /* CONFIG_COMPAT */
++#endif /* CONFIG_VSERVER_HISTORY */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_DLIMIT_CMD_H */
---- linux-2.6.18.5/include/linux/vserver/inode.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/inode.h 2006-09-20 17:01:45 +0200
++#endif /* _VX_HISTORY_H */
+--- linux-2.6.20/include/linux/vserver/inode.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/inode.h 2007-02-06 03:05:22 +0100
@@ -0,0 +1,38 @@
+#ifndef _VX_INODE_H
+#define _VX_INODE_H
+
+
-+#define IATTR_XID 0x01000000
++#define IATTR_TAG 0x01000000
+
+#define IATTR_ADMIN 0x00000001
+#define IATTR_WATCH 0x00000002
@@ -11232,8 +13939,8 @@
+#else /* _VX_INODE_H */
+#warning duplicate inclusion
+#endif /* _VX_INODE_H */
---- linux-2.6.18.5/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/inode_cmd.h 2006-11-06 05:31:43 +0100
+--- linux-2.6.20/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/inode_cmd.h 2007-02-06 03:05:22 +0100
@@ -0,0 +1,61 @@
+#ifndef _VX_INODE_CMD_H
+#define _VX_INODE_CMD_H
@@ -11296,8 +14003,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_INODE_CMD_H */
---- linux-2.6.18.5/include/linux/vserver/legacy.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/legacy.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/include/linux/vserver/legacy.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/legacy.h 2007-02-06 03:05:22 +0100
@@ -0,0 +1,49 @@
+#ifndef _VX_LEGACY_H
+#define _VX_LEGACY_H
@@ -11348,9 +14055,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LEGACY_H */
---- linux-2.6.18.5/include/linux/vserver/limit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/limit.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,20 @@
+--- linux-2.6.20/include/linux/vserver/limit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/limit.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,68 @@
+#ifndef _VX_LIMIT_H
+#define _VX_LIMIT_H
+
@@ -11359,9 +14066,57 @@
+#define VLIMIT_OPENFD 17
+#define VLIMIT_ANON 18
+#define VLIMIT_SHMEM 19
++#define VLIMIT_SEMARY 20
++#define VLIMIT_NSEMS 21
++#define VLIMIT_DENTRY 22
++#define VLIMIT_MAPPED 23
++
+
+#ifdef __KERNEL__
+
++#define VLIM_NOCHECK ((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS))
++
++/* keep in sync with CRLIM_INFINITY */
++
++#define VLIM_INFINITY (~0ULL)
++
++#ifndef RLIM_INFINITY
++#warning RLIM_INFINITY is undefined
++#endif
++
++#define __rlim_val(l,r,v) ((l)->res[(r)].v)
++
++#define __rlim_soft(l,r) __rlim_val(l,r,soft)
++#define __rlim_hard(l,r) __rlim_val(l,r,hard)
++
++#define __rlim_rcur(l,r) __rlim_val(l,r,rcur)
++#define __rlim_rmin(l,r) __rlim_val(l,r,rmin)
++#define __rlim_rmax(l,r) __rlim_val(l,r,rmax)
++
++#define __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;
++
++#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))
++
++
++#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
++
+struct sysinfo;
+
+void vx_vsi_meminfo(struct sysinfo *);
@@ -11371,9 +14126,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
---- linux-2.6.18.5/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/limit_cmd.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,55 @@
+--- linux-2.6.20/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/limit_cmd.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,69 @@
+#ifndef _VX_LIMIT_CMD_H
+#define _VX_LIMIT_CMD_H
+
@@ -11383,6 +14138,7 @@
+#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;
@@ -11397,6 +14153,16 @@
+ uint32_t maximum;
+};
+
++#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0)
++
++struct vcmd_rlimit_stat_v0 {
++ uint32_t id;
++ uint32_t hits;
++ uint64_t value;
++ uint64_t minimum;
++ uint64_t maximum;
++};
++
+#define CRLIM_UNSET (0ULL)
+#define CRLIM_INFINITY (~0ULL)
+#define CRLIM_KEEP (~1ULL)
@@ -11416,22 +14182,25 @@
+
+#include <linux/compiler.h>
+
-+extern int vc_get_rlimit(uint32_t, void __user *);
-+extern int vc_set_rlimit(uint32_t, void __user *);
+extern int vc_get_rlimit_mask(uint32_t, void __user *);
++extern int vc_get_rlimit(struct vx_info *, void __user *);
++extern int vc_set_rlimit(struct vx_info *, void __user *);
++extern int vc_reset_minmax(struct vx_info *, void __user *);
++
++extern int vc_rlimit_stat(struct vx_info *, void __user *);
+
+#ifdef CONFIG_IA32_EMULATION
+
-+extern int vc_get_rlimit_x32(uint32_t, void __user *);
-+extern int vc_set_rlimit_x32(uint32_t, void __user *);
++extern int vc_get_rlimit_x32(struct vx_info *, void __user *);
++extern int vc_set_rlimit_x32(struct vx_info *, void __user *);
+
+#endif /* CONFIG_IA32_EMULATION */
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
---- linux-2.6.18.5/include/linux/vserver/limit_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/limit_def.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,22 @@
+--- linux-2.6.20/include/linux/vserver/limit_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/limit_def.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,47 @@
+#ifndef _VX_LIMIT_DEF_H
+#define _VX_LIMIT_DEF_H
+
@@ -11441,139 +14210,346 @@
+#include "limit.h"
+
+
++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 */
++
++ atomic_t lhit; /* Limit hits */
++};
++
+/* context sub struct */
+
+struct _vx_limit {
-+ atomic_t ticks;
-+
-+ unsigned long rlim[NUM_LIMITS]; /* Context limit */
-+ unsigned long rmax[NUM_LIMITS]; /* Context maximum */
-+ atomic_t rcur[NUM_LIMITS]; /* Current value */
-+ atomic_t lhit[NUM_LIMITS]; /* Limit hits */
++ struct _vx_res_limit res[NUM_LIMITS];
+};
+
++#ifdef CONFIG_VSERVER_DEBUG
++
++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)));
++ }
++}
++
++#endif
+
+#endif /* _VX_LIMIT_DEF_H */
---- linux-2.6.18.5/include/linux/vserver/limit_int.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/limit_int.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,76 @@
+--- linux-2.6.20/include/linux/vserver/limit_int.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/limit_int.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,198 @@
+#ifndef _VX_LIMIT_INT_H
+#define _VX_LIMIT_INT_H
+
++#include "context.h"
+
+#ifdef __KERNEL__
+
-+#define VXD_RCRES(r) VXD_CBIT(cres, (r))
-+#define VXD_RLIMIT(r) VXD_CBIT(limit, (r))
++#define VXD_RCRES_COND(r) VXD_CBIT(cres, (r))
++#define VXD_RLIMIT_COND(r) VXD_CBIT(limit, (r))
+
+extern const char *vlimit_name[NUM_LIMITS];
+
+static inline void __vx_acc_cres(struct vx_info *vxi,
+ int res, int dir, void *_data, char *_file, int _line)
+{
-+ if (VXD_RCRES(res))
-+ vxlprintk(1, "vx_acc_cres[%5d,%s,%2d]: %5d%s (%p)",
++ 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 ? atomic_read(&vxi->limit.rcur[res]) : 0),
++ (vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
+ (dir > 0) ? "++" : "--", _data, _file, _line);
+ if (!vxi)
+ return;
+
+ if (dir > 0)
-+ atomic_inc(&vxi->limit.rcur[res]);
++ __rlim_inc(&vxi->limit, res);
+ else
-+ atomic_dec(&vxi->limit.rcur[res]);
++ __rlim_dec(&vxi->limit, res);
+}
+
+static inline void __vx_add_cres(struct vx_info *vxi,
+ int res, int amount, void *_data, char *_file, int _line)
+{
-+ if (VXD_RCRES(res))
-+ vxlprintk(1, "vx_add_cres[%5d,%s,%2d]: %5d += %5d (%p)",
++ 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 ? atomic_read(&vxi->limit.rcur[res]) : 0),
++ (vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
+ amount, _data, _file, _line);
+ if (amount == 0)
+ return;
+ if (!vxi)
+ return;
-+ atomic_add(amount, &vxi->limit.rcur[res]);
++ __rlim_add(&vxi->limit, res, amount);
++}
++
++static inline
++int __vx_cres_adjust_max(struct _vx_limit *limit, int res, rlim_t value)
++{
++ int cond = (value > __rlim_rmax(limit, res));
++
++ if (cond)
++ __rlim_rmax(limit, res) = value;
++ return cond;
++}
++
++static inline
++int __vx_cres_adjust_min(struct _vx_limit *limit, int res, rlim_t value)
++{
++ int cond = (value < __rlim_rmin(limit, res));
++
++ if (cond)
++ __rlim_rmin(limit, res) = value;
++ return cond;
+}
+
++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);
++}
++
++
++/* 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)
++ int res, int num, char *_file, int _line)
+{
-+ unsigned long value;
++ struct _vx_limit *limit;
++ rlim_t value;
+
-+ if (VXD_RLIMIT(res))
-+ vxlprintk(1, "vx_cres_avail[%5d,%s,%2d]: %5ld > %5d + %5d",
++ 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 ? vxi->limit.rlim[res] : 1),
-+ (vxi ? atomic_read(&vxi->limit.rcur[res]) : 0),
++ (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 (num == 0)
-+ return 1;
+ if (!vxi)
+ return 1;
+
-+ value = atomic_read(&vxi->limit.rcur[res]);
++ limit = &vxi->limit;
++ value = __rlim_get(limit, res);
+
-+ if (value > vxi->limit.rmax[res])
-+ vxi->limit.rmax[res] = value;
++ if (!__vx_cres_adjust_max(limit, res, value))
++ __vx_cres_adjust_min(limit, res, value);
+
-+ if (vxi->limit.rlim[res] == RLIM_INFINITY)
++ if (num == 0)
+ return 1;
+
-+ if (value + num <= vxi->limit.rlim[res])
++ if (__rlim_soft(limit, res) == RLIM_INFINITY)
++ return -1;
++ if (value + num <= __rlim_soft(limit, res))
++ return -1;
++
++ if (__rlim_hard(limit, res) == RLIM_INFINITY)
++ return 1;
++ if (value + num <= __rlim_hard(limit, res))
+ return 1;
+
-+ atomic_inc(&vxi->limit.lhit[res]);
++ __rlim_hit(limit, res);
+ return 0;
+}
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_LIMIT_H */
---- linux-2.6.18.5/include/linux/vserver/namespace.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/namespace.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,15 @@
-+#ifndef _VX_NAMESPACE_H
-+#define _VX_NAMESPACE_H
+
++static const int VLA_RSS[] = { RLIMIT_RSS, VLIMIT_ANON, VLIMIT_MAPPED, 0 };
+
-+#include <linux/types.h>
++static inline
++rlim_t __vx_cres_array_sum(struct _vx_limit *limit, const int *array)
++{
++ rlim_t value, sum = 0;
++ int res;
+
-+struct vx_info;
-+struct namespace;
-+struct fs_struct;
++ while ((res = *array++)) {
++ value = __rlim_get(limit, res);
++ __vx_cres_fixup(limit, res, value);
++ sum += value;
++ }
++ return sum;
++}
++
++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;
+
-+extern int vx_set_namespace(struct vx_info *, struct namespace *, struct fs_struct *);
++ if (value == __rlim_get(limit, res))
++ return value;
+
-+#else /* _VX_NAMESPACE_H */
-+#warning duplicate inclusion
-+#endif /* _VX_NAMESPACE_H */
---- linux-2.6.18.5/include/linux/vserver/namespace_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/namespace_cmd.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,17 @@
-+#ifndef _VX_NAMESPACE_CMD_H
-+#define _VX_NAMESPACE_CMD_H
++ __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 __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;
++
++ if (num == 0)
++ return 1;
++ if (!vxi)
++ return 1;
+
++ limit = &vxi->limit;
++ res = *array;
++ value = __vx_cres_array_sum(limit, array+1);
+
-+#define VCMD_enter_namespace VC_CMD(PROCALT, 1, 0)
++ __rlim_set(limit, res, value);
++ __vx_cres_fixup(limit, res, value);
+
-+#define VCMD_set_namespace_v0 VC_CMD(PROCALT, 3, 0)
-+#define VCMD_set_namespace VC_CMD(PROCALT, 3, 1)
++ return __vx_cres_avail(vxi, res, num, _file, _line);
++}
+
+
-+#ifdef __KERNEL__
++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);
++
++ for (res=0; res<NUM_LIMITS; res++) {
++ if ((id > 0) && (res != id))
++ continue;
++
++ value = __rlim_get(limit, res);
++ __vx_cres_fixup(limit, res, value);
++
++ /* not supposed to happen, maybe warn? */
++ if (__rlim_rmax(limit, res) > __rlim_hard(limit, res))
++ __rlim_rmax(limit, res) = __rlim_hard(limit, res);
++ }
++}
+
-+extern int vc_enter_namespace(uint32_t, void __user *);
-+extern int vc_set_namespace(uint32_t, void __user *);
+
+#endif /* __KERNEL__ */
-+#endif /* _VX_NAMESPACE_CMD_H */
---- linux-2.6.18.5/include/linux/vserver/network.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/network.h 2006-11-23 16:37:07 +0100
-@@ -0,0 +1,121 @@
++#endif /* _VX_LIMIT_INT_H */
+--- linux-2.6.20/include/linux/vserver/monitor.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/monitor.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,95 @@
++#ifndef _VX_MONITOR_H
++#define _VX_MONITOR_H
++
++
++enum {
++ VXM_UNUSED = 0,
++
++ VXM_SYNC = 0x10,
++
++ VXM_UPDATE = 0x20,
++ VXM_UPDATE_1,
++ VXM_UPDATE_2,
++
++ VXM_RQINFO_1 = 0x24,
++ VXM_RQINFO_2,
++
++ VXM_ACTIVATE = 0x40,
++ VXM_DEACTIVATE,
++ VXM_IDLE,
++
++ VXM_HOLD = 0x44,
++ VXM_UNHOLD,
++
++ VXM_MIGRATE = 0x48,
++ VXM_RESCHED,
++
++ /* all other bits are flags */
++ VXM_SCHED = 0x80,
++};
++
++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 */
+--- linux-2.6.20/include/linux/vserver/network.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/network.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,142 @@
+#ifndef _VX_NETWORK_H
+#define _VX_NETWORK_H
+
@@ -11592,13 +14568,14 @@
+#define NXF_INFO_PRIVATE 0x00000008
+
+#define NXF_STATE_SETUP (1ULL<<32)
++#define NXF_STATE_ADMIN (1ULL<<34)
+
+#define NXF_SC_HELPER (1ULL<<36)
+#define NXF_PERSISTENT (1ULL<<38)
+
-+#define NXF_ONE_TIME (0x0001ULL<<32)
++#define NXF_ONE_TIME (0x0005ULL<<32)
+
-+#define NXF_INIT_SET (0)
++#define NXF_INIT_SET (NXF_STATE_ADMIN)
+
+
+/* address types */
@@ -11649,6 +14626,26 @@
+#define NXS_SHUTDOWN 0x0100
+#define NXS_RELEASED 0x8000
+
++/* check conditions */
++
++#define NX_ADMIN 0x0001
++#define NX_WATCH 0x0002
++#define NX_BLEND 0x0004
++#define NX_HOSTID 0x0008
++
++#define NX_IDENT 0x0010
++#define NX_EQUIV 0x0020
++#define NX_PARENT 0x0040
++#define NX_CHILD 0x0080
++
++#define NX_ARG_MASK 0x00F0
++
++#define NX_DYNAMIC 0x0100
++#define NX_STATIC 0x0200
++
++#define NX_ATR_MASK 0x0F00
++
++
+extern struct nx_info *lookup_nx_info(int);
+
+extern int get_nid_list(int, unsigned int *, int);
@@ -11695,8 +14692,8 @@
+#else /* _VX_NETWORK_H */
+#warning duplicate inclusion
+#endif /* _VX_NETWORK_H */
---- linux-2.6.18.5/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/network_cmd.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/network_cmd.h 2007-02-06 03:05:22 +0100
@@ -0,0 +1,89 @@
+#ifndef _VX_NETWORK_CMD_H
+#define _VX_NETWORK_CMD_H
@@ -11719,7 +14716,7 @@
+};
+
+#ifdef __KERNEL__
-+extern int vc_nx_info(uint32_t, void __user *);
++extern int vc_nx_info(struct nx_info *, void __user *);
+
+#endif /* __KERNEL__ */
+
@@ -11746,10 +14743,10 @@
+
+#ifdef __KERNEL__
+extern int vc_net_create(uint32_t, void __user *);
-+extern int vc_net_migrate(uint32_t, void __user *);
++extern int vc_net_migrate(struct nx_info *, void __user *);
+
-+extern int vc_net_add(uint32_t, void __user *);
-+extern int vc_net_remove(uint32_t, void __user *);
++extern int vc_net_add(struct nx_info *, void __user *);
++extern int vc_net_remove(struct nx_info *, void __user *);
+
+#endif /* __KERNEL__ */
+
@@ -11765,8 +14762,8 @@
+};
+
+#ifdef __KERNEL__
-+extern int vc_get_nflags(uint32_t, void __user *);
-+extern int vc_set_nflags(uint32_t, void __user *);
++extern int vc_get_nflags(struct nx_info *, void __user *);
++extern int vc_set_nflags(struct nx_info *, void __user *);
+
+#endif /* __KERNEL__ */
+
@@ -11782,13 +14779,13 @@
+};
+
+#ifdef __KERNEL__
-+extern int vc_get_ncaps(uint32_t, void __user *);
-+extern int vc_set_ncaps(uint32_t, void __user *);
++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 */
---- linux-2.6.18.5/include/linux/vserver/sched.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/sched.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/include/linux/vserver/sched.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/sched.h 2007-02-06 03:05:22 +0100
@@ -0,0 +1,26 @@
+#ifndef _VX_SCHED_H
+#define _VX_SCHED_H
@@ -11806,19 +14803,19 @@
+void vx_update_load(struct vx_info *);
+
+
-+struct task_struct;
-+
-+int vx_effective_vavavoom(struct vx_info *, int);
++int vx_tokens_recalc(struct _vx_sched_pc *,
++ unsigned long *, unsigned long *, int [2]);
+
-+int vx_tokens_recalc(struct vx_info *);
++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 */
---- linux-2.6.18.5/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/sched_cmd.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,48 @@
+--- linux-2.6.20/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/sched_cmd.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,108 @@
+#ifndef _VX_SCHED_CMD_H
+#define _VX_SCHED_CMD_H
+
@@ -11826,7 +14823,8 @@
+/* sched vserver commands */
+
+#define VCMD_set_sched_v2 VC_CMD(SCHED, 1, 2)
-+#define VCMD_set_sched VC_CMD(SCHED, 1, 3)
++#define VCMD_set_sched_v3 VC_CMD(SCHED, 1, 3)
++#define VCMD_set_sched_v4 VC_CMD(SCHED, 1, 4)
+
+struct vcmd_set_sched_v2 {
+ int32_t fill_rate;
@@ -11847,29 +14845,88 @@
+ int32_t priority_bias;
+};
+
++struct vcmd_set_sched_v4 {
++ uint32_t set_mask;
++ int32_t fill_rate;
++ int32_t interval;
++ int32_t tokens;
++ int32_t tokens_min;
++ int32_t tokens_max;
++ int32_t prio_bias;
++ int32_t cpu_id;
++ int32_t bucket_id;
++};
++
++#define VCMD_set_sched VC_CMD(SCHED, 1, 5)
++#define VCMD_get_sched VC_CMD(SCHED, 2, 5)
++
++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;
++};
+
+#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 SCHED_KEEP (-2)
++#define VXSM_IDLE_TIME 0x0200
++#define VXSM_FORCE 0x0400
++
++#define VXSM_V3_MASK 0x0173
++#define VXSM_SET_MASK 0x01FF
++
++#define VXSM_CPU_ID 0x1000
++#define VXSM_BUCKET_ID 0x2000
++
++#define VXSM_MSEC 0x4000
++
++#define SCHED_KEEP (-2) /* only for v2 */
+
+#ifdef __KERNEL__
+
+#include <linux/compiler.h>
+
-+extern int vc_set_sched_v1(uint32_t, void __user *);
-+extern int vc_set_sched_v2(uint32_t, void __user *);
-+extern int vc_set_sched(uint32_t, void __user *);
++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 *);
++
++#endif /* __KERNEL__ */
++
++#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;
++};
++
++#ifdef __KERNEL__
++
++extern int vc_sched_info(struct vx_info *, void __user *);
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */
---- linux-2.6.18.5/include/linux/vserver/sched_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/sched_def.h 2006-10-20 00:46:11 +0200
-@@ -0,0 +1,38 @@
+--- linux-2.6.20/include/linux/vserver/sched_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/sched_def.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,68 @@
+#ifndef _VX_SCHED_DEF_H
+#define _VX_SCHED_DEF_H
+
@@ -11880,36 +14937,66 @@
+#include <asm/param.h>
+
+
-+struct _vx_ticks {
-+ uint64_t user_ticks; /* token tick events */
-+ uint64_t sys_ticks; /* token tick events */
-+ uint64_t hold_ticks; /* token ticks paused */
-+ uint64_t unused[5]; /* cacheline ? */
-+};
-+
+/* context sub struct */
+
+struct _vx_sched {
-+ atomic_t tokens; /* number of CPU tokens */
+ spinlock_t tokens_lock; /* lock for token bucket */
+
-+ int fill_rate; /* Fill rate: add X tokens... */
-+ int interval; /* Divisor: per Y jiffies */
++ int tokens; /* number of CPU tokens */
++ int fill_rate[2]; /* Fill rate: add X tokens... */
++ int interval[2]; /* Divisor: per Y jiffies */
++ int tokens_min; /* Limit: minimum for unhold */
++ int tokens_max; /* Limit: no more than N tokens */
++
++ int prio_bias; /* bias offset for priority */
++
++ 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 */
++
++ 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 */
-+ uint32_t jiffies; /* last time accounted */
+
-+ int priority_bias; /* bias offset for priority */
++ int prio_bias; /* bias offset for priority */
+ int vavavoom; /* last calculated vavavoom */
+
-+ cpumask_t cpus_allowed; /* cpu mask for context */
++ 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 _vx_ticks cpu[NR_CPUS];
++ uint64_t user_ticks; /* token tick events */
++ uint64_t sys_ticks; /* token tick events */
++ uint64_t hold_ticks; /* token ticks paused */
+};
+
++
++#define VXSF_ONHOLD 0x0001
++#define VXSF_IDLE_TIME 0x0100
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++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
++
+#endif /* _VX_SCHED_DEF_H */
---- linux-2.6.18.5/include/linux/vserver/signal.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/signal.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/include/linux/vserver/signal.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/signal.h 2007-02-06 03:05:22 +0100
@@ -0,0 +1,14 @@
+#ifndef _VX_SIGNAL_H
+#define _VX_SIGNAL_H
@@ -11924,39 +15011,101 @@
+#endif /* __KERNEL__ */
+#else /* _VX_SIGNAL_H */
+#warning duplicate inclusion
-+#endif /* _VX_SIGNAL_H */
---- linux-2.6.18.5/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/signal_cmd.h 2006-09-20 17:01:45 +0200
++#endif /* _VX_SIGNAL_H */
+--- linux-2.6.20/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/signal_cmd.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,43 @@
++#ifndef _VX_SIGNAL_CMD_H
++#define _VX_SIGNAL_CMD_H
++
++
++/* signalling vserver commands */
++
++#define VCMD_ctx_kill VC_CMD(PROCTRL, 1, 0)
++#define VCMD_wait_exit VC_CMD(EVENT, 99, 0)
++
++struct vcmd_ctx_kill_v0 {
++ int32_t pid;
++ int32_t sig;
++};
++
++struct vcmd_wait_exit_v0 {
++ int32_t reboot_cmd;
++ int32_t exit_code;
++};
++
++#ifdef __KERNEL__
++
++extern int vc_ctx_kill(struct vx_info *, void __user *);
++extern int vc_wait_exit(struct vx_info *, void __user *);
++
++#endif /* __KERNEL__ */
++
++/* process alteration commands */
++
++#define VCMD_get_pflags VC_CMD(PROCALT, 5, 0)
++#define VCMD_set_pflags VC_CMD(PROCALT, 6, 0)
++
++struct vcmd_pflags_v0 {
++ uint32_t flagword;
++ uint32_t mask;
++};
++
++#ifdef __KERNEL__
++
++extern int vc_get_pflags(uint32_t pid, void __user *);
++extern int vc_set_pflags(uint32_t pid, void __user *);
++
++#endif /* __KERNEL__ */
++#endif /* _VX_SIGNAL_CMD_H */
+--- linux-2.6.20/include/linux/vserver/space.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/space.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,13 @@
++#ifndef _VX_SPACE_H
++#define _VX_SPACE_H
++
++
++#include <linux/types.h>
++
++struct vx_info;
++
++int vx_set_space(struct vx_info *vxi, unsigned long mask);
++
++#else /* _VX_SPACE_H */
++#warning duplicate inclusion
++#endif /* _VX_SPACE_H */
+--- linux-2.6.20/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/space_cmd.h 2007-02-06 03:05:22 +0100
@@ -0,0 +1,26 @@
-+#ifndef _VX_SIGNAL_CMD_H
-+#define _VX_SIGNAL_CMD_H
++#ifndef _VX_SPACE_CMD_H
++#define _VX_SPACE_CMD_H
+
+
-+/* signalling vserver commands */
++#define VCMD_enter_space_v0 VC_CMD(PROCALT, 1, 0)
++#define VCMD_enter_space VC_CMD(PROCALT, 1, 1)
+
-+#define VCMD_ctx_kill VC_CMD(PROCTRL, 1, 0)
-+#define VCMD_wait_exit VC_CMD(EVENT, 99, 0)
++#define VCMD_set_space_v0 VC_CMD(PROCALT, 3, 0)
++#define VCMD_set_space VC_CMD(PROCALT, 3, 1)
+
-+struct vcmd_ctx_kill_v0 {
-+ int32_t pid;
-+ int32_t sig;
-+};
++#define VCMD_get_space_mask VC_CMD(PROCALT, 4, 0)
+
-+struct vcmd_wait_exit_v0 {
-+ int32_t reboot_cmd;
-+ int32_t exit_code;
++
++struct vcmd_space_mask {
++ uint64_t mask;
+};
+
++
+#ifdef __KERNEL__
+
-+extern int vc_ctx_kill(uint32_t, void __user *);
-+extern int vc_wait_exit(uint32_t, 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(struct vx_info *, void __user *);
+
+#endif /* __KERNEL__ */
-+#endif /* _VX_SIGNAL_CMD_H */
---- linux-2.6.18.5/include/linux/vserver/switch.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/switch.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,98 @@
++#endif /* _VX_SPACE_CMD_H */
+--- linux-2.6.20/include/linux/vserver/switch.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/switch.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,95 @@
+#ifndef _VX_SWITCH_H
+#define _VX_SWITCH_H
+
@@ -11993,7 +15142,7 @@
+ DISK | | | | |DLIMIT | | |INODE | |
+ VFS | 32| 33| 34| 35| 36| 37| | 38| 39|
+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
-+ OTHER | | | | | | | |VINFO | |
++ OTHER |VSTAT | | | | | | |VINFO | |
+ | 40| 41| 42| 43| 44| 45| | 46| 47|
+ =======+=======+=======+=======+=======+=======+=======+ +=======+=======+
+ SPECIAL|EVENT | | | |FLAGS | | | | |
@@ -12025,6 +15174,7 @@
+#define VC_CAT_DLIMIT 36
+#define VC_CAT_INODE 38
+
++#define VC_CAT_VSTAT 40
+#define VC_CAT_VINFO 46
+#define VC_CAT_EVENT 48
+
@@ -12035,14 +15185,10 @@
+#define VC_CAT_SYSTEST 61
+#define VC_CAT_COMPAT 63
+
-+/* interface version */
-+
-+#define VCI_VERSION 0x00020002
-+#define VCI_LEGACY_VERSION 0x000100FF
-+
+/* query version */
+
+#define VCMD_get_version VC_CMD(VERSION, 0, 0)
++#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
+
+
+#ifdef __KERNEL__
@@ -12055,136 +15201,136 @@
+#endif /* __KERNEL__ */
+
+#endif /* _VX_SWITCH_H */
---- linux-2.6.18.5/include/linux/vserver/xid.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/linux/vserver/xid.h 2006-10-29 05:06:18 +0100
-@@ -0,0 +1,144 @@
-+#ifndef _VX_XID_H
-+#define _VX_XID_H
+--- linux-2.6.20/include/linux/vserver/tag.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/linux/vserver/tag.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,153 @@
++#ifndef _DX_TAG_H
++#define _DX_TAG_H
+
+
-+#define XID_TAG(in) (IS_TAGXID(in))
++#define DX_TAG(in) (IS_TAGGED(in))
+
+
-+#ifdef CONFIG_XID_TAG_NFSD
-+#define XID_TAG_NFSD 1
++#ifdef CONFIG_DX_TAG_NFSD
++#define DX_TAG_NFSD 1
+#else
-+#define XID_TAG_NFSD 0
++#define DX_TAG_NFSD 0
+#endif
+
+
-+#ifdef CONFIG_INOXID_NONE
++#ifdef CONFIG_TAGGING_NONE
+
+#define MAX_UID 0xFFFFFFFF
+#define MAX_GID 0xFFFFFFFF
+
-+#define INOXID_XID(tag, uid, gid, xid) (0)
++#define INOTAG_TAG(cond, uid, gid, tag) (0)
+
-+#define XIDINO_UID(tag, uid, xid) (uid)
-+#define XIDINO_GID(tag, gid, xid) (gid)
++#define TAGINO_UID(cond, uid, tag) (uid)
++#define TAGINO_GID(cond, gid, tag) (gid)
+
+#endif
+
+
-+#ifdef CONFIG_INOXID_GID16
++#ifdef CONFIG_TAGGING_GID16
+
+#define MAX_UID 0xFFFFFFFF
+#define MAX_GID 0x0000FFFF
+
-+#define INOXID_XID(tag, uid, gid, xid) \
-+ ((tag) ? (((gid) >> 16) & 0xFFFF) : 0)
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? (((gid) >> 16) & 0xFFFF) : 0)
+
-+#define XIDINO_UID(tag, uid, xid) (uid)
-+#define XIDINO_GID(tag, gid, xid) \
-+ ((tag) ? (((gid) & 0xFFFF) | ((xid) << 16)) : (gid))
++#define TAGINO_UID(cond, uid, tag) (uid)
++#define TAGINO_GID(cond, gid, tag) \
++ ((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid))
+
+#endif
+
+
-+#ifdef CONFIG_INOXID_UGID24
++#ifdef CONFIG_TAGGING_ID24
+
+#define MAX_UID 0x00FFFFFF
+#define MAX_GID 0x00FFFFFF
+
-+#define INOXID_XID(tag, uid, gid, xid) \
-+ ((tag) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0)
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0)
+
-+#define XIDINO_UID(tag, uid, xid) \
-+ ((tag) ? (((uid) & 0xFFFFFF) | (((xid) & 0xFF00) << 16)) : (uid))
-+#define XIDINO_GID(tag, gid, xid) \
-+ ((tag) ? (((gid) & 0xFFFFFF) | (((xid) & 0x00FF) << 24)) : (gid))
++#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
+
+
-+#ifdef CONFIG_INOXID_UID16
++#ifdef CONFIG_TAGGING_UID16
+
+#define MAX_UID 0x0000FFFF
+#define MAX_GID 0xFFFFFFFF
+
-+#define INOXID_XID(tag, uid, gid, xid) \
-+ ((tag) ? (((uid) >> 16) & 0xFFFF) : 0)
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? (((uid) >> 16) & 0xFFFF) : 0)
+
-+#define XIDINO_UID(tag, uid, xid) \
-+ ((tag) ? (((uid) & 0xFFFF) | ((xid) << 16)) : (uid))
-+#define XIDINO_GID(tag, gid, xid) (gid)
++#define TAGINO_UID(cond, uid, tag) \
++ ((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid))
++#define TAGINO_GID(cond, gid, tag) (gid)
+
+#endif
+
+
-+#ifdef CONFIG_INOXID_INTERN
++#ifdef CONFIG_TAGGING_INTERN
+
+#define MAX_UID 0xFFFFFFFF
+#define MAX_GID 0xFFFFFFFF
+
-+#define INOXID_XID(tag, uid, gid, xid) \
-+ ((tag) ? (xid) : 0)
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? (tag) : 0)
+
-+#define XIDINO_UID(tag, uid, xid) (uid)
-+#define XIDINO_GID(tag, gid, xid) (gid)
++#define TAGINO_UID(cond, uid, tag) (uid)
++#define TAGINO_GID(cond, gid, tag) (gid)
+
+#endif
+
+
-+#ifdef CONFIG_INOXID_RUNTIME
++#ifdef CONFIG_TAGGING_RUNTIME
+
+#define MAX_UID 0xFFFFFFFF
+#define MAX_GID 0xFFFFFFFF
+
-+#define INOXID_XID(tag, uid, gid, xid) (0)
++#define INOTAG_TAG(cond, uid, gid, tag) (0)
+
-+#define XIDINO_UID(tag, uid, xid) (uid)
-+#define XIDINO_GID(tag, gid, xid) (gid)
++#define TAGINO_UID(cond, uid, tag) (uid)
++#define TAGINO_GID(cond, gid, tag) (gid)
+
+#endif
+
+
-+#ifndef CONFIG_INOXID_NONE
-+#define vx_current_fsxid(sb) \
-+ ((sb)->s_flags & MS_TAGXID ? current->xid : 0)
++#ifndef CONFIG_TAGGING_NONE
++#define dx_current_fstag(sb) \
++ ((sb)->s_flags & MS_TAGGED ? dx_current_tag(): 0)
+#else
-+#define vx_current_fsxid(sb) (0)
++#define dx_current_fstag(sb) (0)
+#endif
+
-+#ifndef CONFIG_INOXID_INTERN
-+#define XIDINO_XID(tag, xid) (0)
++#ifndef CONFIG_TAGGING_INTERN
++#define TAGINO_TAG(cond, tag) (0)
+#else
-+#define XIDINO_XID(tag, xid) ((tag) ? (xid) : 0)
++#define TAGINO_TAG(cond, tag) ((cond) ? (tag) : 0)
+#endif
+
-+#define INOXID_UID(tag, uid, gid) \
-+ ((tag) ? ((uid) & MAX_UID) : (uid))
-+#define INOXID_GID(tag, uid, gid) \
-+ ((tag) ? ((gid) & MAX_GID) : (gid))
++#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 vx_map_uid(uid_t uid)
++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 vx_map_gid(gid_t gid)
++static inline gid_t dx_map_gid(gid_t gid)
+{
+ if ((gid > MAX_GID) && (gid != -1))
+ gid = -2;
@@ -12193,18 +15339,35 @@
+
+
+#ifdef CONFIG_VSERVER_LEGACY
-+#define FIOC_GETXID _IOR('x', 1, long)
-+#define FIOC_SETXID _IOW('x', 2, long)
-+#define FIOC_SETXIDJ _IOW('x', 3, long)
++#define FIOC_GETTAG _IOR('x', 1, long)
++#define FIOC_SETTAG _IOW('x', 2, long)
++#define FIOC_SETTAGJ _IOW('x', 3, long)
++#endif
++
++#ifdef CONFIG_PROPAGATE
++
++int dx_parse_tag(char *string, tag_t *tag, int remove);
++
++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
+
-+int vx_parse_xid(char *string, xid_t *xid, int remove);
-+void vx_propagate_xid(struct nameidata *nd, struct inode *inode);
-+
-+#endif /* _VX_XID_H */
---- linux-2.6.18.5/include/net/af_unix.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/net/af_unix.h 2006-09-20 17:01:45 +0200
-@@ -17,9 +17,9 @@ extern spinlock_t unix_table_lock;
++#endif /* _DX_TAG_H */
+--- linux-2.6.20/include/net/af_unix.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.20-vs2.2.0-pre1/include/net/af_unix.h 2007-02-06 03:05:22 +0100
+@@ -4,6 +4,7 @@
+ #include <linux/socket.h>
+ #include <linux/un.h>
+ #include <linux/mutex.h>
++#include <linux/vs_base.h>
+ #include <net/sock.h>
+
+ extern void unix_inflight(struct file *fp);
+@@ -17,9 +18,9 @@ extern spinlock_t unix_table_lock;
extern atomic_t unix_tot_inflight;
@@ -12216,7 +15379,7 @@
if (!hlist_empty(&unix_socket_table[*i]))
return __sk_head(&unix_socket_table[*i]);
}
-@@ -28,16 +28,19 @@ static inline struct sock *first_unix_so
+@@ -28,16 +29,19 @@ static inline struct sock *first_unix_so
static inline struct sock *next_unix_socket(int *i, struct sock *s)
{
@@ -12235,7 +15398,7 @@
+ s = sk_next(s);
+ if (!s)
+ s = next_unix_socket_table(i);
-+ } while (s && !vx_check(s->sk_xid, VX_IDENT|VX_WATCH));
++ } while (s && !nx_check(s->sk_nid, VS_WATCH_P|VS_IDENT));
+ return s;
+}
+
@@ -12246,9 +15409,9 @@
}
#define forall_unix_sockets(i, s) \
---- linux-2.6.18.5/include/net/inet_hashtables.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/net/inet_hashtables.h 2006-09-20 17:01:45 +0200
-@@ -271,6 +271,25 @@ static inline int inet_iif(const struct
+--- linux-2.6.20/include/net/inet_hashtables.h 2007-02-06 03:01:52 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/net/inet_hashtables.h 2007-02-06 03:05:22 +0100
+@@ -271,6 +271,26 @@ static inline int inet_iif(const struct
return ((struct rtable *)skb->dst)->rt_iif;
}
@@ -12271,30 +15434,22 @@
+ return 0;
+}
+
- extern struct sock *__inet_lookup_listener(const struct hlist_head *head,
- const u32 daddr,
++
+ extern struct sock *__inet_lookup_listener(struct inet_hashinfo *hashinfo,
+ const __be32 daddr,
const unsigned short hnum,
-@@ -291,7 +310,7 @@ static inline struct sock *
- const struct inet_sock *inet = inet_sk((sk = __sk_head(head)));
-
- if (inet->num == hnum && !sk->sk_node.next &&
-- (!inet->rcv_saddr || inet->rcv_saddr == daddr) &&
-+ inet_addr_match(sk->sk_nx_info, daddr, inet->rcv_saddr) &&
- (sk->sk_family == PF_INET || !ipv6_only_sock(sk)) &&
- !sk->sk_bound_dev_if)
- goto sherry_cache;
---- linux-2.6.18.5/include/net/inet_sock.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/net/inet_sock.h 2006-09-20 17:01:45 +0200
-@@ -114,6 +114,7 @@ struct inet_sock {
+--- linux-2.6.20/include/net/inet_sock.h 2006-11-30 21:19:40 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/net/inet_sock.h 2007-02-06 03:05:22 +0100
+@@ -112,6 +112,7 @@ struct inet_sock {
/* Socket demultiplex comparisons on incoming packets. */
- __u32 daddr;
- __u32 rcv_saddr;
-+ __u32 rcv_saddr2; /* Second bound ipv4 addr, for ipv4root */
- __u16 dport;
+ __be32 daddr;
+ __be32 rcv_saddr;
++ __be32 rcv_saddr2; /* Second bound ipv4 addr, for ipv4root */
+ __be16 dport;
__u16 num;
- __u32 saddr;
---- linux-2.6.18.5/include/net/inet_timewait_sock.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/net/inet_timewait_sock.h 2006-09-20 17:01:45 +0200
+ __be32 saddr;
+--- linux-2.6.20/include/net/inet_timewait_sock.h 2007-02-06 03:01:52 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/net/inet_timewait_sock.h 2007-02-06 03:05:22 +0100
@@ -115,6 +115,10 @@ struct inet_timewait_sock {
#define tw_refcnt __tw_common.skc_refcnt
#define tw_hash __tw_common.skc_hash
@@ -12306,9 +15461,9 @@
volatile unsigned char tw_substate;
/* 3 bits hole, try to pack */
unsigned char tw_rcv_wscale;
---- linux-2.6.18.5/include/net/route.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/net/route.h 2006-09-20 17:01:45 +0200
-@@ -27,11 +27,14 @@
+--- linux-2.6.20/include/net/route.h 2006-11-30 21:19:40 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/net/route.h 2007-02-06 03:05:22 +0100
+@@ -27,12 +27,16 @@
#include <net/dst.h>
#include <net/inetpeer.h>
#include <net/flow.h>
@@ -12318,12 +15473,14 @@
#include <linux/route.h>
#include <linux/ip.h>
#include <linux/cache.h>
+ #include <linux/security.h>
++#include <linux/vs_base.h>
+#include <linux/vs_network.h>
+#include <linux/in.h>
#ifndef __KERNEL__
#warning This file is not supposed to be used outside of kernel.
-@@ -143,6 +146,59 @@ static inline char rt_tos2priority(u8 to
+@@ -144,6 +148,59 @@ static inline char rt_tos2priority(u8 to
return ip_tos2prio[IPTOS_TOS(tos)>>1];
}
@@ -12380,10 +15537,10 @@
+ return 0;
+}
+
- static inline int ip_route_connect(struct rtable **rp, u32 dst,
- u32 src, u32 tos, int oif, u8 protocol,
- u16 sport, u16 dport, struct sock *sk)
-@@ -157,7 +213,27 @@ static inline int ip_route_connect(struc
+ static inline int ip_route_connect(struct rtable **rp, __be32 dst,
+ __be32 src, u32 tos, int oif, u8 protocol,
+ __be16 sport, __be16 dport, struct sock *sk)
+@@ -158,7 +215,27 @@ static inline int ip_route_connect(struc
.dport = dport } } };
int err;
@@ -12401,10 +15558,10 @@
+ err = ip_find_src(nx_info, rp, &fl);
+ if (err)
+ return err;
-+ if (fl.fl4_dst == IPI_LOOPBACK && !vx_check(0, VX_ADMIN))
++ if (fl.fl4_dst == IPI_LOOPBACK && !nx_check(0, VS_ADMIN))
+ fl.fl4_dst = nx_info->ipv4[0];
+#ifdef CONFIG_VSERVER_REMAP_SADDR
-+ if (fl.fl4_src == IPI_LOOPBACK && !vx_check(0, VX_ADMIN))
++ if (fl.fl4_src == IPI_LOOPBACK && !nx_check(0, VS_ADMIN))
+ fl.fl4_src = nx_info->ipv4[0];
+#endif
+ }
@@ -12412,9 +15569,9 @@
err = __ip_route_output_key(rp, &fl);
if (err)
return err;
---- linux-2.6.18.5/include/net/sock.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/include/net/sock.h 2006-09-20 17:01:45 +0200
-@@ -118,6 +118,10 @@ struct sock_common {
+--- linux-2.6.20/include/net/sock.h 2007-02-06 03:01:53 +0100
++++ linux-2.6.20-vs2.2.0-pre1/include/net/sock.h 2007-02-06 03:05:22 +0100
+@@ -119,6 +119,10 @@ struct sock_common {
atomic_t skc_refcnt;
unsigned int skc_hash;
struct proto *skc_prot;
@@ -12425,7 +15582,7 @@
};
/**
-@@ -194,6 +198,10 @@ struct sock {
+@@ -195,6 +199,10 @@ struct sock {
#define sk_refcnt __sk_common.skc_refcnt
#define sk_hash __sk_common.skc_hash
#define sk_prot __sk_common.skc_prot
@@ -12436,8 +15593,18 @@
unsigned char sk_shutdown : 2,
sk_no_check : 2,
sk_userlocks : 4;
---- linux-2.6.18.5/ipc/mqueue.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/ipc/mqueue.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/init/Makefile 2006-09-20 16:58:44 +0200
++++ linux-2.6.20-vs2.2.0-pre1/init/Makefile 2007-02-06 03:05:22 +0100
+@@ -15,6 +15,7 @@ clean-files := ../include/linux/compile.
+
+ # dependencies on generated files need to be listed explicitly
+
++$(obj)/main.o: include/linux/compile.h
+ $(obj)/version.o: include/linux/compile.h
+
+ # compile.h changes depending on hostname, generation number, etc,
+--- linux-2.6.20/ipc/mqueue.c 2007-02-06 03:01:55 +0100
++++ linux-2.6.20-vs2.2.0-pre1/ipc/mqueue.c 2007-02-06 03:05:22 +0100
@@ -29,6 +29,8 @@
#include <linux/audit.h>
#include <linux/signal.h>
@@ -12447,7 +15614,7 @@
#include <net/sock.h>
#include "util.h"
-@@ -152,17 +154,20 @@ static struct inode *mqueue_get_inode(st
+@@ -151,17 +153,20 @@ static struct inode *mqueue_get_inode(st
spin_lock(&mq_lock);
if (u->mq_bytes + mq_bytes < u->mq_bytes ||
u->mq_bytes + mq_bytes >
@@ -12469,7 +15636,7 @@
spin_unlock(&mq_lock);
goto out_inode;
}
-@@ -260,10 +265,14 @@ static void mqueue_delete_inode(struct i
+@@ -259,10 +264,14 @@ static void mqueue_delete_inode(struct i
(info->attr.mq_maxmsg * info->attr.mq_msgsize));
user = info->user;
if (user) {
@@ -12484,7 +15651,7 @@
free_uid(user);
}
}
-@@ -746,7 +755,7 @@ asmlinkage long sys_mq_unlink(const char
+@@ -747,7 +756,7 @@ asmlinkage long sys_mq_unlink(const char
if (inode)
atomic_inc(&inode->i_count);
@@ -12493,9 +15660,17 @@
out_err:
dput(dentry);
---- linux-2.6.18.5/ipc/msg.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/ipc/msg.c 2006-09-20 17:01:45 +0200
-@@ -103,6 +103,7 @@ static int newque(key_t key, int msgflg)
+--- linux-2.6.20/ipc/msg.c 2007-02-06 03:01:55 +0100
++++ linux-2.6.20-vs2.2.0-pre1/ipc/msg.c 2007-02-06 03:05:22 +0100
+@@ -36,6 +36,7 @@
+ #include <linux/seq_file.h>
+ #include <linux/mutex.h>
+ #include <linux/nsproxy.h>
++#include <linux/vs_base.h>
+
+ #include <asm/current.h>
+ #include <asm/uaccess.h>
+@@ -149,6 +150,7 @@ static int newque (struct ipc_namespace
msq->q_perm.mode = msgflg & S_IRWXUGO;
msq->q_perm.key = key;
@@ -12503,19 +15678,28 @@
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-@@ -847,6 +848,9 @@ static int sysvipc_msg_proc_show(struct
+@@ -925,6 +927,9 @@ static int sysvipc_msg_proc_show(struct
{
struct msg_queue *msq = it;
-+ if (!vx_check(msq->q_perm.xid, VX_IDENT))
++ if (!vx_check(msq->q_perm.xid, VS_WATCH_P|VS_IDENT))
+ return 0;
+
return seq_printf(s,
"%10d %10d %4o %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n",
msq->q_perm.key,
---- linux-2.6.18.5/ipc/sem.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/ipc/sem.c 2006-09-20 17:01:45 +0200
-@@ -183,6 +183,7 @@ static int newary (key_t key, int nsems,
+--- linux-2.6.20/ipc/sem.c 2007-02-06 03:01:55 +0100
++++ linux-2.6.20-vs2.2.0-pre1/ipc/sem.c 2007-02-06 03:05:22 +0100
+@@ -83,6 +83,8 @@
+ #include <linux/seq_file.h>
+ #include <linux/mutex.h>
+ #include <linux/nsproxy.h>
++#include <linux/vs_base.h>
++#include <linux/vs_limit.h>
+
+ #include <asm/uaccess.h>
+ #include "util.h"
+@@ -230,6 +232,7 @@ static int newary (struct ipc_namespace
sma->sem_perm.mode = (semflg & S_IRWXUGO);
sma->sem_perm.key = key;
@@ -12523,42 +15707,62 @@
sma->sem_perm.security = NULL;
retval = security_sem_alloc(sma);
-@@ -1346,6 +1347,9 @@ static int sysvipc_sem_proc_show(struct
+@@ -245,6 +248,9 @@ static int newary (struct ipc_namespace
+ return -ENOSPC;
+ }
+ ns->used_sems += nsems;
++ /* FIXME: obsoleted? */
++ vx_semary_inc(sma);
++ vx_nsems_add(sma, nsems);
+
+ sma->sem_id = sem_buildid(ns, id, sma->sem_perm.seq);
+ sma->sem_base = (struct sem *) &sma[1];
+@@ -526,6 +532,9 @@ static void freeary (struct ipc_namespac
+ sem_unlock(sma);
+
+ ns->used_sems -= sma->sem_nsems;
++ /* FIXME: obsoleted? */
++ vx_nsems_sub(sma, sma->sem_nsems);
++ vx_semary_dec(sma);
+ size = sizeof (*sma) + sma->sem_nsems * sizeof (struct sem);
+ security_sem_free(sma);
+ ipc_rcu_putref(sma);
+@@ -1402,6 +1411,9 @@ static int sysvipc_sem_proc_show(struct
{
struct sem_array *sma = it;
-+ if (!vx_check(sma->sem_perm.xid, VX_IDENT))
++ if (!vx_check(sma->sem_perm.xid, VS_WATCH_P|VS_IDENT))
+ return 0;
+
return seq_printf(s,
"%10d %10d %4o %10lu %5u %5u %5u %5u %10lu %10lu\n",
sma->sem_perm.key,
---- linux-2.6.18.5/ipc/shm.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/ipc/shm.c 2006-09-20 17:01:45 +0200
-@@ -32,6 +32,8 @@
- #include <linux/ptrace.h>
+--- linux-2.6.20/ipc/shm.c 2007-02-06 03:01:55 +0100
++++ linux-2.6.20-vs2.2.0-pre1/ipc/shm.c 2007-02-06 03:05:22 +0100
+@@ -37,6 +37,8 @@
#include <linux/seq_file.h>
#include <linux/mutex.h>
+ #include <linux/nsproxy.h>
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
#include <asm/uaccess.h>
-@@ -116,7 +118,12 @@ static void shm_open (struct vm_area_str
+@@ -181,7 +183,12 @@ static void shm_open(struct vm_area_stru
*/
- static void shm_destroy (struct shmid_kernel *shp)
+ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp)
{
-- shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
+- ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
+ struct vx_info *vxi = lookup_vx_info(shp->shm_perm.xid);
+ int numpages = (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
+
+ vx_ipcshm_sub(vxi, shp, numpages);
-+ shm_tot -= numpages;
++ ns->shm_tot -= numpages;
+
- shm_rmid (shp->id);
+ shm_rmid(ns, shp->id);
shm_unlock(shp);
if (!is_file_hugepages(shp->shm_file))
-@@ -126,6 +133,7 @@ static void shm_destroy (struct shmid_ke
+@@ -191,6 +198,7 @@ static void shm_destroy(struct ipc_names
shp->mlock_user);
fput (shp->shm_file);
security_shm_free(shp);
@@ -12566,13 +15770,13 @@
ipc_rcu_putref(shp);
}
-@@ -202,12 +210,15 @@ static int newseg (key_t key, int shmflg
-
- if (shm_tot + numpages >= shm_ctlall)
+@@ -282,11 +290,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))
+ return -ENOSPC;
-
++
shp = ipc_rcu_alloc(sizeof(*shp));
if (!shp)
return -ENOMEM;
@@ -12582,83 +15786,141 @@
shp->shm_perm.mode = (shmflg & S_IRWXUGO);
shp->mlock_user = NULL;
-@@ -258,6 +269,7 @@ static int newseg (key_t key, int shmflg
+@@ -339,6 +351,7 @@ static int newseg (struct ipc_namespace
file->f_op = &shm_file_operations;
- shm_tot += numpages;
+ ns->shm_tot += numpages;
+ vx_ipcshm_add(current->vx_info, key, numpages);
shm_unlock(shp);
return shp->id;
-@@ -910,6 +922,9 @@ static int sysvipc_shm_proc_show(struct
+@@ -993,6 +1006,9 @@ static int sysvipc_shm_proc_show(struct
#define SMALL_STRING "%10d %10d %4o %10u %5u %5u %5d %5u %5u %5u %5u %10lu %10lu %10lu\n"
#define BIG_STRING "%10d %10d %4o %21u %5u %5u %5d %5u %5u %5u %5u %10lu %10lu %10lu\n"
-+ if (!vx_check(shp->shm_perm.xid, VX_IDENT))
++ if (!vx_check(shp->shm_perm.xid, VS_WATCH_P|VS_IDENT))
+ return 0;
+
if (sizeof(size_t) <= sizeof(int))
format = SMALL_STRING;
else
---- linux-2.6.18.5/ipc/util.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/ipc/util.c 2006-09-20 17:01:45 +0200
-@@ -157,7 +157,9 @@ int ipc_findkey(struct ipc_ids* ids, key
+--- linux-2.6.20/ipc/util.c 2007-02-06 03:01:55 +0100
++++ linux-2.6.20-vs2.2.0-pre1/ipc/util.c 2007-02-06 03:05:22 +0100
+@@ -33,6 +33,8 @@
+ #include <linux/proc_fs.h>
+ #include <linux/audit.h>
+ #include <linux/nsproxy.h>
++#include <linux/vs_base.h>
++#include <linux/vserver/global.h>
+
+ #include <asm/unistd.h>
+
+@@ -73,6 +75,7 @@ static struct ipc_namespace *clone_ipc_n
+ goto err_shm;
+
+ kref_init(&ns->kref);
++ atomic_inc(&vs_global_ipc_ns);
+ return ns;
+
+ err_shm:
+@@ -142,6 +145,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);
+ }
+ #endif
+@@ -261,7 +265,9 @@ int ipc_findkey(struct ipc_ids* ids, key
*/
for (id = 0; id <= max_id; id++) {
p = ids->entries->p[id];
- if(p==NULL)
+ if (p==NULL)
+ continue;
-+ if (!vx_check(p->xid, VX_IDENT))
++ if (!vx_check(p->xid, VS_WATCH_P|VS_IDENT))
continue;
if (key == p->key)
return id;
-@@ -470,6 +472,9 @@ int ipcperms (struct kern_ipc_perm *ipcp
+@@ -579,6 +585,9 @@ int ipcperms (struct kern_ipc_perm *ipcp
if (unlikely((err = audit_ipc_obj(ipcp))))
return err;
+
-+ if (!vx_check(ipcp->xid, VX_ADMIN|VX_IDENT)) /* maybe just VX_IDENT? */
++ if (!vx_check(ipcp->xid, VS_WATCH_P|VS_IDENT)) /* maybe just VS_IDENT? */
+ return -1;
requested_mode = (flag >> 6) | (flag >> 3) | flag;
granted_mode = ipcp->mode;
if (current->euid == ipcp->cuid || current->euid == ipcp->uid)
---- linux-2.6.18.5/kernel/Makefile 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/Makefile 2006-09-20 17:38:59 +0200
+--- linux-2.6.20/kernel/Makefile 2007-02-06 03:01:55 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/Makefile 2007-02-06 03:05:22 +0100
@@ -10,6 +10,8 @@ obj-y = sched.o fork.o exec_domain.o
kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \
- hrtimer.o rwsem.o
+ hrtimer.o rwsem.o latency.o nsproxy.o srcu.o
+obj-y += vserver/
+
obj-$(CONFIG_STACKTRACE) += stacktrace.o
obj-y += time/
obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
---- linux-2.6.18.5/kernel/capability.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/capability.c 2006-10-18 01:19:40 +0200
-@@ -246,6 +246,9 @@ EXPORT_SYMBOL(__capable);
+--- linux-2.6.20/kernel/capability.c 2006-11-30 21:19:43 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/capability.c 2007-02-06 03:05:22 +0100
+@@ -12,6 +12,7 @@
+ #include <linux/module.h>
+ #include <linux/security.h>
+ #include <linux/syscalls.h>
++#include <linux/vs_context.h>
+ #include <asm/uaccess.h>
+
+ unsigned securebits = SECUREBITS_DEFAULT; /* systemwide security settings */
+@@ -244,8 +245,12 @@ int __capable(struct task_struct *t, int
+ }
+ EXPORT_SYMBOL(__capable);
++#include <linux/vserver/base.h>
int capable(int cap)
{
+ /* here for now so we don't require task locking */
-+ if (vx_check_bit(VXC_CAP_MASK, cap) && !vx_mcaps(1L << cap))
++ if (vs_check_bit(VXC_CAP_MASK, cap) && !vx_mcaps(1L << cap))
+ return 0;
return __capable(current, cap);
}
EXPORT_SYMBOL(capable);
---- linux-2.6.18.5/kernel/exit.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/exit.c 2006-11-06 05:08:58 +0100
-@@ -38,6 +38,9 @@
- #include <linux/pipe_fs_i.h>
+--- linux-2.6.20/kernel/compat.c 2006-11-30 21:19:43 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/compat.c 2007-02-06 03:05:22 +0100
+@@ -846,7 +846,7 @@ asmlinkage long compat_sys_time(compat_t
+ compat_time_t i;
+ struct timeval tv;
+
+- do_gettimeofday(&tv);
++ vx_gettimeofday(&tv);
+ i = tv.tv_sec;
+
+ if (tloc) {
+@@ -870,7 +870,7 @@ asmlinkage long compat_sys_stime(compat_
+ if (err)
+ return err;
+
+- do_settimeofday(&tv);
++ vx_settimeofday(&tv);
+ return 0;
+ }
+
+--- linux-2.6.20/kernel/exit.c 2007-02-06 03:01:55 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/exit.c 2007-02-06 05:17:54 +0100
+@@ -42,6 +42,11 @@
#include <linux/audit.h> /* for audit_free() */
#include <linux/resource.h>
+ #include <linux/blkdev.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 <asm/uaccess.h>
#include <asm/unistd.h>
-@@ -444,9 +447,11 @@ static void close_files(struct files_str
+@@ -433,9 +438,11 @@ static void close_files(struct files_str
struct file * file = xchg(&fdt->fd[i], NULL);
if (file)
filp_close(file, files);
@@ -12670,28 +15932,37 @@
}
}
}
-@@ -587,6 +592,11 @@ static void exit_mm(struct task_struct *
+@@ -515,6 +522,7 @@ static inline void __put_fs_struct(struc
+ dput(fs->altroot);
+ mntput(fs->altrootmnt);
+ }
++ atomic_dec(&vs_global_fs);
+ kmem_cache_free(fs_cachep, fs);
+ }
+ }
+@@ -586,6 +594,11 @@ static void exit_mm(struct task_struct *
static inline void
choose_new_parent(struct task_struct *p, struct task_struct *reaper)
{
+ /* check for reaper context */
-+ vxwprintk((p->xid != reaper->xid) && (reaper != child_reaper),
++ vxwprintk((p->xid != reaper->xid) && (reaper != &init_task),
+ "rogue reaper: %p[%d,#%u] <> %p[%d,#%u]",
+ p, p->pid, p->xid, reaper, reaper->pid, reaper->xid);
+
/*
* Make sure we're not reparenting to ourselves and that
* the parent is not a zombie.
-@@ -669,7 +679,7 @@ forget_original_parent(struct task_struc
+@@ -677,7 +690,8 @@ forget_original_parent(struct task_struc
do {
reaper = next_thread(reaper);
if (reaper == father) {
-- reaper = child_reaper;
+- reaper = child_reaper(father);
++ // reaper = child_reaper(father);
+ reaper = vx_child_reaper(father);
break;
}
} while (reaper->exit_state);
-@@ -693,7 +703,7 @@ forget_original_parent(struct task_struc
+@@ -701,7 +715,7 @@ forget_original_parent(struct task_struc
if (father == p->real_parent) {
/* reparent with a reaper, real father it's us */
@@ -12700,16 +15971,19 @@
reparent_thread(p, father, 0);
} else {
/* reparent ptraced task to its real parent */
-@@ -930,6 +940,8 @@ fastcall NORET_TYPE void do_exit(long co
-
+@@ -939,7 +953,11 @@ fastcall NORET_TYPE void do_exit(long co
tsk->exit_code = code;
proc_exit_connector(tsk);
+ exit_task_namespaces(tsk);
++ // ns = exit_task_namespaces_early(tsk);
+ /* needs to stay before exit_notify() */
+ exit_vx_info_early(tsk, code);
exit_notify(tsk);
++ // exit_task_namespaces(tsk, ns);
#ifdef CONFIG_NUMA
mpol_free(tsk->mempolicy);
-@@ -954,6 +966,10 @@ fastcall NORET_TYPE void do_exit(long co
+ tsk->mempolicy = NULL;
+@@ -963,6 +981,10 @@ fastcall NORET_TYPE void do_exit(long co
if (tsk->splice_pipe)
__free_pipe_info(tsk->splice_pipe);
@@ -12717,23 +15991,24 @@
+ exit_vx_info(tsk, code);
+ exit_nx_info(tsk);
+
- /* PF_DEAD causes final put_task_struct after we schedule. */
preempt_disable();
- BUG_ON(tsk->flags & PF_DEAD);
---- linux-2.6.18.5/kernel/fork.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/fork.c 2006-09-20 17:35:08 +0200
-@@ -45,6 +45,10 @@
- #include <linux/cn_proc.h>
+ /* causes final put_task_struct in finish_task_switch(). */
+ tsk->state = TASK_DEAD;
+--- linux-2.6.20/kernel/fork.c 2007-02-06 03:01:55 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/fork.c 2007-02-06 05:16:52 +0100
+@@ -49,6 +49,11 @@
#include <linux/delayacct.h>
#include <linux/taskstats_kern.h>
+ #include <linux/random.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 <asm/pgtable.h>
#include <asm/pgalloc.h>
-@@ -104,6 +108,8 @@ void free_task(struct task_struct *tsk)
+@@ -108,6 +113,8 @@ void free_task(struct task_struct *tsk)
{
free_thread_info(tsk->thread_info);
rt_mutex_debug_task_free(tsk);
@@ -12742,7 +16017,7 @@
free_task_struct(tsk);
}
EXPORT_SYMBOL(free_task);
-@@ -205,6 +211,8 @@ static inline int dup_mmap(struct mm_str
+@@ -215,6 +222,8 @@ static inline int dup_mmap(struct mm_str
mm->free_area_cache = oldmm->mmap_base;
mm->cached_hole_size = ~0UL;
mm->map_count = 0;
@@ -12751,7 +16026,7 @@
cpus_clear(mm->cpu_vm_mask);
mm->mm_rb = RB_ROOT;
rb_link = &mm->mm_rb.rb_node;
-@@ -216,7 +224,7 @@ static inline int dup_mmap(struct mm_str
+@@ -226,7 +235,7 @@ static inline int dup_mmap(struct mm_str
if (mpnt->vm_flags & VM_DONTCOPY) {
long pages = vma_pages(mpnt);
@@ -12760,7 +16035,7 @@
vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
-pages);
continue;
-@@ -323,8 +331,6 @@ static struct mm_struct * mm_init(struct
+@@ -333,8 +342,6 @@ static struct mm_struct * mm_init(struct
INIT_LIST_HEAD(&mm->mmlist);
mm->core_waiters = 0;
mm->nr_ptes = 0;
@@ -12769,7 +16044,7 @@
spin_lock_init(&mm->page_table_lock);
rwlock_init(&mm->ioctx_list_lock);
mm->ioctx_list = NULL;
-@@ -333,6 +339,7 @@ static struct mm_struct * mm_init(struct
+@@ -343,6 +350,7 @@ static struct mm_struct * mm_init(struct
if (likely(!mm_alloc_pgd(mm))) {
mm->def_flags = 0;
@@ -12777,7 +16052,7 @@
return mm;
}
free_mm(mm);
-@@ -364,6 +371,7 @@ void fastcall __mmdrop(struct mm_struct
+@@ -374,6 +382,7 @@ void fastcall __mmdrop(struct mm_struct
BUG_ON(mm == &init_mm);
mm_free_pgd(mm);
destroy_context(mm);
@@ -12785,15 +16060,15 @@
free_mm(mm);
}
-@@ -469,6 +477,7 @@ static struct mm_struct *dup_mm(struct t
+@@ -488,6 +497,7 @@ static struct mm_struct *dup_mm(struct t
goto fail_nomem;
memcpy(mm, oldmm, sizeof(*mm));
+ mm->mm_vx_info = NULL;
- if (!mm_init(mm))
- goto fail_nomem;
-@@ -496,6 +505,7 @@ fail_nocontext:
+ /* Initializing for Swap token stuff */
+ mm->token_priority = 0;
+@@ -519,6 +529,7 @@ fail_nocontext:
* If init_new_context() failed, we cannot use mmput() to free the mm
* because it calls destroy_context()
*/
@@ -12801,7 +16076,15 @@
mm_free_pgd(mm);
free_mm(mm);
return NULL;
-@@ -691,6 +701,8 @@ static struct files_struct *dup_fd(struc
+@@ -589,6 +600,7 @@ static inline struct fs_struct *__copy_f
+ fs->altroot = NULL;
+ }
+ read_unlock(&old->lock);
++ atomic_inc(&vs_global_fs);
+ }
+ return fs;
+ }
+@@ -707,6 +719,8 @@ static struct files_struct *dup_fd(struc
struct file *f = *old_fds++;
if (f) {
get_file(f);
@@ -12810,7 +16093,7 @@
} else {
/*
* The fd may be claimed in the fd bitmap but not yet
-@@ -947,6 +959,8 @@ static struct task_struct *copy_process(
+@@ -958,6 +972,8 @@ static struct task_struct *copy_process(
{
int retval;
struct task_struct *p = NULL;
@@ -12819,7 +16102,7 @@
if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
return ERR_PTR(-EINVAL);
-@@ -979,12 +993,30 @@ static struct task_struct *copy_process(
+@@ -992,12 +1008,30 @@ static struct task_struct *copy_process(
DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
#endif
@@ -12834,7 +16117,7 @@
+ goto bad_fork_free;
+ }
+ if (p->mm && vx_flags(VXF_FORK_RSS, 0)) {
-+ if (!vx_rsspages_avail(p->mm, get_mm_counter(p->mm, file_rss)))
++ if (!vx_rss_avail(p->mm, get_mm_counter(p->mm, file_rss)))
+ goto bad_fork_cleanup_vm;
+ }
+
@@ -12851,7 +16134,7 @@
}
atomic_inc(&p->user->__count);
-@@ -1247,6 +1279,18 @@ static struct task_struct *copy_process(
+@@ -1260,6 +1294,18 @@ static struct task_struct *copy_process(
total_forks++;
spin_unlock(¤t->sighand->siglock);
@@ -12870,7 +16153,7 @@
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
return p;
-@@ -1288,6 +1332,9 @@ bad_fork_cleanup_count:
+@@ -1301,6 +1347,9 @@ bad_fork_cleanup_count:
put_group_info(p->group_info);
atomic_dec(&p->user->processes);
free_uid(p->user);
@@ -12880,19 +16163,25 @@
bad_fork_free:
free_task(p);
fork_out:
---- linux-2.6.18.5/kernel/irq/handle.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/irq/handle.c 2006-12-10 02:04:47 +0100
-@@ -15,6 +15,7 @@
- #include <linux/random.h>
- #include <linux/interrupt.h>
- #include <linux/kernel_stat.h>
-+#include <linux/vs_context.h>
-
- #include "internals.h"
+@@ -1361,6 +1410,15 @@ long do_fork(unsigned long clone_flags,
---- linux-2.6.18.5/kernel/kthread.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/kthread.c 2006-09-20 17:01:45 +0200
-@@ -123,7 +123,7 @@ static void keventd_create_kthread(void
+ if (!pid)
+ return -EAGAIN;
++
++ /* kernel threads are host only */
++ if ((clone_flags & CLONE_KTHREAD) && !vx_check(0, VS_ADMIN)) {
++ vxwprintk(1, "xid=%d tried to spawn a kernel thread.",
++ vx_current_xid());
++ free_pid(pid);
++ return -EPERM;
++ }
++
+ nr = pid->nr;
+ if (unlikely(current->ptrace)) {
+ trace = fork_traceflag (clone_flags);
+--- linux-2.6.20/kernel/kthread.c 2007-02-06 03:01:55 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/kthread.c 2007-02-06 03:05:22 +0100
+@@ -126,7 +126,7 @@ static void keventd_create_kthread(struc
} else {
wait_for_completion(&create->started);
read_lock(&tasklist_lock);
@@ -12901,32 +16190,58 @@
read_unlock(&tasklist_lock);
}
complete(&create->done);
---- linux-2.6.18.5/kernel/pid.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/pid.c 2006-11-06 05:17:10 +0100
-@@ -26,6 +26,7 @@
- #include <linux/init.h>
+--- linux-2.6.20/kernel/nsproxy.c 2007-02-06 03:01:55 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/nsproxy.c 2007-02-06 05:43:29 +0100
+@@ -20,14 +20,10 @@
+ #include <linux/mnt_namespace.h>
+ #include <linux/utsname.h>
+ #include <linux/pid_namespace.h>
++#include <linux/vserver/global.h>
+
+ struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
+
+-static inline void get_nsproxy(struct nsproxy *ns)
+-{
+- atomic_inc(&ns->count);
+-}
+-
+ void get_task_namespaces(struct task_struct *tsk)
+ {
+ struct nsproxy *ns = tsk->nsproxy;
+@@ -48,6 +44,7 @@ static inline struct nsproxy *clone_name
+ ns = kmemdup(orig, sizeof(struct nsproxy), GFP_KERNEL);
+ if (ns)
+ atomic_set(&ns->count, 1);
++ atomic_inc(&vs_global_nsproxy);
+ return ns;
+ }
+
+@@ -70,7 +67,6 @@ struct nsproxy *dup_namespaces(struct ns
+ if (ns->pid_ns)
+ get_pid_ns(ns->pid_ns);
+ }
+-
+ return ns;
+ }
+
+@@ -145,5 +141,6 @@ void free_nsproxy(struct nsproxy *ns)
+ put_ipc_ns(ns->ipc_ns);
+ if (ns->pid_ns)
+ put_pid_ns(ns->pid_ns);
++ atomic_dec(&vs_global_nsproxy);
+ kfree(ns);
+ }
+--- linux-2.6.20/kernel/pid.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/pid.c 2007-02-06 03:48:51 +0100
+@@ -27,6 +27,7 @@
#include <linux/bootmem.h>
#include <linux/hash.h>
-+#include <linux/vs_cvirt.h>
+ #include <linux/pid_namespace.h>
++#include <linux/vs_pid.h>
#define pid_hashfn(nr) hash_long((unsigned long)nr, pidhash_shift)
static struct hlist_head *pid_hash;
-@@ -260,6 +261,14 @@ struct task_struct * fastcall pid_task(s
- first = rcu_dereference(pid->tasks[type].first);
- if (first)
- result = hlist_entry(first, struct task_struct, pids[(type)].node);
-+ if (result && (pid->nr != 1) &&
-+ !vx_check(vx_task_xid(result), VX_WATCH|VX_ADMIN|VX_IDENT)) {
-+ vxwprintk((type == PIDTYPE_PID) && (current->xid),
-+ "pid_task(%d,%d): task %p[#%u,%u] did lookup %p[#%u,%u]",
-+ pid->nr, type, current, vx_current_xid(), current->pid,
-+ result, vx_task_xid(result), result->pid);
-+ result = NULL;
-+ }
- }
- return result;
- }
-@@ -269,6 +278,10 @@ struct task_struct * fastcall pid_task(s
+@@ -304,6 +305,10 @@ struct task_struct * fastcall pid_task(s
*/
struct task_struct *find_task_by_pid_type(int type, int nr)
{
@@ -12937,8 +16252,8 @@
return pid_task(find_pid(nr), type);
}
---- linux-2.6.18.5/kernel/posix-timers.c 2006-06-18 04:55:31 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/posix-timers.c 2006-10-17 02:39:53 +0200
+--- linux-2.6.20/kernel/posix-timers.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/posix-timers.c 2007-02-06 03:05:22 +0100
@@ -48,6 +48,7 @@
#include <linux/wait.h>
#include <linux/workqueue.h>
@@ -12997,17 +16312,17 @@
rtn->tgid != current->tgid ||
(event->sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_SIGNAL))
return NULL;
---- linux-2.6.18.5/kernel/printk.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/printk.c 2006-12-10 02:04:47 +0100
-@@ -31,6 +31,7 @@
- #include <linux/security.h>
+--- linux-2.6.20/kernel/printk.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/printk.c 2007-02-06 03:05:22 +0100
+@@ -32,6 +32,7 @@
#include <linux/bootmem.h>
#include <linux/syscalls.h>
-+#include <linux/vserver/cvirt.h>
+ #include <linux/jiffies.h>
++#include <linux/vs_cvirt.h>
#include <asm/uaccess.h>
-@@ -184,18 +185,13 @@ int do_syslog(int type, char __user *buf
+@@ -183,18 +184,13 @@ int do_syslog(int type, char __user *buf
unsigned long i, j, limit, count;
int do_clear = 0;
char c;
@@ -13028,12 +16343,12 @@
error = -EINVAL;
if (!buf || len < 0)
goto out;
-@@ -206,6 +202,16 @@ int do_syslog(int type, char __user *buf
+@@ -205,6 +201,16 @@ int do_syslog(int type, char __user *buf
error = -EFAULT;
goto out;
}
+ }
-+ if (!vx_check(0, VX_ADMIN|VX_WATCH))
++ if (!vx_check(0, VS_ADMIN|VS_WATCH))
+ return vx_do_syslog(type, buf, len);
+
+ switch (type) {
@@ -13045,7 +16360,7 @@
error = wait_event_interruptible(log_wait,
(log_start - log_end));
if (error)
-@@ -230,16 +236,6 @@ int do_syslog(int type, char __user *buf
+@@ -229,16 +235,6 @@ int do_syslog(int type, char __user *buf
do_clear = 1;
/* FALL THRU */
case 3: /* Read last kernel messages */
@@ -13062,430 +16377,979 @@
count = len;
if (count > log_buf_len)
count = log_buf_len;
---- linux-2.6.18.5/kernel/ptrace.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/ptrace.c 2006-10-18 01:19:40 +0200
-@@ -521,6 +521,10 @@ asmlinkage long sys_ptrace(long request,
+--- linux-2.6.20/kernel/ptrace.c 2006-11-30 21:19:44 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/ptrace.c 2007-02-06 03:05:22 +0100
+@@ -18,6 +18,7 @@
+ #include <linux/ptrace.h>
+ #include <linux/security.h>
+ #include <linux/signal.h>
++#include <linux/vs_context.h>
+
+ #include <asm/pgtable.h>
+ #include <asm/uaccess.h>
+@@ -144,6 +145,11 @@ static int may_attach(struct task_struct
+ dumpable = task->mm->dumpable;
+ if (!dumpable && !capable(CAP_SYS_PTRACE))
+ return -EPERM;
++ if (!vx_check(task->xid, VS_ADMIN_P|VS_IDENT))
++ return -EPERM;
++ if (!vx_check(task->xid, VS_IDENT) &&
++ !task_vx_flags(task, VXF_STATE_ADMIN, 0))
++ return -EACCES;
+
+ return security_ptrace(current, task);
+ }
+@@ -468,6 +474,10 @@ asmlinkage long sys_ptrace(long request,
goto out;
}
+ ret = -EPERM;
-+ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ 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);
goto out_put_task_struct;
---- linux-2.6.18.5/kernel/sched.c 2006-12-04 06:13:53 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/sched.c 2006-11-06 05:08:58 +0100
-@@ -55,6 +55,9 @@
+--- linux-2.6.20/kernel/sched.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/sched.c 2007-02-06 05:05:39 +0100
+@@ -55,6 +55,8 @@
#include <asm/tlb.h>
#include <asm/unistd.h>
-+#include <linux/vs_context.h>
-+#include <linux/vs_cvirt.h>
+#include <linux/vs_sched.h>
++#include <linux/vs_cvirt.h>
/*
* Convert user-nice values [ -20 ... 0 ... 19 ]
-@@ -243,6 +246,10 @@ struct rq {
+@@ -245,6 +247,16 @@ struct rq {
struct task_struct *migration_thread;
struct list_head migration_queue;
#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 */
-@@ -672,6 +679,7 @@ sched_info_switch(struct task_struct *pr
- */
- static void dequeue_task(struct task_struct *p, struct prio_array *array)
- {
-+ BUG_ON(p->state & TASK_ONHOLD);
- array->nr_active--;
- list_del(&p->run_list);
- if (list_empty(array->queue + p->prio))
-@@ -680,6 +688,7 @@ static void dequeue_task(struct task_str
+ #ifdef CONFIG_SCHEDSTATS
+ /* latency stats */
+@@ -677,6 +689,7 @@ sched_info_switch(struct task_struct *pr
+ */
+ static void dequeue_task(struct task_struct *p, struct prio_array *array)
+ {
++ BUG_ON(p->state & TASK_ONHOLD);
+ array->nr_active--;
+ list_del(&p->run_list);
+ if (list_empty(array->queue + p->prio))
+@@ -685,6 +698,7 @@ static void dequeue_task(struct task_str
+
+ static void enqueue_task(struct task_struct *p, struct prio_array *array)
+ {
++ BUG_ON(p->state & TASK_ONHOLD);
+ sched_info_queued(p);
+ list_add_tail(&p->run_list, array->queue + p->prio);
+ __set_bit(p->prio, array->bitmap);
+@@ -698,12 +712,14 @@ static void enqueue_task(struct task_str
+ */
+ static void requeue_task(struct task_struct *p, struct prio_array *array)
+ {
++ BUG_ON(p->state & TASK_ONHOLD);
+ list_move_tail(&p->run_list, array->queue + p->prio);
+ }
+
+ static inline void
+ enqueue_task_head(struct task_struct *p, struct prio_array *array)
+ {
++ BUG_ON(p->state & TASK_ONHOLD);
+ list_add(&p->run_list, array->queue + p->prio);
+ __set_bit(p->prio, array->bitmap);
+ array->nr_active++;
+@@ -732,6 +748,10 @@ static inline int __normal_prio(struct t
+ bonus = CURRENT_BONUS(p) - MAX_BONUS / 2;
+
+ prio = p->static_prio - bonus;
++
++ /* adjust effective priority */
++ prio = vx_adjust_prio(p, prio, MAX_USER_PRIO);
++
+ if (prio < MAX_RT_PRIO)
+ prio = MAX_RT_PRIO;
+ if (prio > MAX_PRIO-1)
+@@ -841,6 +861,9 @@ static int effective_prio(struct task_st
+ return p->prio;
+ }
+
++#include "sched_mon.h"
++
++
+ /*
+ * __activate_task - move a task to the runqueue.
+ */
+@@ -850,6 +873,7 @@ static void __activate_task(struct task_
+
+ if (batch_task(p))
+ target = rq->expired;
++ vxm_activate_task(p, rq);
+ enqueue_task(p, target);
+ inc_nr_running(p, rq);
+ }
+@@ -859,6 +883,7 @@ static void __activate_task(struct task_
+ */
+ static inline void __activate_idle_task(struct task_struct *p, struct rq *rq)
+ {
++ vxm_activate_idle(p, rq);
+ enqueue_task_head(p, rq->active);
+ inc_nr_running(p, rq);
+ }
+@@ -993,19 +1018,30 @@ static void activate_task(struct task_st
+ }
+ p->timestamp = now;
+ out:
++ vx_activate_task(p);
+ __activate_task(p, rq);
+ }
+
+ /*
+- * deactivate_task - remove a task from the runqueue.
++ * __deactivate_task - remove a task from the runqueue.
+ */
+-static void deactivate_task(struct task_struct *p, struct rq *rq)
++static void __deactivate_task(struct task_struct *p, struct rq *rq)
+ {
+ dec_nr_running(p, rq);
+ dequeue_task(p, p->array);
++ vxm_deactivate_task(p, rq);
+ p->array = NULL;
+ }
+
++static inline
++void deactivate_task(struct task_struct *p, struct rq *rq)
++{
++ vx_deactivate_task(p);
++ __deactivate_task(p, rq);
++}
++
++#include "sched_hard.h"
++
+ /*
+ * resched_task - mark a task 'to be rescheduled now'.
+ *
+@@ -1081,6 +1117,7 @@ migrate_task(struct task_struct *p, int
+ {
+ struct rq *rq = task_rq(p);
+
++ 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.
+@@ -1409,6 +1446,12 @@ static int try_to_wake_up(struct task_st
+
+ rq = task_rq_lock(p, &flags);
+ old_state = p->state;
++
++ /* 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;
+
+@@ -1516,6 +1559,7 @@ out_activate:
+ #endif /* CONFIG_SMP */
+ if (old_state == TASK_UNINTERRUPTIBLE) {
+ rq->nr_uninterruptible--;
++ vx_uninterruptible_dec(p);
+ /*
+ * Tasks on involuntary sleep don't earn
+ * sleep_avg beyond just interactive state.
+@@ -1567,7 +1611,7 @@ int fastcall wake_up_state(struct task_s
+ return try_to_wake_up(p, state, 0);
+ }
+
+-static void task_running_tick(struct rq *rq, struct task_struct *p);
++static void task_running_tick(struct rq *rq, struct task_struct *p, int cpu);
+ /*
+ * Perform scheduler related setup for a newly forked process p.
+ * p is forked by current.
+@@ -1628,7 +1672,7 @@ void fastcall sched_fork(struct task_str
+ * runqueue lock is not a problem.
+ */
+ current->time_slice = 1;
+- task_running_tick(cpu_rq(cpu), current);
++ task_running_tick(cpu_rq(cpu), current, cpu);
+ }
+ local_irq_enable();
+ put_cpu();
+@@ -1663,6 +1707,7 @@ void fastcall wake_up_new_task(struct ta
+
+ p->prio = effective_prio(p);
- static void enqueue_task(struct task_struct *p, struct prio_array *array)
++ vx_activate_task(p);
+ if (likely(cpu == this_cpu)) {
+ if (!(clone_flags & CLONE_VM)) {
+ /*
+@@ -1674,6 +1719,7 @@ void fastcall wake_up_new_task(struct ta
+ __activate_task(p, rq);
+ else {
+ p->prio = current->prio;
++ BUG_ON(p->state & TASK_ONHOLD);
+ p->normal_prio = current->normal_prio;
+ list_add_tail(&p->run_list, ¤t->run_list);
+ p->array = current->array;
+@@ -3065,13 +3111,16 @@ static inline int expired_starving(struc
+ void account_user_time(struct task_struct *p, cputime_t cputime)
{
-+ BUG_ON(p->state & TASK_ONHOLD);
- sched_info_queued(p);
- list_add_tail(&p->run_list, array->queue + p->prio);
- __set_bit(p->prio, array->bitmap);
-@@ -693,12 +702,14 @@ static void enqueue_task(struct task_str
- */
- static void requeue_task(struct task_struct *p, struct prio_array *array)
+ 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);
+
+ p->utime = cputime_add(p->utime, cputime);
++ vx_account_user(vxi, cputime, nice);
+
+ /* 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);
+@@ -3087,10 +3136,12 @@ void account_system_time(struct task_str
+ cputime_t cputime)
{
-+ BUG_ON(p->state & TASK_ONHOLD);
- list_move_tail(&p->run_list, array->queue + p->prio);
+ struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
++ struct vx_info *vxi = p->vx_info; /* p is _always_ current */
+ struct rq *rq = this_rq();
+ cputime64_t tmp;
+
+ p->stime = cputime_add(p->stime, cputime);
++ vx_account_system(vxi, cputime, (p == rq->idle));
+
+ /* Add system time to cpustat. */
+ tmp = cputime_to_cputime64(cputime);
+@@ -3129,7 +3180,7 @@ void account_steal_time(struct task_stru
+ cpustat->steal = cputime64_add(cpustat->steal, tmp);
}
- static inline void
- enqueue_task_head(struct task_struct *p, struct prio_array *array)
- {
-+ BUG_ON(p->state & TASK_ONHOLD);
- list_add(&p->run_list, array->queue + p->prio);
- __set_bit(p->prio, array->bitmap);
- array->nr_active++;
-@@ -723,10 +734,16 @@ enqueue_task_head(struct task_struct *p,
- static inline int __normal_prio(struct task_struct *p)
+-static void task_running_tick(struct rq *rq, struct task_struct *p)
++static void task_running_tick(struct rq *rq, struct task_struct *p, int cpu)
{
- int bonus, prio;
-+ struct vx_info *vxi;
+ if (p->array != rq->active) {
+ /* Task has expired but was not scheduled yet */
+@@ -3159,7 +3210,7 @@ static void task_running_tick(struct rq
+ }
+ goto out_unlock;
+ }
+- if (!--p->time_slice) {
++ if (vx_need_resched(p, --p->time_slice, cpu)) {
+ dequeue_task(p, rq->active);
+ set_tsk_need_resched(p);
+ p->prio = effective_prio(p);
+@@ -3219,12 +3270,14 @@ void scheduler_tick(void)
+ struct rq *rq = cpu_rq(cpu);
- bonus = CURRENT_BONUS(p) - MAX_BONUS / 2;
+ update_cpu_clock(p, rq, now);
++ vxm_sync(now, cpu);
- prio = p->static_prio - bonus;
+- if (p == rq->idle)
++ if (p == rq->idle) {
+ /* Task on the idle queue */
+ wake_priority_sleeper(rq);
+- else
+- task_running_tick(rq, p);
++ vx_idle_resched(rq);
++ } else
++ task_running_tick(rq, p, cpu);
+ #ifdef CONFIG_SMP
+ update_load(rq);
+ if (time_after_eq(jiffies, rq->next_balance))
+@@ -3476,14 +3529,25 @@ need_resched_nonpreemptible:
+ unlikely(signal_pending(prev))))
+ prev->state = TASK_RUNNING;
+ else {
+- if (prev->state == TASK_UNINTERRUPTIBLE)
++ if (prev->state == TASK_UNINTERRUPTIBLE) {
+ rq->nr_uninterruptible++;
++ vx_uninterruptible_inc(prev);
++ }
+ deactivate_task(prev, rq);
+ }
+ }
+
+ cpu = smp_processor_id();
++ vx_set_rq_time(rq, jiffies);
++try_unhold:
++ vx_try_unhold(rq, cpu);
++pick_next:
++
+ if (unlikely(!rq->nr_running)) {
++ /* can we skip idle time? */
++ if (vx_try_skip(rq, cpu))
++ goto try_unhold;
++
+ idle_balance(cpu, rq);
+ if (!rq->nr_running) {
+ next = rq->idle;
+@@ -3510,6 +3574,10 @@ need_resched_nonpreemptible:
+ queue = array->queue + idx;
+ next = list_entry(queue->next, struct task_struct, run_list);
+
++ /* check before we schedule this context */
++ if (!vx_schedule(next, rq, cpu))
++ goto pick_next;
++
+ if (!rt_task(next) && interactive_sleep(next->sleep_type)) {
+ unsigned long long delta = now - next->timestamp;
+ if (unlikely((long long)(now - next->timestamp) < 0))
+@@ -4112,7 +4180,7 @@ asmlinkage long sys_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)
+@@ -4285,6 +4353,7 @@ recheck:
+ oldprio = p->prio;
+ __setscheduler(p, policy, param->sched_priority);
+ if (array) {
++ vx_activate_task(p);
+ __activate_task(p, rq);
+ /*
+ * Reschedule if we are currently running on this runqueue and
+@@ -5072,6 +5141,7 @@ static int __migrate_task(struct task_st
+ p->timestamp = p->timestamp - rq_src->most_recent_timestamp
+ + rq_dest->most_recent_timestamp;
+ deactivate_task(p, rq_src);
++ vx_activate_task(p);
+ __activate_task(p, rq_dest);
+ if (TASK_PREEMPTS_CURR(p, rq_dest))
+ resched_task(rq_dest->curr);
+@@ -6919,7 +6989,10 @@ void __init sched_init(void)
+ INIT_LIST_HEAD(&rq->migration_queue);
+ #endif
+ atomic_set(&rq->nr_iowait, 0);
+-
++#ifdef CONFIG_VSERVER_HARDCPU
++ INIT_LIST_HEAD(&rq->hold_queue);
++ rq->nr_onhold = 0;
++#endif
+ for (j = 0; j < 2; j++) {
+ array = rq->arrays + j;
+ for (k = 0; k < MAX_PRIO; k++) {
+@@ -7002,6 +7075,7 @@ void normalize_rt_tasks(void)
+ deactivate_task(p, task_rq(p));
+ __setscheduler(p, SCHED_NORMAL, 0);
+ if (array) {
++ vx_activate_task(p);
+ __activate_task(p, task_rq(p));
+ resched_task(rq->curr);
+ }
+--- linux-2.6.20/kernel/sched_hard.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/sched_hard.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,324 @@
++
++#ifdef CONFIG_VSERVER_IDLELIMIT
++
++/*
++ * vx_idle_resched - reschedule after maxidle
++ */
++static inline
++void vx_idle_resched(struct rq *rq)
++{
++ /* maybe have a better criterion for paused */
++ if (!--rq->idle_tokens && !list_empty(&rq->hold_queue))
++ set_need_resched();
++}
++
++#else /* !CONFIG_VSERVER_IDLELIMIT */
++
++#define vx_idle_resched(rq)
++
++#endif /* CONFIG_VSERVER_IDLELIMIT */
++
++
++
++#ifdef CONFIG_VSERVER_IDLETIME
++
++#define vx_set_rq_min_skip(rq, min) \
++ (rq)->idle_skip = (min)
++
++#define vx_save_min_skip(ret, min, val) \
++ __vx_save_min_skip(ret, min, val)
++
++static inline
++void __vx_save_min_skip(int ret, int *min, int val)
++{
++ if (ret > -2)
++ return;
++ if ((*min > val) || !*min)
++ *min = val;
++}
++
++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;
++}
++
++#else /* !CONFIG_VSERVER_IDLETIME */
++
++#define vx_set_rq_min_skip(rq, min) \
++ ({ int dummy = (min); dummy; })
++
++#define vx_save_min_skip(ret, min, val)
++
++static inline
++int vx_try_skip(struct rq *rq, int cpu)
++{
++ return 0;
++}
++
++#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)
++{
++ if (*min > val)
++ *min = val;
++}
++
++
++/*
++ * vx_hold_task - put a task on the hold queue
++ */
++static inline
++void vx_hold_task(struct task_struct *p, struct rq *rq)
++{
++ __deactivate_task(p, rq);
++ p->state |= TASK_ONHOLD;
++ /* a new one on hold */
++ rq->nr_onhold++;
++ vxm_hold_task(p, rq);
++ list_add_tail(&p->run_list, &rq->hold_queue);
++}
++
++/*
++ * vx_unhold_task - put a task back to the runqueue
++ */
++static inline
++void vx_unhold_task(struct task_struct *p, struct rq *rq)
++{
++ list_del(&p->run_list);
++ /* one less waiting */
++ rq->nr_onhold--;
++ p->state &= ~TASK_ONHOLD;
++ enqueue_task(p, rq->expired);
++ inc_nr_running(p, rq);
++ vxm_unhold_task(p, rq);
++
++ if (p->static_prio < rq->best_expired_prio)
++ rq->best_expired_prio = p->static_prio;
++}
++
++unsigned long nr_onhold(void)
++{
++ unsigned long i, sum = 0;
++
++ for_each_online_cpu(i)
++ sum += cpu_rq(i)->nr_onhold;
++
++ return sum;
++}
++
++
++
++static inline
++int __vx_tokens_avail(struct _vx_sched_pc *sched_pc)
++{
++ return sched_pc->tokens;
++}
++
++static inline
++void __vx_consume_token(struct _vx_sched_pc *sched_pc)
++{
++ sched_pc->tokens--;
++}
++
++static inline
++int vx_need_resched(struct task_struct *p, int slice, 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);
++ 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);
++}
++
++
++#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)
++{
++ 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, run_list);
++ /* 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);
++}
+
-+ if ((vxi = p->vx_info) &&
-+ vx_info_flags(vxi, VXF_SCHED_PRIO, 0))
-+ prio += vx_effective_vavavoom(vxi, MAX_USER_PRIO);
+
- if (prio < MAX_RT_PRIO)
- prio = MAX_RT_PRIO;
- if (prio > MAX_PRIO-1)
-@@ -975,19 +992,77 @@ static void activate_task(struct task_st
- }
- p->timestamp = now;
-
-+ vx_activate_task(p);
- __activate_task(p, rq);
- }
-
- /*
- * deactivate_task - remove a task from the runqueue.
- */
--static void deactivate_task(struct task_struct *p, struct rq *rq)
-+static void __deactivate_task(struct task_struct *p, struct rq *rq)
- {
- dec_nr_running(p, rq);
- dequeue_task(p, p->array);
- p->array = NULL;
- }
-
+static inline
-+void deactivate_task(struct task_struct *p, struct rq *rq)
++int vx_schedule(struct task_struct *next, struct rq *rq, int cpu)
+{
-+ vx_deactivate_task(p);
-+ __deactivate_task(p, 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;
+}
+
+
-+#ifdef CONFIG_VSERVER_HARDCPU
-+/*
-+ * vx_hold_task - put a task on the hold queue
-+ */
++#else /* CONFIG_VSERVER_HARDCPU */
++
+static inline
-+void vx_hold_task(struct vx_info *vxi,
-+ struct task_struct *p, struct rq *rq)
++void vx_hold_task(struct task_struct *p, struct rq *rq)
+{
-+ __deactivate_task(p, rq);
-+ p->state |= TASK_ONHOLD;
-+ /* a new one on hold */
-+ vx_onhold_inc(vxi);
-+ list_add_tail(&p->run_list, &rq->hold_queue);
++ return;
+}
+
-+/*
-+ * vx_unhold_task - put a task back to the runqueue
-+ */
+static inline
-+void vx_unhold_task(struct vx_info *vxi,
-+ struct task_struct *p, struct rq *rq)
++void vx_unhold_task(struct task_struct *p, struct rq *rq)
+{
-+ list_del(&p->run_list);
-+ /* one less waiting */
-+ vx_onhold_dec(vxi);
-+ p->state &= ~TASK_ONHOLD;
-+ enqueue_task(p, rq->expired);
-+ inc_nr_running(p, rq);
++ return;
++}
+
-+ if (p->static_prio < rq->best_expired_prio)
-+ rq->best_expired_prio = p->static_prio;
++unsigned long nr_onhold(void)
++{
++ return 0;
+}
-+#else
++
++
+static inline
-+void vx_hold_task(struct vx_info *vxi,
-+ struct task_struct *p, struct rq *rq)
++int vx_need_resched(struct task_struct *p, int slice, int cpu)
+{
-+ return;
++ return (slice == 0);
+}
+
++
++#define vx_set_rq_time(rq, time)
++
+static inline
-+void vx_unhold_task(struct vx_info *vxi,
-+ struct task_struct *p, struct rq *rq)
++void vx_try_unhold(struct rq *rq, int cpu)
+{
+ return;
+}
++
++static inline
++int vx_schedule(struct task_struct *next, struct rq *rq, int cpu)
++{
++ 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;
++
++ 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;
++}
++
+#endif /* CONFIG_VSERVER_HARDCPU */
+
+--- linux-2.6.20/kernel/sched_mon.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/sched_mon.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,200 @@
+
- /*
- * resched_task - mark a task 'to be rescheduled now'.
- *
-@@ -1383,6 +1458,12 @@ static int try_to_wake_up(struct task_st
-
- rq = task_rq_lock(p, &flags);
- old_state = p->state;
++#include <linux/vserver/monitor.h>
++
++#ifdef CONFIG_VSERVER_MONITOR
+
-+ /* we need to unhold suspended tasks */
-+ if (old_state & TASK_ONHOLD) {
-+ vx_unhold_task(p->vx_info, p, rq);
-+ old_state = p->state;
-+ }
- if (!(old_state & state))
- goto out;
-
-@@ -1488,6 +1569,7 @@ out_activate:
- #endif /* CONFIG_SMP */
- if (old_state == TASK_UNINTERRUPTIBLE) {
- rq->nr_uninterruptible--;
-+ vx_uninterruptible_dec(p);
- /*
- * Tasks on involuntary sleep don't earn
- * sleep_avg beyond just interactive state.
-@@ -1634,6 +1716,7 @@ void fastcall wake_up_new_task(struct ta
-
- p->prio = effective_prio(p);
-
-+ vx_activate_task(p);
- if (likely(cpu == this_cpu)) {
- if (!(clone_flags & CLONE_VM)) {
- /*
-@@ -1645,6 +1728,7 @@ void fastcall wake_up_new_task(struct ta
- __activate_task(p, rq);
- else {
- p->prio = current->prio;
-+ BUG_ON(p->state & TASK_ONHOLD);
- p->normal_prio = current->normal_prio;
- list_add_tail(&p->run_list, ¤t->run_list);
- p->array = current->array;
-@@ -2951,13 +3035,16 @@ static inline int expired_starving(struc
- void account_user_time(struct task_struct *p, cputime_t cputime)
- {
- struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+ struct vx_info *vxi = p->vx_info; /* p is _always_ current */
- cputime64_t tmp;
-+ int nice = (TASK_NICE(p) > 0);
-
- p->utime = cputime_add(p->utime, cputime);
-+ vx_account_user(vxi, cputime, nice);
-
- /* 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);
-@@ -2973,10 +3060,12 @@ void account_system_time(struct task_str
- cputime_t cputime)
- {
- struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+ struct vx_info *vxi = p->vx_info; /* p is _always_ current */
- struct rq *rq = this_rq();
- cputime64_t tmp;
-
- p->stime = cputime_add(p->stime, cputime);
-+ vx_account_system(vxi, cputime, (p == rq->idle));
-
- /* Add system time to cpustat. */
- tmp = cputime_to_cputime64(cputime);
-@@ -3036,6 +3125,10 @@ void scheduler_tick(void)
- if (p == rq->idle) {
- if (wake_priority_sleeper(rq))
- goto out;
-+#ifdef CONFIG_VSERVER_HARDCPU_IDLE
-+ if (!--rq->idle_tokens && !list_empty(&rq->hold_queue))
-+ set_need_resched();
-+#endif
- rebalance_tick(cpu, rq, SCHED_IDLE);
- return;
- }
-@@ -3068,7 +3161,7 @@ void scheduler_tick(void)
- }
- goto out_unlock;
- }
-- if (!--p->time_slice) {
-+ if (vx_need_resched(p)) {
- dequeue_task(p, rq->active);
- set_tsk_need_resched(p);
- p->prio = effective_prio(p);
-@@ -3301,6 +3394,10 @@ asmlinkage void __sched schedule(void)
- int cpu, idx, new_prio;
- long *switch_count;
- struct rq *rq;
-+ struct vx_info *vxi;
+#ifdef CONFIG_VSERVER_HARDCPU
-+ int maxidle = -HZ;
++#define HARDCPU(x) (x)
++#else
++#define HARDCPU(x) (0)
+#endif
-
- /*
- * Test if we are atomic. Since do_exit() needs to call into
-@@ -3358,12 +3455,41 @@ need_resched_nonpreemptible:
- unlikely(signal_pending(prev))))
- prev->state = TASK_RUNNING;
- else {
-- if (prev->state == TASK_UNINTERRUPTIBLE)
-+ if (prev->state == TASK_UNINTERRUPTIBLE) {
- rq->nr_uninterruptible++;
-+ vx_uninterruptible_inc(prev);
-+ }
- deactivate_task(prev, rq);
- }
- }
-
-+#ifdef CONFIG_VSERVER_HARDCPU
-+ if (!list_empty(&rq->hold_queue)) {
-+ struct list_head *l, *n;
-+ int ret;
-+
-+ vxi = NULL;
-+ list_for_each_safe(l, n, &rq->hold_queue) {
-+ next = list_entry(l, struct task_struct, run_list);
-+ if (vxi == next->vx_info)
-+ continue;
+
-+ vxi = next->vx_info;
-+ ret = vx_tokens_recalc(vxi);
++#ifdef CONFIG_VSERVER_IDLETIME
++#define IDLETIME(x) (x)
++#else
++#define IDLETIME(x) (0)
++#endif
++
++struct _vx_mon_entry *vxm_advance(int cpu);
++
++
++static inline
++void __vxm_basic(struct _vx_mon_entry *entry, xid_t xid, int type)
++{
++ entry->type = type;
++ entry->xid = xid;
++}
++
++static inline
++void __vxm_sync(int cpu)
++{
++ struct _vx_mon_entry *entry = vxm_advance(cpu);
++
++ __vxm_basic(entry, 0, VXM_SYNC);
++ entry->ev.sec = xtime.tv_sec;
++ entry->ev.nsec = xtime.tv_nsec;
++}
++
++static inline
++void __vxm_task(struct task_struct *p, int type)
++{
++ struct _vx_mon_entry *entry = vxm_advance(task_cpu(p));
++
++ __vxm_basic(entry, p->xid, type);
++ entry->ev.tsk.pid = p->pid;
++ entry->ev.tsk.state = p->state;
++}
++
++static inline
++void __vxm_sched(struct _vx_sched_pc *s, struct vx_info *vxi, int cpu)
++{
++ struct _vx_mon_entry *entry = vxm_advance(cpu);
++
++ __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;
++}
++
++static inline
++void __vxm_rqinfo1(struct rq *q, int cpu)
++{
++ struct _vx_mon_entry *entry = vxm_advance(cpu);
++
++ 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 inline
++void __vxm_rqinfo2(struct rq *q, int cpu)
++{
++ struct _vx_mon_entry *entry = vxm_advance(cpu);
++
++ 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 inline
++void __vxm_update(struct _vx_sched_pc *s, struct vx_info *vxi, int cpu)
++{
++ struct _vx_mon_entry *entry = vxm_advance(cpu);
++
++ __vxm_basic(entry, vxi->vx_id, VXM_UPDATE);
++ entry->ev.tokens = s->tokens;
++}
++
++static inline
++void __vxm_update1(struct _vx_sched_pc *s, struct vx_info *vxi, int cpu)
++{
++ struct _vx_mon_entry *entry = vxm_advance(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
++void __vxm_update2(struct _vx_sched_pc *s, struct vx_info *vxi, int cpu)
++{
++ struct _vx_mon_entry *entry = vxm_advance(cpu);
++
++ __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];
++}
++
++
++#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)
++
++static inline
++void vxm_migrate_task(struct task_struct *p, struct rq *rq, int dest)
++{
++ __vxm_task(p, VXM_MIGRATE);
++ __vxm_rqinfo1(rq, task_cpu(p));
++ __vxm_rqinfo2(rq, task_cpu(p));
++}
++
++static inline
++void vxm_idle_skip(struct rq *rq, int cpu)
++{
++ __vxm_rqinfo1(rq, cpu);
++ __vxm_rqinfo2(rq, cpu);
++}
++
++static inline
++void vxm_need_resched(struct task_struct *p, int slice, int cpu)
++{
++ if (slice)
++ return;
++
++ __vxm_task(p, VXM_RESCHED);
++}
++
++static inline
++void vxm_sync(unsigned long now, int cpu)
++{
++ if (!CONFIG_VSERVER_MONITOR_SYNC ||
++ (now % CONFIG_VSERVER_MONITOR_SYNC))
++ return;
++
++ __vxm_sync(cpu);
++}
++
++#define vxm_sched_info(s,v,c) __vxm_sched(s,v,c)
++
++static inline
++void vxm_tokens_recalc(struct _vx_sched_pc *s, struct rq *rq,
++ struct vx_info *vxi, int cpu)
++{
++ __vxm_sched(s, vxi, cpu);
++ __vxm_rqinfo2(rq, cpu);
++}
++
++static inline
++void vxm_update_sched(struct _vx_sched_pc *s, struct vx_info *vxi, int cpu)
++{
++ __vxm_sched(s, vxi, cpu);
++ __vxm_update(s, vxi, cpu);
++ __vxm_update1(s, vxi, cpu);
++ __vxm_update2(s, vxi, cpu);
++}
+
-+ if (ret > 0) {
-+ vx_unhold_task(vxi, next, rq);
-+ break;
-+ }
-+ if ((ret < 0) && (maxidle < ret))
-+ maxidle = ret;
-+ }
-+ }
-+ rq->idle_tokens = -maxidle;
++static inline
++void vxm_rq_max_min(struct rq *rq, int cpu)
++{
++ __vxm_rqinfo1(rq, cpu);
++ __vxm_rqinfo2(rq, cpu);
++}
+
-+pick_next:
-+#endif
++#else /* CONFIG_VSERVER_MONITOR */
+
- cpu = smp_processor_id();
- if (unlikely(!rq->nr_running)) {
- idle_balance(cpu, rq);
-@@ -3392,6 +3518,22 @@ need_resched_nonpreemptible:
- queue = array->queue + idx;
- next = list_entry(queue->next, struct task_struct, run_list);
-
-+ vxi = next->vx_info;
-+#ifdef CONFIG_VSERVER_HARDCPU
-+ if (vx_info_flags(vxi, VXF_SCHED_PAUSE|VXF_SCHED_HARD, 0)) {
-+ int ret = vx_tokens_recalc(vxi);
++#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)
+
-+ if (unlikely(ret <= 0)) {
-+ if (ret && (rq->idle_tokens > -ret))
-+ rq->idle_tokens = -ret;
-+ vx_hold_task(vxi, next, rq);
-+ goto pick_next;
-+ }
-+ } else /* well, looks ugly but not as ugly as the ifdef-ed version */
-+#endif
-+ if (vx_info_flags(vxi, VXF_SCHED_PRIO, 0))
-+ vx_tokens_recalc(vxi);
++#endif /* CONFIG_VSERVER_MONITOR */
+
- if (!rt_task(next) && interactive_sleep(next->sleep_type)) {
- unsigned long long delta = now - next->timestamp;
- if (unlikely((long long)(now - next->timestamp) < 0))
-@@ -3994,7 +4136,7 @@ asmlinkage long sys_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)
-@@ -4161,6 +4303,7 @@ recheck:
- oldprio = p->prio;
- __setscheduler(p, policy, param->sched_priority);
- if (array) {
-+ vx_activate_task(p);
- __activate_task(p, rq);
- /*
- * Reschedule if we are currently running on this runqueue and
-@@ -4949,6 +5092,7 @@ static int __migrate_task(struct task_st
- p->timestamp = p->timestamp - rq_src->timestamp_last_tick
- + rq_dest->timestamp_last_tick;
- deactivate_task(p, rq_src);
-+ vx_activate_task(p);
- __activate_task(p, rq_dest);
- if (TASK_PREEMPTS_CURR(p, rq_dest))
- resched_task(rq_dest->curr);
-@@ -6789,6 +6933,9 @@ void __init sched_init(void)
- INIT_LIST_HEAD(&rq->migration_queue);
- #endif
- atomic_set(&rq->nr_iowait, 0);
-+#ifdef CONFIG_VSERVER_HARDCPU
-+ INIT_LIST_HEAD(&rq->hold_queue);
-+#endif
+--- linux-2.6.20/kernel/signal.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/signal.c 2007-02-06 03:55:21 +0100
+@@ -26,6 +26,7 @@
+ #include <linux/freezer.h>
+ #include <linux/pid_namespace.h>
+ #include <linux/nsproxy.h>
++#include <linux/vs_context.h>
- for (j = 0; j < 2; j++) {
- array = rq->arrays + j;
-@@ -6865,6 +7012,7 @@ void normalize_rt_tasks(void)
- deactivate_task(p, task_rq(p));
- __setscheduler(p, SCHED_NORMAL, 0);
- if (array) {
-+ vx_activate_task(p);
- __activate_task(p, task_rq(p));
- resched_task(rq->curr);
- }
---- linux-2.6.18.5/kernel/signal.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/signal.c 2006-11-06 05:08:58 +0100
-@@ -571,18 +571,27 @@ static int rm_from_queue(unsigned long m
- static int check_kill_permission(int sig, struct siginfo *info,
+ #include <asm/param.h>
+ #include <asm/uaccess.h>
+@@ -581,17 +582,34 @@ static int check_kill_permission(int sig
struct task_struct *t)
{
-+ int user;
int error = -EINVAL;
+
if (!valid_signal(sig))
return error;
+
-+ user = ((info == SEND_SIG_NOINFO) ||
-+ (!is_si_special(info) && SI_FROMUSER(info)));
++ 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);
+
error = -EPERM;
- if ((info == SEND_SIG_NOINFO || (!is_si_special(info) && SI_FROMUSER(info)))
- && ((sig != SIGCONT) ||
-+ if (user && ((sig != SIGCONT) ||
- (current->signal->session != t->signal->session))
++ if (((sig != SIGCONT) ||
+ (process_session(current) != process_session(t)))
&& (current->euid ^ t->suid) && (current->euid ^ t->uid)
&& (current->uid ^ t->suid) && (current->uid ^ t->uid)
&& !capable(CAP_KILL))
return error;
+ error = -ESRCH;
-+ if (user && !vx_check(vx_task_xid(t), VX_ADMIN|VX_IDENT))
++ if (!vx_check(vx_task_xid(t), VS_WATCH_P|VS_IDENT)) {
++ vxwprintk(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:
error = security_task_kill(t, info, sig, 0);
if (!error)
audit_signal_info(sig, t); /* Let audit system see the signal */
-@@ -1105,7 +1114,7 @@ kill_proc_info(int sig, struct siginfo *
+@@ -1129,7 +1147,7 @@ int kill_pid_info(int sig, struct siginf
}
- p = find_task_by_pid(pid);
+ p = pid_task(pid, PIDTYPE_PID);
error = -ESRCH;
- if (p)
-+ if (p && vx_check(vx_task_xid(p), VX_IDENT))
++ if (p && vx_check(vx_task_xid(p), VS_IDENT))
error = group_send_sig_info(sig, info, p);
if (unlikely(acquired_tasklist_lock))
read_unlock(&tasklist_lock);
-@@ -1167,7 +1176,8 @@ static int kill_something_info(int sig,
+@@ -1200,7 +1218,8 @@ static int kill_something_info(int sig,
read_lock(&tasklist_lock);
for_each_process(p) {
- if (p->pid > 1 && p->tgid != current->tgid) {
-+ if (vx_check(vx_task_xid(p), VX_ADMIN|VX_IDENT) &&
++ if (vx_check(vx_task_xid(p), VS_ADMIN_P|VS_IDENT) &&
+ p->pid > 1 && p->tgid != current->tgid) {
int err = group_send_sig_info(sig, info, p);
++count;
if (err != -EPERM)
-@@ -1839,6 +1849,11 @@ relock:
- if (current == child_reaper)
+@@ -1890,6 +1909,11 @@ relock:
+ if (current == child_reaper(current))
continue;
+ /* virtual init is protected against user signals */
@@ -13496,8 +17360,18 @@
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
---- linux-2.6.18.5/kernel/sys.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/sys.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/kernel/softirq.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/softirq.c 2007-02-06 03:05:22 +0100
+@@ -17,6 +17,7 @@
+ #include <linux/kthread.h>
+ #include <linux/rcupdate.h>
+ #include <linux/smp.h>
++#include <linux/vs_context.h>
+
+ #include <asm/irq.h>
+ /*
+--- linux-2.6.20/kernel/sys.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/sys.c 2007-02-06 03:58:00 +0100
@@ -10,6 +10,7 @@
#include <linux/mman.h>
#include <linux/smp_lock.h>
@@ -13506,15 +17380,15 @@
#include <linux/reboot.h>
#include <linux/prctl.h>
#include <linux/highuid.h>
-@@ -28,6 +29,7 @@
- #include <linux/tty.h>
- #include <linux/signal.h>
- #include <linux/cn_proc.h>
-+#include <linux/vs_cvirt.h>
-
+@@ -33,6 +34,7 @@
#include <linux/compat.h>
#include <linux/syscalls.h>
-@@ -444,7 +446,10 @@ static int set_one_prio(struct task_stru
+ #include <linux/kprobes.h>
++#include <linux/vs_pid.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/io.h>
+@@ -576,7 +578,10 @@ static int set_one_prio(struct task_stru
goto out;
}
if (niceval < task_nice(p) && !can_nice(p, niceval)) {
@@ -13526,7 +17400,7 @@
goto out;
}
no_nice = security_task_setnice(p, niceval);
-@@ -496,7 +501,8 @@ asmlinkage long sys_setpriority(int whic
+@@ -628,7 +633,8 @@ asmlinkage long sys_setpriority(int whic
if (!who)
who = current->uid;
else
@@ -13536,7 +17410,7 @@
goto out_unlock; /* No processes for this user */
do_each_thread(g, p)
-@@ -554,7 +560,8 @@ asmlinkage long sys_getpriority(int whic
+@@ -686,7 +692,8 @@ asmlinkage long sys_getpriority(int whic
if (!who)
who = current->uid;
else
@@ -13546,7 +17420,7 @@
goto out_unlock; /* No processes for this user */
do_each_thread(g, p)
-@@ -670,6 +677,9 @@ void kernel_power_off(void)
+@@ -799,6 +806,9 @@ void kernel_power_off(void)
machine_power_off();
}
EXPORT_SYMBOL_GPL(kernel_power_off);
@@ -13556,17 +17430,17 @@
/*
* Reboot system call: for obvious reasons only root may call it,
* and even root needs to set up some magic numbers in the registers
-@@ -700,6 +710,9 @@ asmlinkage long sys_reboot(int magic1, i
+@@ -829,6 +839,9 @@ asmlinkage long sys_reboot(int magic1, i
if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)
cmd = LINUX_REBOOT_CMD_HALT;
-+ if (!vx_check(0, VX_ADMIN|VX_WATCH))
++ if (!vx_check(0, VS_ADMIN|VS_WATCH))
+ return vs_reboot(cmd, arg);
+
lock_kernel();
switch (cmd) {
case LINUX_REBOOT_CMD_RESTART:
-@@ -887,7 +900,7 @@ static int set_user(uid_t new_ruid, int
+@@ -1008,7 +1021,7 @@ static int set_user(uid_t new_ruid, int
{
struct user_struct *new_user;
@@ -13575,7 +17449,7 @@
if (!new_user)
return -EAGAIN;
-@@ -1251,15 +1264,18 @@ asmlinkage long sys_setpgid(pid_t pid, p
+@@ -1363,15 +1376,18 @@ asmlinkage long sys_setpgid(pid_t pid, p
{
struct task_struct *p;
struct task_struct *group_leader = current->group_leader;
@@ -13595,20 +17469,17 @@
/* From this point forward we keep holding onto the tasklist lock
* so that our parent does not change from under us. -DaveM
*/
-@@ -1294,22 +1310,22 @@ asmlinkage long sys_setpgid(pid_t pid, p
+@@ -1405,20 +1421,20 @@ asmlinkage long sys_setpgid(pid_t pid, p
+
if (pgid != pid) {
- struct task_struct *p;
+ struct task_struct *g =
+- find_task_by_pid_type(PIDTYPE_PGID, pgid);
++ find_task_by_pid_type(PIDTYPE_PGID, rpgid);
-- do_each_task_pid(pgid, PIDTYPE_PGID, p) {
-+ do_each_task_pid(rpgid, PIDTYPE_PGID, p) {
- if (p->signal->session == group_leader->signal->session)
- goto ok_pgid;
-- } while_each_task_pid(pgid, PIDTYPE_PGID, p);
-+ } while_each_task_pid(rpgid, PIDTYPE_PGID, p);
- goto out;
+ if (!g || process_session(g) != process_session(group_leader))
+ goto out;
}
- ok_pgid:
- err = security_task_setpgid(p, pgid);
+ err = security_task_setpgid(p, rpgid);
if (err)
@@ -13624,16 +17495,16 @@
}
err = 0;
-@@ -1322,7 +1338,7 @@ out:
+@@ -1431,7 +1447,7 @@ out:
asmlinkage long sys_getpgid(pid_t pid)
{
- if (!pid) {
+ if (!pid)
- return process_group(current);
+ return vx_rmap_pid(process_group(current));
- } else {
+ else {
int retval;
struct task_struct *p;
-@@ -1334,7 +1350,7 @@ asmlinkage long sys_getpgid(pid_t pid)
+@@ -1443,7 +1459,7 @@ asmlinkage long sys_getpgid(pid_t pid)
if (p) {
retval = security_task_getpgid(p);
if (!retval)
@@ -13642,16 +17513,7 @@
}
read_unlock(&tasklist_lock);
return retval;
-@@ -1675,7 +1691,7 @@ asmlinkage long sys_newuname(struct new_
- int errno = 0;
-
- down_read(&uts_sem);
-- if (copy_to_user(name,&system_utsname,sizeof *name))
-+ if (copy_to_user(name, vx_new_utsname(), sizeof *name))
- errno = -EFAULT;
- up_read(&uts_sem);
- return errno;
-@@ -1686,15 +1702,17 @@ asmlinkage long sys_sethostname(char __u
+@@ -1795,7 +1811,7 @@ asmlinkage long sys_sethostname(char __u
int errno;
char tmp[__NEW_UTS_LEN];
@@ -13660,39 +17522,7 @@
return -EPERM;
if (len < 0 || len > __NEW_UTS_LEN)
return -EINVAL;
- down_write(&uts_sem);
- errno = -EFAULT;
- if (!copy_from_user(tmp, name, len)) {
-- memcpy(system_utsname.nodename, tmp, len);
-- system_utsname.nodename[len] = 0;
-+ char *ptr = vx_new_uts(nodename);
-+
-+ memcpy(ptr, tmp, len);
-+ ptr[len] = 0;
- errno = 0;
- }
- up_write(&uts_sem);
-@@ -1706,15 +1724,17 @@ asmlinkage long sys_sethostname(char __u
- asmlinkage long sys_gethostname(char __user *name, int len)
- {
- int i, errno;
-+ char *ptr;
-
- if (len < 0)
- return -EINVAL;
- down_read(&uts_sem);
-- i = 1 + strlen(system_utsname.nodename);
-+ ptr = vx_new_uts(nodename);
-+ i = 1 + strlen(ptr);
- if (i > len)
- i = len;
- errno = 0;
-- if (copy_to_user(name, system_utsname.nodename, i))
-+ if (copy_to_user(name, ptr, i))
- errno = -EFAULT;
- up_read(&uts_sem);
- return errno;
-@@ -1731,7 +1751,7 @@ asmlinkage long sys_setdomainname(char _
+@@ -1840,7 +1856,7 @@ asmlinkage long sys_setdomainname(char _
int errno;
char tmp[__NEW_UTS_LEN];
@@ -13701,20 +17531,7 @@
return -EPERM;
if (len < 0 || len > __NEW_UTS_LEN)
return -EINVAL;
-@@ -1739,8 +1759,10 @@ asmlinkage long sys_setdomainname(char _
- down_write(&uts_sem);
- errno = -EFAULT;
- if (!copy_from_user(tmp, name, len)) {
-- memcpy(system_utsname.domainname, tmp, len);
-- system_utsname.domainname[len] = 0;
-+ char *ptr = vx_new_uts(domainname);
-+
-+ memcpy(ptr, tmp, len);
-+ ptr[len] = 0;
- errno = 0;
- }
- up_write(&uts_sem);
-@@ -1798,7 +1820,7 @@ asmlinkage long sys_setrlimit(unsigned i
+@@ -1907,7 +1923,7 @@ asmlinkage long sys_setrlimit(unsigned i
return -EINVAL;
old_rlim = current->signal->rlim + resource;
if ((new_rlim.rlim_max > old_rlim->rlim_max) &&
@@ -13723,17 +17540,9 @@
return -EPERM;
if (resource == RLIMIT_NOFILE && new_rlim.rlim_max > NR_OPEN)
return -EPERM;
---- linux-2.6.18.5/kernel/sysctl.c 2006-12-04 06:13:53 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/sysctl.c 2006-10-16 18:56:11 +0200
-@@ -45,6 +45,7 @@
- #include <linux/syscalls.h>
- #include <linux/nfs_fs.h>
- #include <linux/acpi.h>
-+#include <linux/vserver/cvirt.h>
-
- #include <asm/uaccess.h>
- #include <asm/processor.h>
-@@ -90,6 +91,7 @@ static int ngroups_max = NGROUPS_MAX;
+--- linux-2.6.20/kernel/sysctl.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/sysctl.c 2007-02-06 03:05:22 +0100
+@@ -87,6 +87,7 @@ static int ngroups_max = NGROUPS_MAX;
#ifdef CONFIG_KMOD
extern char modprobe_path[];
#endif
@@ -13741,47 +17550,7 @@
#ifdef CONFIG_CHR_DEV_SG
extern int sg_big_buff;
#endif
-@@ -235,6 +237,7 @@ static ctl_table kern_table[] = {
- .maxlen = sizeof(system_utsname.sysname),
- .mode = 0444,
- .proc_handler = &proc_doutsstring,
-+ .virt_handler = &vx_uts_virt_handler,
- .strategy = &sysctl_string,
- },
- {
-@@ -244,6 +247,7 @@ static ctl_table kern_table[] = {
- .maxlen = sizeof(system_utsname.release),
- .mode = 0444,
- .proc_handler = &proc_doutsstring,
-+ .virt_handler = &vx_uts_virt_handler,
- .strategy = &sysctl_string,
- },
- {
-@@ -253,6 +257,7 @@ static ctl_table kern_table[] = {
- .maxlen = sizeof(system_utsname.version),
- .mode = 0444,
- .proc_handler = &proc_doutsstring,
-+ .virt_handler = &vx_uts_virt_handler,
- .strategy = &sysctl_string,
- },
- {
-@@ -262,6 +267,7 @@ static ctl_table kern_table[] = {
- .maxlen = sizeof(system_utsname.nodename),
- .mode = 0644,
- .proc_handler = &proc_doutsstring,
-+ .virt_handler = &vx_uts_virt_handler,
- .strategy = &sysctl_string,
- },
- {
-@@ -271,6 +277,7 @@ static ctl_table kern_table[] = {
- .maxlen = sizeof(system_utsname.domainname),
- .mode = 0644,
- .proc_handler = &proc_doutsstring,
-+ .virt_handler = &vx_uts_virt_handler,
- .strategy = &sysctl_string,
- },
- {
-@@ -407,6 +414,15 @@ static ctl_table kern_table[] = {
+@@ -453,6 +454,15 @@ static ctl_table kern_table[] = {
.strategy = &sysctl_string,
},
#endif
@@ -13797,75 +17566,67 @@
#ifdef CONFIG_CHR_DEV_SG
{
.ctl_name = KERN_SG_BIG_BUFF,
-@@ -1611,16 +1627,20 @@ static ssize_t proc_writesys(struct file
- int proc_dostring(ctl_table *table, int write, struct file *filp,
- void __user *buffer, size_t *lenp, loff_t *ppos)
- {
-- size_t len;
-+ size_t len, maxlen;
- char __user *p;
- char c;
-+ void *data;
-+
-+ data = table->data;
-+ maxlen = table->maxlen;
-+
-+ if (!data || !maxlen || !*lenp || (*ppos && !write))
-+ return (*lenp = 0);
-
-- if (!table->data || !table->maxlen || !*lenp ||
-- (*ppos && !write)) {
-- *lenp = 0;
-- return 0;
-- }
--
-+ if (table->virt_handler)
-+ table->virt_handler(table, write, filp->f_xid, &data, &maxlen);
-+
- if (write) {
- len = 0;
- p = buffer;
-@@ -1631,20 +1651,20 @@ int proc_dostring(ctl_table *table, int
- break;
- len++;
- }
-- if (len >= table->maxlen)
-- len = table->maxlen-1;
-- if(copy_from_user(table->data, buffer, len))
-+ if (len >= maxlen)
-+ len = maxlen-1;
-+ if(copy_from_user(data, buffer, len))
+--- linux-2.6.20/kernel/time.c 2006-11-30 21:19:44 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/time.c 2007-02-06 03:05:22 +0100
+@@ -61,7 +61,7 @@ asmlinkage long sys_time(time_t __user *
+ time_t i;
+ struct timeval tv;
+
+- do_gettimeofday(&tv);
++ vx_gettimeofday(&tv);
+ i = tv.tv_sec;
+
+ if (tloc) {
+@@ -92,7 +92,7 @@ asmlinkage long sys_stime(time_t __user
+ if (err)
+ return err;
+
+- do_settimeofday(&tv);
++ vx_settimeofday(&tv);
+ return 0;
+ }
+
+@@ -102,7 +102,7 @@ asmlinkage long sys_gettimeofday(struct
+ {
+ if (likely(tv != NULL)) {
+ struct timeval ktv;
+- do_gettimeofday(&ktv);
++ vx_gettimeofday(&ktv);
+ if (copy_to_user(tv, &ktv, sizeof(ktv)))
return -EFAULT;
-- ((char *) table->data)[len] = 0;
-+ ((char *) data)[len] = 0;
- *ppos += *lenp;
- } else {
-- len = strlen(table->data);
-- if (len > table->maxlen)
-- len = table->maxlen;
-+ len = strlen(data);
-+ if (len > maxlen)
-+ len = maxlen;
- if (len > *lenp)
- len = *lenp;
- if (len)
-- if(copy_to_user(buffer, table->data, len))
-+ if(copy_to_user(buffer, data, len))
- return -EFAULT;
- if (len < *lenp) {
- if(put_user('\n', ((char __user *) buffer) + len))
---- linux-2.6.18.5/kernel/timer.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/timer.c 2006-11-06 05:08:58 +0100
-@@ -34,6 +34,8 @@
+ }
+@@ -176,7 +176,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;
+ }
+@@ -359,7 +359,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;
+ }
+--- linux-2.6.20/kernel/timer.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/timer.c 2007-02-06 03:05:22 +0100
+@@ -34,6 +34,10 @@
#include <linux/cpu.h>
#include <linux/syscalls.h>
#include <linux/delay.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>
-@@ -1302,12 +1304,6 @@ asmlinkage unsigned long sys_alarm(unsig
+@@ -1224,12 +1228,6 @@ asmlinkage unsigned long sys_alarm(unsig
#endif
@@ -13878,7 +17639,7 @@
/**
* sys_getpid - return the thread group id of the current process
-@@ -1320,7 +1316,7 @@ asmlinkage unsigned long sys_alarm(unsig
+@@ -1242,7 +1240,7 @@ asmlinkage unsigned long sys_alarm(unsig
*/
asmlinkage long sys_getpid(void)
{
@@ -13887,7 +17648,7 @@
}
/*
-@@ -1336,10 +1332,23 @@ asmlinkage long sys_getppid(void)
+@@ -1258,10 +1256,23 @@ asmlinkage long sys_getppid(void)
rcu_read_lock();
pid = rcu_dereference(current->real_parent)->tgid;
rcu_read_unlock();
@@ -13912,7 +17673,7 @@
asmlinkage long sys_getuid(void)
{
/* Only we change this so SMP safe */
-@@ -1500,6 +1509,8 @@ asmlinkage long sys_sysinfo(struct sysin
+@@ -1422,6 +1433,8 @@ asmlinkage long sys_sysinfo(struct sysin
tp.tv_nsec = tp.tv_nsec - NSEC_PER_SEC;
tp.tv_sec++;
}
@@ -13921,8 +17682,8 @@
val.uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0);
val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
---- linux-2.6.18.5/kernel/user.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/user.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/kernel/user.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/user.c 2007-02-06 03:05:22 +0100
@@ -23,8 +23,8 @@
#define UIDHASH_BITS (CONFIG_BASE_SMALL ? 3 : 8)
#define UIDHASH_SZ (1 << UIDHASH_BITS)
@@ -13932,7 +17693,7 @@
+#define __uidhashfn(xid,uid) ((((uid) >> UIDHASH_BITS) + ((uid)^(xid))) & UIDHASH_MASK)
+#define uidhashentry(xid,uid) (uidhash_table + __uidhashfn((xid),(uid)))
- static kmem_cache_t *uid_cachep;
+ static struct kmem_cache *uid_cachep;
static struct list_head uidhash_table[UIDHASH_SZ];
@@ -66,7 +66,7 @@ static inline void uid_hash_remove(struc
list_del(&up->uidhash_list);
@@ -14002,7 +17763,7 @@
if (up) {
key_put(new->uid_keyring);
key_put(new->session_keyring);
-@@ -204,7 +205,7 @@ static int __init uid_cache_init(void)
+@@ -215,7 +216,7 @@ static int __init uid_cache_init(void)
/* Insert the root user immediately (init already runs as root) */
spin_lock_irq(&uidhash_lock);
@@ -14011,9 +17772,34 @@
spin_unlock_irq(&uidhash_lock);
return 0;
---- linux-2.6.18.5/kernel/vserver/Kconfig 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/Kconfig 2006-10-29 03:18:56 +0100
-@@ -0,0 +1,189 @@
+--- linux-2.6.20/kernel/utsname.c 2006-11-30 21:19:44 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/utsname.c 2007-02-06 03:05:22 +0100
+@@ -13,6 +13,7 @@
+ #include <linux/uts.h>
+ #include <linux/utsname.h>
+ #include <linux/version.h>
++#include <linux/vserver/global.h>
+
+ /*
+ * Clone a new ns copying an original utsname, setting refcount to 1
+@@ -27,6 +28,7 @@ static struct uts_namespace *clone_uts_n
+ if (ns) {
+ memcpy(&ns->name, &old_ns->name, sizeof(ns->name));
+ kref_init(&ns->kref);
++ atomic_inc(&vs_global_uts_ns);
+ }
+ return ns;
+ }
+@@ -91,5 +93,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);
+ }
+--- linux-2.6.20/kernel/vserver/Kconfig 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/Kconfig 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,270 @@
+#
+# Linux VServer configuration
+#
@@ -14022,16 +17808,11 @@
+
+config VSERVER_LEGACY
+ bool "Enable Legacy Kernel API"
-+ default y
++ default n
+ help
+ This enables the legacy API used in vs1.xx, maintaining
+ compatibility with older vserver tools, and guest images
-+ that are configured using the legacy method. This is
-+ probably a good idea for now, for migration purposes.
-+
-+ Note that some tools have not yet been altered to use
-+ this API, so disabling this option may reduce some
-+ functionality.
++ that are configured using the legacy method.
+
+config VSERVER_LEGACY_VERSION
+ bool "Show a Legacy Version ID"
@@ -14045,24 +17826,52 @@
+ so better avoid it, unless you really, really need it
+ for backwards compatibility.
+
++config VSERVER_DYNAMIC_IDS
++ bool "Enable dynamic context IDs"
++ depends on EXPERIMENTAL && VSERVER_LEGACY
++ default n
++ help
++ This enables support of in kernel dynamic context IDs,
++ which is deprecated and will probably be removed in the
++ next release.
++
+config VSERVER_LEGACYNET
+ bool "Enable Legacy Networking Kernel API"
-+ default y
++ default n
+ help
-+ This enables the legacy networking API which is required
-+ by the chbind tool (for util-vserver versions prior to
-+ 0.30.210). If you use an older version, don't disable
-+ this option.
++ This enables the legacy networking API which is used
++ by older tools (pre 0.30.210) to set up the network
++ context (chbind).
+
+config VSERVER_REMAP_SADDR
+ bool "Remap Source IP Address"
-+ depends on EXPERIMENTAL && !VSERVER_LEGACY
++ depends on EXPERIMENTAL
+ default n
+ help
+ This allows to remap the source IP address of 'local'
+ connections from 127.0.0.1 to the first assigned
+ guest IP.
+
++config VSERVER_COWBL
++ bool "Enable COW Immutable Link Breaking"
++ depends on EXPERIMENTAL
++ 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_PROC_SECURE
+ bool "Enable Proc Security"
+ depends on PROC_FS
@@ -14091,7 +17900,18 @@
+ to consume CPU resources again until a per-context
+ configured minimum of tokens has been reached.
+
-+config VSERVER_HARDCPU_IDLE
++config VSERVER_IDLETIME
++ bool "Avoid idle CPUs by skipping Time"
++ depends on VSERVER_HARDCPU
++ default n
++ 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
@@ -14103,44 +17923,44 @@
+ will also marginally increase scheduling overhead.
+
+choice
-+ prompt "Persistent Inode Context Tagging"
-+ default INOXID_UGID24
++ 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 INOXID_NONE
++config TAGGING_NONE
+ bool "Disabled"
+ help
+ do not store per-context information in inodes.
+
-+config INOXID_UID16
++config TAGGING_UID16
+ bool "UID16/GID32"
+ help
+ reduces UID to 16 bit, but leaves GID at 32 bit.
+
-+config INOXID_GID16
++config TAGGING_GID16
+ bool "UID32/GID16"
+ help
+ reduces GID to 16 bit, but leaves UID at 32 bit.
+
-+config INOXID_UGID24
++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 INOXID_INTERN
++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)
+
-+config INOXID_RUNTIME
++config TAGGING_RUNTIME
+ bool "Runtime"
+ depends on EXPERIMENTAL
+ help
@@ -14150,14 +17970,31 @@
+
+endchoice
+
-+config XID_TAG_NFSD
++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 xid tagging specified above.
++ Server to use the tagging specified above.
+ (will require patched clients too)
+
++config PROPAGATE
++ bool "Enable Inode Tag Propagation"
++ default n
++ depends on EXPERIMENTAL
++ help
++ This allows for the tagid= mount option to specify
++ a tagid which is to be used for the entire mount
++ tree.
++
++config VSERVER_PRIVACY
++ bool "Honor Privacy Aspects of Guests"
++ default y
++ help
++ When enabled, most context checks will disallow
++ access to structures assigned to a specific context,
++ like ptys or loop devices.
++
+config VSERVER_DEBUG
+ bool "VServer Debugging Code"
+ default n
@@ -14177,7 +18014,7 @@
+ the event of a kernel panic or oops.
+
+config VSERVER_HISTORY_SIZE
-+ int "Per-CPU History Size (32-65536)"
++ int "Per-CPU History Size (32-65536)"
+ depends on VSERVER_HISTORY
+ range 32 65536
+ default 64
@@ -14185,52 +18022,219 @@
+ This allows you to specify the number of entries in
+ the per-CPU history buffer.
+
-+endmenu
++config VSERVER_MONITOR
++ bool "VServer Scheduling Monitor"
++ depends on VSERVER_DEBUG
++ default n
++ help
++ Set this to yes if you want to record the scheduling
++ decisions, so that they can be relayed to userspace
++ for detailed analysis.
++
++config VSERVER_MONITOR_SIZE
++ int "Per-CPU Monitor Queue Size (32-65536)"
++ depends on VSERVER_MONITOR
++ range 32 65536
++ default 1024
++ help
++ This allows you to specify the number of entries in
++ the per-CPU scheduling monitor buffer.
++
++config VSERVER_MONITOR_SYNC
++ int "Per-CPU Monitor Sync Interval (0-65536)"
++ depends on VSERVER_MONITOR
++ range 0 65536
++ default 256
++ help
++ This allows you to specify the interval in ticks
++ when a time sync entry is inserted.
++
++endmenu
++
++
++config VSERVER
++ bool
++ default y
++ select UTS_NS
++ select SYSVIPC
++ select IPC_NS
++
++config VSERVER_SECURITY
++ bool
++ depends on SECURITY
++ default y
++ select SECURITY_CAPABILITIES
++
++config VSERVER_NGNET
++ bool
++ depends on EXPERIMENTAL && !VSERVER_LEGACYNET
++ default y
++
+--- linux-2.6.20/kernel/vserver/Makefile 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/Makefile 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,17 @@
++#
++# 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
++
++vserver-$(CONFIG_PROC_FS) += proc.o
++vserver-$(CONFIG_VSERVER_DEBUG) += sysctl.o debug.o
++vserver-$(CONFIG_VSERVER_LEGACY) += legacy.o
++vserver-$(CONFIG_VSERVER_LEGACYNET) += legacynet.o
++vserver-$(CONFIG_VSERVER_HISTORY) += history.o
++vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
++
+--- linux-2.6.20/kernel/vserver/cacct.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/cacct.c 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,44 @@
++/*
++ * linux/kernel/vserver/cacct.c
++ *
++ * Virtual Server: Context Accounting
++ *
++ * Copyright (C) 2006 Herbert Pötzl
++ *
++ * V0.01 added accounting stats
++ *
++ */
++
++#include <linux/types.h>
++#include <linux/sched.h>
++#include <linux/vs_context.h>
++#include <linux/vserver/switch.h>
++#include <linux/vserver/cacct_cmd.h>
++#include <linux/vserver/cacct_int.h>
++
++#include <asm/errno.h>
++#include <asm/uaccess.h>
++
++
++int vc_sock_stat(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_sock_stat_v0 vc_data;
++ int j, field;
++
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ field = vc_data.field;
++ if ((field < 0) || (field >= VXA_SOCK_SIZE))
++ return -EINVAL;
++
++ for (j=0; j<3; j++) {
++ vc_data.count[j] = vx_sock_count(&vxi->cacct, field, j);
++ vc_data.total[j] = vx_sock_total(&vxi->cacct, field, j);
++ }
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return 0;
++}
++
+--- linux-2.6.20/kernel/vserver/cacct_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/cacct_init.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,25 @@
++
++
++static inline void vx_info_init_cacct(struct _vx_cacct *cacct)
++{
++ int i,j;
++
++
++ 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);
++ }
++ }
++ for (i=0; i<8; i++)
++ atomic_set(&cacct->slab[i], 0);
++ for (i=0; i<5; i++)
++ for (j=0; j<4; j++)
++ atomic_set(&cacct->page[i][j], 0);
++}
++
++static inline void vx_info_exit_cacct(struct _vx_cacct *cacct)
++{
++ return;
++}
+
+--- linux-2.6.20/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/cacct_proc.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,58 @@
++#ifndef _VX_CACCT_PROC_H
++#define _VX_CACCT_PROC_H
+
-+config VSERVER
-+ bool
-+ default y
++#include <linux/vserver/cacct_int.h>
+
-+config VSERVER_SECURITY
-+ bool
-+ depends on SECURITY
-+ default y
-+ select SECURITY_CAPABILITIES
+
-+config VSERVER_NGNET
-+ bool
-+ depends on EXPERIMENTAL && !VSERVER_LEGACYNET
-+ default y
++#define VX_SOCKA_TOP \
++ "Type\t recv #/bytes\t\t send #/bytes\t\t fail #/bytes\n"
+
---- linux-2.6.18.5/kernel/vserver/Makefile 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/Makefile 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,16 @@
-+#
-+# Makefile for the Linux vserver routines.
-+#
++static inline int vx_info_proc_cacct(struct _vx_cacct *cacct, char *buffer)
++{
++ int i,j, length = 0;
++ static char *type[VXA_SOCK_SIZE] = {
++ "UNSPEC", "UNIX", "INET", "INET6", "PACKET", "OTHER" };
+
++ length += sprintf(buffer + length, VX_SOCKA_TOP);
++ for (i=0; i<VXA_SOCK_SIZE; i++) {
++ length += sprintf(buffer + length,
++ "%s:", type[i]);
++ for (j=0; j<3; j++) {
++ length += sprintf(buffer + length,
++ "\t%10lu/%-10lu"
++ ,vx_sock_count(cacct, i, j)
++ ,vx_sock_total(cacct, i, j)
++ );
++ }
++ buffer[length++] = '\n';
++ }
+
-+obj-y += vserver.o
++ length += sprintf(buffer + length, "\n");
++ length += sprintf(buffer + length,
++ "slab:\t %8u %8u %8u %8u\n"
++ ,atomic_read(&cacct->slab[1])
++ ,atomic_read(&cacct->slab[4])
++ ,atomic_read(&cacct->slab[0])
++ ,atomic_read(&cacct->slab[2])
++ );
+
-+vserver-y := switch.o context.o namespace.o sched.o network.o inode.o \
-+ limit.o cvirt.o signal.o helper.o init.o dlimit.o
++ length += sprintf(buffer + length, "\n");
++ for (i=0; i<5; i++) {
++ length += sprintf(buffer + length,
++ "page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n"
++ ,i
++ ,atomic_read(&cacct->page[i][0])
++ ,atomic_read(&cacct->page[i][1])
++ ,atomic_read(&cacct->page[i][2])
++ ,atomic_read(&cacct->page[i][3])
++ ,atomic_read(&cacct->page[i][4])
++ ,atomic_read(&cacct->page[i][5])
++ ,atomic_read(&cacct->page[i][6])
++ ,atomic_read(&cacct->page[i][7])
++ );
++ }
+
-+vserver-$(CONFIG_PROC_FS) += proc.o
-+vserver-$(CONFIG_VSERVER_DEBUG) += sysctl.o
-+vserver-$(CONFIG_VSERVER_LEGACY) += legacy.o
-+vserver-$(CONFIG_VSERVER_LEGACYNET) += legacynet.o
-+vserver-$(CONFIG_VSERVER_HISTORY) += history.o
++ return length;
++}
+
---- linux-2.6.18.5/kernel/vserver/context.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/context.c 2006-11-23 16:37:49 +0100
-@@ -0,0 +1,923 @@
++#endif /* _VX_CACCT_PROC_H */
+--- linux-2.6.20/kernel/vserver/context.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/context.c 2007-02-06 05:28:00 +0100
+@@ -0,0 +1,1098 @@
+/*
+ * linux/kernel/vserver/context.c
+ *
+ * Virtual Server: Context Support
+ *
-+ * Copyright (C) 2003-2005 Herbert Pötzl
++ * Copyright (C) 2003-2006 Herbert Pötzl
+ *
+ * V0.01 context helper
+ * V0.02 vx_ctx_kill syscall command
@@ -14243,20 +18247,25 @@
+ * V0.09 revert to non RCU for now
+ * V0.10 and back to working RCU hash
+ * V0.11 and back to locking again
-+ * V0.12 have __create claim() the vxi
++ * V0.12 referenced context store
++ * V0.13 separate per cpu data
++ * V0.14 changed vcmds to vxi arg
++ * V0.15 added context stat
+ *
+ */
+
+#include <linux/slab.h>
+#include <linux/types.h>
-+#include <linux/namespace.h>
++#include <linux/mnt_namespace.h>
+
+#include <linux/sched.h>
++#include <linux/vserver/context.h>
+#include <linux/vserver/network.h>
+#include <linux/vserver/legacy.h>
-+#include <linux/vserver/limit.h>
+#include <linux/vserver/debug.h>
++#include <linux/vserver/limit.h>
+#include <linux/vserver/limit_int.h>
++#include <linux/vserver/space.h>
+
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
@@ -14266,10 +18275,22 @@
+#include <asm/errno.h>
+
+#include "cvirt_init.h"
++#include "cacct_init.h"
+#include "limit_init.h"
+#include "sched_init.h"
+
+
++atomic_t vx_global_ctotal = ATOMIC_INIT(0);
++atomic_t vx_global_cactive = ATOMIC_INIT(0);
++
++
++/* now inactive context structures */
++
++static struct hlist_head vx_info_inactive = HLIST_HEAD_INIT;
++
++static spinlock_t vx_info_inactive_lock = SPIN_LOCK_UNLOCKED;
++
++
+/* __alloc_vx_info()
+
+ * allocate an initialized vx_info struct
@@ -14278,6 +18299,7 @@
+static struct vx_info *__alloc_vx_info(xid_t xid)
+{
+ struct vx_info *new = NULL;
++ int cpu;
+
+ vxdprintk(VXD_CBIT(xid, 0), "alloc_vx_info(%d)*", xid);
+
@@ -14287,6 +18309,11 @@
+ return 0;
+
+ memset (new, 0, sizeof(struct vx_info));
++#ifdef CONFIG_SMP
++ new->ptr_pc = alloc_percpu(struct _vx_info_pc);
++ if (!new->ptr_pc)
++ goto error;
++#endif
+ new->vx_id = xid;
+ INIT_HLIST_NODE(&new->vx_hlist);
+ atomic_set(&new->vx_usecnt, 0);
@@ -14296,8 +18323,8 @@
+ init_waitqueue_head(&new->vx_wait);
+
+ /* prepare reaper */
-+ get_task_struct(child_reaper);
-+ new->vx_reaper = child_reaper;
++ get_task_struct(&init_task);
++ new->vx_reaper = &init_task;
+
+ /* rest of init goes here */
+ vx_info_init_limit(&new->limit);
@@ -14305,9 +18332,18 @@
+ vx_info_init_cvirt(&new->cvirt);
+ vx_info_init_cacct(&new->cacct);
+
++ /* per cpu data structures */
++ for_each_possible_cpu(cpu) {
++ vx_info_init_sched_pc(
++ &vx_per_cpu(new, sched_pc, cpu), cpu);
++ vx_info_init_cvirt_pc(
++ &vx_per_cpu(new, cvirt_pc, cpu), cpu);
++ }
++
+ new->vx_flags = VXF_INIT_SET;
+ new->vx_bcaps = CAP_INIT_EFF_SET;
+ new->vx_ccaps = 0;
++ new->vx_cap_bset = cap_bset;
+
+ new->reboot_cmd = 0;
+ new->exit_code = 0;
@@ -14315,7 +18351,13 @@
+ vxdprintk(VXD_CBIT(xid, 0),
+ "alloc_vx_info(%d) = %p", xid, new);
+ vxh_alloc_vx_info(new);
++ atomic_inc(&vx_global_ctotal);
+ return new;
++#ifdef CONFIG_SMP
++error:
++ kfree(new);
++ return 0;
++#endif
+}
+
+/* __dealloc_vx_info()
@@ -14324,11 +18366,12 @@
+
+static void __dealloc_vx_info(struct vx_info *vxi)
+{
++ int cpu;
++
+ vxdprintk(VXD_CBIT(xid, 0),
+ "dealloc_vx_info(%p)", vxi);
+ vxh_dealloc_vx_info(vxi);
+
-+ vxi->vx_hlist.next = LIST_POISON1;
+ vxi->vx_id = -1;
+
+ vx_info_exit_limit(&vxi->limit);
@@ -14336,13 +18379,25 @@
+ vx_info_exit_cvirt(&vxi->cvirt);
+ vx_info_exit_cacct(&vxi->cacct);
+
++ for_each_possible_cpu(cpu) {
++ vx_info_exit_sched_pc(
++ &vx_per_cpu(vxi, sched_pc, cpu), cpu);
++ vx_info_exit_cvirt_pc(
++ &vx_per_cpu(vxi, cvirt_pc, cpu), cpu);
++ }
++
+ vxi->vx_state |= VXS_RELEASED;
++
++#ifdef CONFIG_SMP
++ free_percpu(vxi->ptr_pc);
++#endif
+ kfree(vxi);
++ atomic_dec(&vx_global_ctotal);
+}
+
+static void __shutdown_vx_info(struct vx_info *vxi)
+{
-+ struct namespace *namespace;
++ struct nsproxy *nsproxy;
+ struct fs_struct *fs;
+
+ might_sleep();
@@ -14350,11 +18405,11 @@
+ vxi->vx_state |= VXS_SHUTDOWN;
+ vs_state_change(vxi, VSC_SHUTDOWN);
+
-+ namespace = xchg(&vxi->vx_namespace, NULL);
-+ if (namespace)
-+ put_namespace(namespace);
-+
++ nsproxy = xchg(&vxi->vx_nsproxy, NULL);
+ fs = xchg(&vxi->vx_fs, NULL);
++
++ if (nsproxy)
++ put_nsproxy(nsproxy);
+ if (fs)
+ put_fs_struct(fs);
+}
@@ -14363,6 +18418,8 @@
+
+void free_vx_info(struct vx_info *vxi)
+{
++ unsigned long flags;
++
+ /* context shutdown is mandatory */
+ BUG_ON(!vx_info_state(vxi, VXS_SHUTDOWN));
+
@@ -14371,9 +18428,13 @@
+
+ BUG_ON(vx_info_state(vxi, VXS_HASHED));
+
-+ BUG_ON(vxi->vx_namespace);
++ BUG_ON(vxi->vx_nsproxy);
+ BUG_ON(vxi->vx_fs);
+
++ spin_lock_irqsave(&vx_info_inactive_lock, flags);
++ hlist_del(&vxi->vx_hlist);
++ spin_unlock_irqrestore(&vx_info_inactive_lock, flags);
++
+ __dealloc_vx_info(vxi);
+}
+
@@ -14382,7 +18443,8 @@
+
+#define VX_HASH_SIZE 13
+
-+struct hlist_head vx_info_hash[VX_HASH_SIZE];
++static struct hlist_head vx_info_hash[VX_HASH_SIZE] =
++ { [0 ... VX_HASH_SIZE-1] = HLIST_HEAD_INIT };
+
+static spinlock_t vx_info_hash_lock = SPIN_LOCK_UNLOCKED;
+
@@ -14414,6 +18476,7 @@
+ vxi->vx_state |= VXS_HASHED;
+ head = &vx_info_hash[__hashval(vxi->vx_id)];
+ hlist_add_head(&vxi->vx_hlist, head);
++ atomic_inc(&vx_global_cactive);
+}
+
+/* __unhash_vx_info()
@@ -14423,17 +18486,25 @@
+
+static inline void __unhash_vx_info(struct vx_info *vxi)
+{
++ unsigned long flags;
++
++ vxd_assert_lock(&vx_info_hash_lock);
+ vxdprintk(VXD_CBIT(xid, 4),
-+ "__unhash_vx_info: %p[#%d]", vxi, vxi->vx_id);
-+ spin_lock(&vx_info_hash_lock);
++ "__unhash_vx_info: %p[#%d.%d.%d]", vxi, vxi->vx_id,
++ atomic_read(&vxi->vx_usecnt), atomic_read(&vxi->vx_tasks));
+ vxh_unhash_vx_info(vxi);
+
+ /* context must be hashed */
+ BUG_ON(!vx_info_state(vxi, VXS_HASHED));
++ /* but without tasks */
++ BUG_ON(atomic_read(&vxi->vx_tasks));
+
+ vxi->vx_state &= ~VXS_HASHED;
-+ hlist_del(&vxi->vx_hlist);
-+ spin_unlock(&vx_info_hash_lock);
++ hlist_del_init(&vxi->vx_hlist);
++ spin_lock_irqsave(&vx_info_inactive_lock, flags);
++ hlist_add_head(&vxi->vx_hlist, &vx_info_inactive);
++ spin_unlock_irqrestore(&vx_info_inactive_lock, flags);
++ atomic_dec(&vx_global_cactive);
+}
+
+
@@ -14511,12 +18582,17 @@
+
+ /* dynamic context requested */
+ if (id == VX_DYNAMIC_ID) {
++#ifdef CONFIG_VSERVER_DYNAMIC_IDS
+ id = __vx_dynamic_id();
+ if (!id) {
+ printk(KERN_ERR "no dynamic context available.\n");
+ goto out_unlock;
+ }
+ new->vx_id = id;
++#else
++ printk(KERN_ERR "dynamic contexts disabled.\n");
++ goto out_unlock;
++#endif
+ }
+ /* existing context requested */
+ else if ((vxi = __lookup_vx_info(id))) {
@@ -14555,7 +18631,7 @@
+/* __create_vx_info()
+
+ * create the requested context
-+ * get(), claim() and hash it */
++ * get() and hash it */
+
+static struct vx_info * __create_vx_info(int id)
+{
@@ -14571,6 +18647,7 @@
+
+ /* dynamic context requested */
+ if (id == VX_DYNAMIC_ID) {
++#ifdef CONFIG_VSERVER_DYNAMIC_IDS
+ id = __vx_dynamic_id();
+ if (!id) {
+ printk(KERN_ERR "no dynamic context available.\n");
@@ -14578,6 +18655,11 @@
+ goto out_unlock;
+ }
+ new->vx_id = id;
++#else
++ printk(KERN_ERR "dynamic contexts disabled.\n");
++ vxi = ERR_PTR(-EINVAL);
++ goto out_unlock;
++#endif
+ }
+ /* static context requested */
+ else if ((vxi = __lookup_vx_info(id))) {
@@ -14589,6 +18671,7 @@
+ vxi = ERR_PTR(-EEXIST);
+ goto out_unlock;
+ }
++#ifdef CONFIG_VSERVER_DYNAMIC_IDS
+ /* dynamic xid creation blocker */
+ else if (id >= MIN_D_CONTEXT) {
+ vxdprintk(VXD_CBIT(xid, 0),
@@ -14596,11 +18679,11 @@
+ vxi = ERR_PTR(-EINVAL);
+ goto out_unlock;
+ }
++#endif
+
+ /* new context */
+ vxdprintk(VXD_CBIT(xid, 0),
+ "create_vx_info(%d) = %p (new)", id, new);
-+ claim_vx_info(new, NULL);
+ __hash_vx_info(get_vx_info(new));
+ vxi = new, new = NULL;
+
@@ -14619,7 +18702,9 @@
+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);
+ __wakeup_vx_info(vxi);
+}
+
@@ -14670,10 +18755,23 @@
+
+#ifdef CONFIG_PROC_FS
+
++/* get_xid_list()
++
++ * get a subset of hashed xids for proc
++ * assumes size is at least one */
++
+int get_xid_list(int index, unsigned int *xids, int size)
+{
+ int hindex, nr_xids = 0;
+
++ /* only show current and children */
++ if (!vx_check(0, VS_ADMIN|VS_WATCH)) {
++ if (index > 0)
++ return 0;
++ xids[nr_xids] = vx_current_xid();
++ return 1;
++ }
++
+ for (hindex = 0; hindex < VX_HASH_SIZE; hindex++) {
+ struct hlist_head *head = &vx_info_hash[hindex];
+ struct hlist_node *pos;
@@ -14700,6 +18798,21 @@
+}
+#endif
+
++#ifdef CONFIG_VSERVER_DEBUG
++
++void dump_vx_info_inactive(int level)
++{
++ struct hlist_node *entry, *next;
++
++ hlist_for_each_safe(entry, next, &vx_info_inactive) {
++ struct vx_info *vxi =
++ list_entry(entry, struct vx_info, vx_hlist);
++
++ dump_vx_info(vxi, level);
++ }
++}
++
++#endif
+
+int vx_migrate_user(struct task_struct *p, struct vx_info *vxi)
+{
@@ -14707,6 +18820,10 @@
+
+ if (!p || !vxi)
+ BUG();
++
++ if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0))
++ return -EACCES;
++
+ new_user = alloc_uid(vxi->vx_id, p->uid);
+ if (!new_user)
+ return -ENOMEM;
@@ -14721,11 +18838,11 @@
+ return 0;
+}
+
-+void vx_mask_bcaps(struct vx_info *vxi, struct task_struct *p)
++void vx_mask_cap_bset(struct vx_info *vxi, struct task_struct *p)
+{
-+ p->cap_effective &= vxi->vx_bcaps;
-+ p->cap_inheritable &= vxi->vx_bcaps;
-+ p->cap_permitted &= vxi->vx_bcaps;
++ p->cap_effective &= vxi->vx_cap_bset;
++ p->cap_inheritable &= vxi->vx_cap_bset;
++ p->cap_permitted &= vxi->vx_cap_bset;
+}
+
+
@@ -14752,12 +18869,18 @@
+ return total;
+}
+
++
++/* for *space compatibility */
++
++asmlinkage long sys_unshare(unsigned long);
++
+/*
+ * migrate task to new context
+ * gets vxi, puts old_vxi on change
++ * optionally unshares namespaces (hack)
+ */
+
-+int vx_migrate_task(struct task_struct *p, struct vx_info *vxi)
++int vx_migrate_task(struct task_struct *p, struct vx_info *vxi, int unshare)
+{
+ struct vx_info *old_vxi;
+ int ret = 0;
@@ -14765,14 +18888,21 @@
+ if (!p || !vxi)
+ BUG();
+
-+ old_vxi = task_get_vx_info(p);
-+ if (old_vxi == vxi)
-+ goto out;
-+
+ vxdprintk(VXD_CBIT(xid, 5),
+ "vx_migrate_task(%p,%p[#%d.%d])", p, vxi,
+ vxi->vx_id, atomic_read(&vxi->vx_usecnt));
+
++ if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0) &&
++ !vx_info_flags(vxi, VXF_STATE_SETUP, 0))
++ return -EACCES;
++
++ if (vx_info_state(vxi, VXS_SHUTDOWN))
++ return -EFAULT;
++
++ old_vxi = task_get_vx_info(p);
++ if (old_vxi == vxi)
++ goto out;
++
+ if (!(ret = vx_migrate_user(p, vxi))) {
+ int openfd;
+
@@ -14782,15 +18912,19 @@
+ if (old_vxi) {
+ atomic_dec(&old_vxi->cvirt.nr_threads);
+ atomic_dec(&old_vxi->cvirt.nr_running);
-+ atomic_dec(&old_vxi->limit.rcur[RLIMIT_NPROC]);
++ __rlim_dec(&old_vxi->limit, RLIMIT_NPROC);
+ /* FIXME: what about the struct files here? */
-+ atomic_sub(openfd, &old_vxi->limit.rcur[VLIMIT_OPENFD]);
++ __rlim_sub(&old_vxi->limit, VLIMIT_OPENFD, openfd);
++ /* account for the executable */
++ __rlim_dec(&old_vxi->limit, VLIMIT_DENTRY);
+ }
+ atomic_inc(&vxi->cvirt.nr_threads);
+ atomic_inc(&vxi->cvirt.nr_running);
-+ atomic_inc(&vxi->limit.rcur[RLIMIT_NPROC]);
++ __rlim_inc(&vxi->limit, RLIMIT_NPROC);
+ /* FIXME: what about the struct files here? */
-+ atomic_add(openfd, &vxi->limit.rcur[VLIMIT_OPENFD]);
++ __rlim_add(&vxi->limit, VLIMIT_OPENFD, openfd);
++ /* account for the executable */
++ __rlim_inc(&vxi->limit, VLIMIT_DENTRY);
+
+ if (old_vxi) {
+ release_vx_info(old_vxi, p);
@@ -14804,8 +18938,14 @@
+ "moved task %p into vxi:%p[#%d]",
+ p, vxi, vxi->vx_id);
+
-+ vx_mask_bcaps(vxi, p);
++ vx_mask_cap_bset(vxi, p);
+ task_unlock(p);
++
++ /* hack for *spaces to provide compatibility */
++ if (unshare) {
++ ret = sys_unshare(CLONE_NEWUTS|CLONE_NEWIPC);
++ vx_set_space(vxi, CLONE_NEWUTS|CLONE_NEWIPC);
++ }
+ }
+out:
+ put_vx_info(old_vxi);
@@ -14858,13 +18998,14 @@
+ vxi->vx_initpid = 0;
+}
+
++
+void vx_set_persistent(struct vx_info *vxi)
+{
+ vxdprintk(VXD_CBIT(xid, 6),
+ "vx_set_persistent(%p[#%d])", vxi, vxi->vx_id);
+
+ get_vx_info(vxi);
-+ claim_vx_info(vxi, NULL);
++ claim_vx_info(vxi, current);
+}
+
+void vx_clear_persistent(struct vx_info *vxi)
@@ -14872,7 +19013,7 @@
+ vxdprintk(VXD_CBIT(xid, 6),
+ "vx_clear_persistent(%p[#%d])", vxi, vxi->vx_id);
+
-+ release_vx_info(vxi, NULL);
++ release_vx_info(vxi, current);
+ put_vx_info(vxi);
+}
+
@@ -14908,7 +19049,7 @@
+ if (vxi->vx_initpid == p->tgid)
+ vx_exit_init(vxi, p, code);
+ if (vxi->vx_reaper == p)
-+ vx_set_reaper(vxi, child_reaper);
++ vx_set_reaper(vxi, &init_task);
+ }
+}
+
@@ -14927,7 +19068,7 @@
+ if (id) {
+ struct task_struct *tsk;
+
-+ if (!vx_check(0, VX_ADMIN|VX_WATCH))
++ if (!vx_check(0, VS_ADMIN|VS_WATCH))
+ return -EPERM;
+
+ read_lock(&tasklist_lock);
@@ -14941,23 +19082,25 @@
+}
+
+
-+int vc_vx_info(uint32_t id, void __user *data)
++int vc_vx_info(struct vx_info *vxi, void __user *data)
+{
-+ struct vx_info *vxi;
+ struct vcmd_vx_info_v0 vc_data;
+
-+ if (!vx_check(0, VX_ADMIN))
-+ return -ENOSYS;
-+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RESOURCE))
-+ return -EPERM;
-+
-+ vxi = lookup_vx_info(id);
-+ if (!vxi)
-+ return -ESRCH;
-+
+ vc_data.xid = vxi->vx_id;
+ vc_data.initpid = vxi->vx_initpid;
-+ put_vx_info(vxi);
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return 0;
++}
++
++
++int vc_ctx_stat(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_ctx_stat_v0 vc_data;
++
++ vc_data.usecnt = atomic_read(&vxi->vx_usecnt);
++ vc_data.tasks = atomic_read(&vxi->vx_tasks);
+
+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
@@ -14973,8 +19116,6 @@
+ struct vx_info *new_vxi;
+ int ret;
+
-+ if (!capable(CAP_SYS_ADMIN))
-+ return -EPERM;
+ if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
@@ -14990,176 +19131,215 @@
+ /* initial flags */
+ new_vxi->vx_flags = vc_data.flagword;
+
++ /* get a reference for persistent contexts */
++ if ((vc_data.flagword & VXF_PERSISTENT))
++ vx_set_persistent(new_vxi);
++
+ ret = -ENOEXEC;
+ if (vs_state_change(new_vxi, VSC_STARTUP))
-+ goto out;
++ goto out_err;
+
-+ ret = vx_migrate_task(current, new_vxi);
-+ if (ret)
++ ret = vx_migrate_task(current, new_vxi, (!data));
++ if (!ret) {
++ /* return context id on success */
++ ret = new_vxi->vx_id;
+ goto out;
-+
-+ /* return context id on success */
-+ ret = new_vxi->vx_id;
-+
-+ /* get a reference for persistent contexts */
++ }
++out_err:
++ /* prepare for context disposal */
++ new_vxi->vx_state |= VXS_SHUTDOWN;
++ new_vxi->vx_flags &= ~VXF_PERSISTENT;
+ if ((vc_data.flagword & VXF_PERSISTENT))
-+ vx_set_persistent(new_vxi);
++ vx_clear_persistent(new_vxi);
+out:
-+ release_vx_info(new_vxi, NULL);
+ put_vx_info(new_vxi);
+ return ret;
+}
+
+
-+int vc_ctx_migrate(uint32_t id, void __user *data)
++int vc_ctx_migrate(struct vx_info *vxi, void __user *data)
+{
+ struct vcmd_ctx_migrate vc_data = { .flagword = 0 };
-+ struct vx_info *vxi;
++ int ret;
+
-+ if (!capable(CAP_SYS_ADMIN))
-+ return -EPERM;
+ if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ /* dirty hack until Spectator becomes a cap */
-+ if (id == 1) {
-+ current->xid = 1;
-+ return 0;
-+ }
-+
-+ vxi = lookup_vx_info(id);
-+ if (!vxi)
-+ return -ESRCH;
-+ vx_migrate_task(current, vxi);
++ ret = vx_migrate_task(current, vxi, 0);
++ if (ret)
++ return ret;
+ if (vc_data.flagword & VXM_SET_INIT)
-+ vx_set_init(vxi, current);
++ ret = vx_set_init(vxi, current);
++ if (ret)
++ return ret;
+ if (vc_data.flagword & VXM_SET_REAPER)
-+ vx_set_reaper(vxi, current);
-+ put_vx_info(vxi);
-+ return 0;
++ ret = vx_set_reaper(vxi, current);
++ return ret;
+}
+
+
-+int vc_get_cflags(uint32_t id, void __user *data)
++int vc_get_cflags(struct vx_info *vxi, void __user *data)
+{
-+ struct vx_info *vxi;
+ struct vcmd_ctx_flags_v0 vc_data;
+
-+ if (!capable(CAP_SYS_ADMIN))
-+ return -EPERM;
-+
-+ vxi = lookup_vx_info(id);
-+ if (!vxi)
-+ return -ESRCH;
-+
+ vc_data.flagword = vxi->vx_flags;
+
+ /* special STATE flag handling */
-+ vc_data.mask = vx_mask_flags(~0UL, vxi->vx_flags, VXF_ONE_TIME);
-+
-+ put_vx_info(vxi);
++ vc_data.mask = vs_mask_flags(~0UL, vxi->vx_flags, VXF_ONE_TIME);
+
+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+
-+int vc_set_cflags(uint32_t id, void __user *data)
++int vc_set_cflags(struct vx_info *vxi, void __user *data)
+{
-+ struct vx_info *vxi;
+ struct vcmd_ctx_flags_v0 vc_data;
+ uint64_t mask, trigger;
+
-+ if (!capable(CAP_SYS_ADMIN))
-+ return -EPERM;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ vxi = lookup_vx_info(id);
-+ if (!vxi)
-+ return -ESRCH;
-+
+ /* special STATE flag handling */
-+ mask = vx_mask_mask(vc_data.mask, vxi->vx_flags, VXF_ONE_TIME);
++ 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 (trigger & VXF_STATE_SETUP)
-+ vx_mask_bcaps(vxi, current);
++ vx_mask_cap_bset(vxi, current);
+ if (trigger & VXF_STATE_INIT) {
-+ vx_set_init(vxi, current);
-+ vx_set_reaper(vxi, current);
++ int ret;
++
++ ret = vx_set_init(vxi, current);
++ if (ret)
++ return ret;
++ ret = vx_set_reaper(vxi, current);
++ if (ret)
++ return ret;
+ }
+ }
+
-+ vxi->vx_flags = vx_mask_flags(vxi->vx_flags,
++ vxi->vx_flags = vs_mask_flags(vxi->vx_flags,
+ vc_data.flagword, mask);
+ if (trigger & VXF_PERSISTENT)
+ vx_update_persistent(vxi);
+
-+ put_vx_info(vxi);
+ return 0;
+}
+
-+int vc_get_ccaps(uint32_t id, void __user *data)
++static int do_get_caps(struct vx_info *vxi, uint64_t *bcaps, uint64_t *ccaps)
++{
++ if (bcaps)
++ *bcaps = vxi->vx_bcaps;
++ if (ccaps)
++ *ccaps = vxi->vx_ccaps;
++
++ return 0;
++}
++
++int vc_get_ccaps_v0(struct vx_info *vxi, void __user *data)
+{
-+ struct vx_info *vxi;
+ struct vcmd_ctx_caps_v0 vc_data;
++ int ret;
+
-+ if (!capable(CAP_SYS_ADMIN))
-+ return -EPERM;
++ ret = do_get_caps(vxi, &vc_data.bcaps, &vc_data.ccaps);
++ if (ret)
++ return ret;
++ vc_data.cmask = ~0UL;
+
-+ vxi = lookup_vx_info(id);
-+ if (!vxi)
-+ return -ESRCH;
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return 0;
++}
+
-+ vc_data.bcaps = vxi->vx_bcaps;
-+ vc_data.ccaps = vxi->vx_ccaps;
++int vc_get_ccaps(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_ctx_caps_v1 vc_data;
++ int ret;
++
++ ret = do_get_caps(vxi, NULL, &vc_data.ccaps);
++ if (ret)
++ return ret;
+ vc_data.cmask = ~0UL;
-+ put_vx_info(vxi);
+
+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+
-+int vc_set_ccaps(uint32_t id, void __user *data)
++static int do_set_caps(struct vx_info *vxi,
++ uint64_t bcaps, uint64_t bmask, uint64_t ccaps, uint64_t cmask)
++{
++ vxi->vx_bcaps = vs_mask_flags(vxi->vx_bcaps, bcaps, bmask);
++ vxi->vx_ccaps = vs_mask_flags(vxi->vx_ccaps, ccaps, cmask);
++
++ return 0;
++}
++
++int vc_set_ccaps_v0(struct vx_info *vxi, void __user *data)
+{
-+ struct vx_info *vxi;
+ struct vcmd_ctx_caps_v0 vc_data;
+
-+ if (!capable(CAP_SYS_ADMIN))
-+ return -EPERM;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ vxi = lookup_vx_info(id);
-+ if (!vxi)
-+ return -ESRCH;
-+
-+ vxi->vx_bcaps &= vc_data.bcaps;
-+ vxi->vx_ccaps = vx_mask_flags(vxi->vx_ccaps,
++ /* simulate old &= behaviour for bcaps */
++ return do_set_caps(vxi, 0, ~vc_data.bcaps,
+ vc_data.ccaps, vc_data.cmask);
-+ put_vx_info(vxi);
++}
++
++int vc_set_ccaps(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_ctx_caps_v1 vc_data;
++
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ return do_set_caps(vxi, 0, 0, vc_data.ccaps, vc_data.cmask);
++}
++
++int vc_get_bcaps(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_bcaps vc_data;
++ int ret;
++
++ ret = do_get_caps(vxi, &vc_data.bcaps, NULL);
++ if (ret)
++ return ret;
++ vc_data.bmask = ~0UL;
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
+ return 0;
+}
+
++int vc_set_bcaps(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_bcaps vc_data;
++
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ return do_set_caps(vxi, vc_data.bcaps, vc_data.bmask, 0, 0);
++}
++
+#include <linux/module.h>
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
---- linux-2.6.18.5/kernel/vserver/cvirt.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/cvirt.c 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,260 @@
+--- linux-2.6.20/kernel/vserver/cvirt.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/cvirt.c 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,305 @@
+/*
+ * linux/kernel/vserver/cvirt.c
+ *
+ * Virtual Server: Context Virtualization
+ *
-+ * Copyright (C) 2004-2005 Herbert Pötzl
++ * Copyright (C) 2004-2006 Herbert Pötzl
+ *
+ * V0.01 broken out from limit.c
+ * V0.02 added utsname stuff
++ * V0.03 changed vcmds to vxi arg
+ *
+ */
+
@@ -15170,6 +19350,7 @@
+#include <linux/vs_cvirt.h>
+#include <linux/vserver/switch.h>
+#include <linux/vserver/cvirt_cmd.h>
++//#include <linux/vserver/cacct_cmd.h>
+
+#include <asm/errno.h>
+#include <asm/uaccess.h>
@@ -15250,32 +19431,6 @@
+}
+
+
-+int vx_uts_virt_handler(struct ctl_table *ctl, int write, xid_t xid,
-+ void **datap, size_t *lenp)
-+{
-+ switch (ctl->ctl_name) {
-+ case KERN_OSTYPE:
-+ *datap = vx_new_uts(sysname);
-+ break;
-+ case KERN_OSRELEASE:
-+ *datap = vx_new_uts(release);
-+ break;
-+ case KERN_VERSION:
-+ *datap = vx_new_uts(version);
-+ break;
-+ case KERN_NODENAME:
-+ *datap = vx_new_uts(nodename);
-+ break;
-+ case KERN_DOMAINNAME:
-+ *datap = vx_new_uts(domainname);
-+ break;
-+ }
-+
-+ return 0;
-+}
-+
-+
-+
+/*
+ * Commands to do_syslog:
+ *
@@ -15344,76 +19499,145 @@
+
+static char * vx_vhi_name(struct vx_info *vxi, int id)
+{
-+ switch (id) {
-+ case VHIN_CONTEXT:
++ struct nsproxy *nsproxy;
++ struct uts_namespace *uts;
++
++
++ if (id == VHIN_CONTEXT)
+ return vxi->vx_name;
++
++ nsproxy = vxi->vx_nsproxy;
++ if (!nsproxy)
++ return NULL;
++
++ uts = nsproxy->uts_ns;
++ if (!uts)
++ return NULL;
++
++ switch (id) {
+ case VHIN_SYSNAME:
-+ return vxi->cvirt.utsname.sysname;
++ return uts->name.sysname;
+ case VHIN_NODENAME:
-+ return vxi->cvirt.utsname.nodename;
++ return uts->name.nodename;
+ case VHIN_RELEASE:
-+ return vxi->cvirt.utsname.release;
++ return uts->name.release;
+ case VHIN_VERSION:
-+ return vxi->cvirt.utsname.version;
++ return uts->name.version;
+ case VHIN_MACHINE:
-+ return vxi->cvirt.utsname.machine;
++ return uts->name.machine;
+ case VHIN_DOMAINNAME:
-+ return vxi->cvirt.utsname.domainname;
++ return uts->name.domainname;
+ default:
+ return NULL;
+ }
+ return NULL;
+}
+
-+int vc_set_vhi_name(uint32_t id, void __user *data)
++int vc_set_vhi_name(struct vx_info *vxi, void __user *data)
+{
-+ struct vx_info *vxi;
+ struct vcmd_vhi_name_v0 vc_data;
+ char *name;
+
-+ if (!capable(CAP_SYS_ADMIN))
-+ return -EPERM;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ vxi = lookup_vx_info(id);
-+ if (!vxi)
-+ return -ESRCH;
-+
+ name = vx_vhi_name(vxi, vc_data.field);
-+ if (name)
-+ memcpy(name, vc_data.name, 65);
-+ put_vx_info(vxi);
-+ return (name ? 0 : -EFAULT);
++ if (!name)
++ return -EINVAL;
++
++ memcpy(name, vc_data.name, 65);
++ return 0;
+}
+
-+int vc_get_vhi_name(uint32_t id, void __user *data)
++int vc_get_vhi_name(struct vx_info *vxi, void __user *data)
+{
-+ struct vx_info *vxi;
+ struct vcmd_vhi_name_v0 vc_data;
+ char *name;
+
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ vxi = lookup_vx_info(id);
-+ if (!vxi)
-+ return -ESRCH;
-+
+ name = vx_vhi_name(vxi, vc_data.field);
+ if (!name)
-+ goto out_put;
++ return -EINVAL;
+
+ memcpy(vc_data.name, name, 65);
+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
-+out_put:
-+ put_vx_info(vxi);
-+ return (name ? 0 : -EFAULT);
++ return 0;
++}
++
++
++int vc_virt_stat(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_virt_stat_v0 vc_data;
++ struct _vx_cvirt *cvirt = &vxi->cvirt;
++ struct timespec uptime;
++
++ do_posix_clock_monotonic_gettime(&uptime);
++ set_normalized_timespec(&uptime,
++ uptime.tv_sec - cvirt->bias_uptime.tv_sec,
++ uptime.tv_nsec - cvirt->bias_uptime.tv_nsec);
++
++ vc_data.offset = timeval_to_ns(&cvirt->bias_tv);
++ vc_data.uptime = timespec_to_ns(&uptime);
++ vc_data.nr_threads = atomic_read(&cvirt->nr_threads);
++ vc_data.nr_running = atomic_read(&cvirt->nr_running);
++ vc_data.nr_uninterruptible = atomic_read(&cvirt->nr_uninterruptible);
++ vc_data.nr_onhold = atomic_read(&cvirt->nr_onhold);
++ vc_data.nr_forks = atomic_read(&cvirt->total_forks);
++ vc_data.load[0] = cvirt->load[0];
++ vc_data.load[1] = cvirt->load[1];
++ vc_data.load[2] = cvirt->load[2];
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return 0;
++}
++
++
++#ifdef CONFIG_VSERVER_VTIME
++
++/* virtualized time base */
++
++void vx_gettimeofday(struct timeval *tv)
++{
++ 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;
++
++ if (tv->tv_usec >= USEC_PER_SEC) {
++ tv->tv_sec++;
++ tv->tv_usec -= USEC_PER_SEC;
++ } else if (tv->tv_usec < 0) {
++ tv->tv_sec--;
++ tv->tv_usec += USEC_PER_SEC;
++ }
+}
---- linux-2.6.18.5/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/cvirt_init.h 2006-10-29 05:06:18 +0100
-@@ -0,0 +1,78 @@
++
++int vx_settimeofday(struct timespec *ts)
++{
++ struct timeval tv;
++
++ 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 =
++ (ts->tv_nsec/NSEC_PER_USEC) - tv.tv_usec;
++ return 0;
++}
++
++#endif
++
+--- linux-2.6.20/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/cvirt_init.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,71 @@
+
+
+extern uint64_t vx_idle_jiffies(void);
@@ -15427,6 +19651,8 @@
+ nsuptime = (unsigned long long)cvirt->bias_uptime.tv_sec
+ * NSEC_PER_SEC + cvirt->bias_uptime.tv_nsec;
+ cvirt->bias_clock = nsec_to_clock_t(nsuptime);
++ cvirt->bias_tv.tv_sec = 0;
++ cvirt->bias_tv.tv_usec = 0;
+
+ jiffies_to_timespec(idle_jiffies, &cvirt->bias_idle);
+ atomic_set(&cvirt->nr_threads, 0);
@@ -15434,10 +19660,6 @@
+ atomic_set(&cvirt->nr_uninterruptible, 0);
+ atomic_set(&cvirt->nr_onhold, 0);
+
-+ down_read(&uts_sem);
-+ cvirt->utsname = system_utsname;
-+ up_read(&uts_sem);
-+
+ spin_lock_init(&cvirt->load_lock);
+ cvirt->load_last = jiffies;
+ atomic_set(&cvirt->load_updates, 0);
@@ -15454,6 +19676,12 @@
+ cvirt->syslog.logged_chars = 0;
+}
+
++static inline
++void vx_info_init_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu)
++{
++ // cvirt_pc->cpustat = { 0 };
++}
++
+static inline void vx_info_exit_cvirt(struct _vx_cvirt *cvirt)
+{
+#ifdef CONFIG_VSERVER_DEBUG
@@ -15475,44 +19703,64 @@
+ return;
+}
+
-+static inline void vx_info_init_cacct(struct _vx_cacct *cacct)
-+{
-+ int i,j;
-+
-+ for (i=0; i<5; i++) {
-+ for (j=0; j<3; j++) {
-+ atomic_set(&cacct->sock[i][j].count, 0);
-+ atomic_set(&cacct->sock[i][j].total, 0);
-+ }
-+ }
-+}
-+
-+static inline void vx_info_exit_cacct(struct _vx_cacct *cacct)
++static inline
++void vx_info_exit_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu)
+{
+ return;
+}
+
---- linux-2.6.18.5/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/cvirt_proc.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,92 @@
+--- linux-2.6.20/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/cvirt_proc.h 2007-02-06 05:55:13 +0100
+@@ -0,0 +1,138 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
+
-+#include <linux/sched.h>
-+
++#include <linux/nsproxy.h>
++#include <linux/mnt_namespace.h>
++#include <linux/utsname.h>
++#include <linux/ipc.h>
+
-+#define LOAD_INT(x) ((x) >> FSHIFT)
-+#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
+
-+static inline int vx_info_proc_cvirt(struct _vx_cvirt *cvirt, char *buffer)
++static inline
++int vx_info_proc_nsproxy(struct nsproxy *nsproxy, char *buffer)
+{
++ struct mnt_namespace *ns;
++ struct uts_namespace *uts;
++ struct ipc_namespace *ipc;
++ struct vfsmount *mnt;
++ char *path, *root;
+ int length = 0;
-+ int a, b, c;
++
++ if (!nsproxy)
++ goto out;
+
+ length += sprintf(buffer + length,
-+ "BiasUptime:\t%lu.%02lu\n",
-+ (unsigned long)cvirt->bias_uptime.tv_sec,
-+ (cvirt->bias_uptime.tv_nsec / (NSEC_PER_SEC / 100)));
++ "NSProxy:\t%p [%p,%p,%p]\n",
++ nsproxy, nsproxy->mnt_ns,
++ nsproxy->uts_ns, nsproxy->ipc_ns);
++
++ ns = nsproxy->mnt_ns;
++ if (!ns)
++ goto skip_ns;
++
++ path = kmalloc(PATH_MAX, GFP_KERNEL);
++ if (!path)
++ goto skip_ns;
++
++ mnt = ns->root;
++ root = d_path(mnt->mnt_root, mnt->mnt_parent, path, PATH_MAX-2);
++ length += sprintf(buffer + length,
++ "Namespace:\t%p [#%u]\n"
++ "RootPath:\t%s\n"
++ ,ns , atomic_read(&ns->count)
++ ,root);
++ kfree(path);
++skip_ns:
++
++ uts = nsproxy->uts_ns;
++ if (!uts)
++ goto skip_uts;
++
+ length += sprintf(buffer + length,
+ "SysName:\t%.*s\n"
+ "NodeName:\t%.*s\n"
@@ -15520,13 +19768,53 @@
+ "Version:\t%.*s\n"
+ "Machine:\t%.*s\n"
+ "DomainName:\t%.*s\n"
-+ ,__NEW_UTS_LEN, cvirt->utsname.sysname
-+ ,__NEW_UTS_LEN, cvirt->utsname.nodename
-+ ,__NEW_UTS_LEN, cvirt->utsname.release
-+ ,__NEW_UTS_LEN, cvirt->utsname.version
-+ ,__NEW_UTS_LEN, cvirt->utsname.machine
-+ ,__NEW_UTS_LEN, cvirt->utsname.domainname
++ ,__NEW_UTS_LEN, uts->name.sysname
++ ,__NEW_UTS_LEN, uts->name.nodename
++ ,__NEW_UTS_LEN, uts->name.release
++ ,__NEW_UTS_LEN, uts->name.version
++ ,__NEW_UTS_LEN, uts->name.machine
++ ,__NEW_UTS_LEN, uts->name.domainname
++ );
++skip_uts:
++
++ ipc = nsproxy->ipc_ns;
++ if (!ipc)
++ goto skip_ipc;
++
++ length += sprintf(buffer + length,
++ "SEMS:\t\t%d %d %d %d %d\n"
++ "MSG:\t\t%d %d %d\n"
++ "SHM:\t\t%lu %lu %d %d\n"
++ ,ipc->sem_ctls[0], ipc->sem_ctls[1]
++ ,ipc->sem_ctls[2], ipc->sem_ctls[3]
++ ,ipc->used_sems
++ ,ipc->msg_ctlmax, ipc->msg_ctlmnb, ipc->msg_ctlmni
++ ,(unsigned long)ipc->shm_ctlmax
++ ,(unsigned long)ipc->shm_ctlall
++ ,ipc->shm_ctlmni, ipc->shm_tot
+ );
++skip_ipc:
++
++out:
++ return length;
++}
++
++
++#include <linux/sched.h>
++
++#define LOAD_INT(x) ((x) >> FSHIFT)
++#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
++
++static inline
++int vx_info_proc_cvirt(struct _vx_cvirt *cvirt, char *buffer)
++{
++ int length = 0;
++ int a, b, c;
++
++ length += sprintf(buffer + length,
++ "BiasUptime:\t%lu.%02lu\n",
++ (unsigned long)cvirt->bias_uptime.tv_sec,
++ (cvirt->bias_uptime.tv_nsec / (NSEC_PER_SEC / 100)));
+
+ a = cvirt->load[0] + (FIXED_1/200);
+ b = cvirt->load[1] + (FIXED_1/200);
@@ -15549,47 +19837,60 @@
+ ,LOAD_INT(c), LOAD_FRAC(c)
+ ,atomic_read(&cvirt->total_forks)
+ );
++
+ return length;
+}
+
-+
-+static inline long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
++static inline
++int vx_info_proc_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc,
++ char *buffer, int cpu)
+{
-+ return atomic_read(&cacct->sock[type][pos].count);
++ int length = 0;
++ return length;
+}
+
++#endif /* _VX_CVIRT_PROC_H */
+--- linux-2.6.20/kernel/vserver/debug.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/debug.c 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,35 @@
++/*
++ * kernel/vserver/debug.c
++ *
++ * Copyright (C) 2005 Herbert Pötzl
++ *
++ * V0.01 vx_info dump support
++ *
++ */
+
-+static inline long vx_sock_total(struct _vx_cacct *cacct, int type, int pos)
-+{
-+ return atomic_read(&cacct->sock[type][pos].total);
-+}
++#include <linux/errno.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/vs_base.h>
+
-+static inline int vx_info_proc_cacct(struct _vx_cacct *cacct, char *buffer)
-+{
-+ int i,j, length = 0;
-+ static char *type[] = { "UNSPEC", "UNIX", "INET", "INET6", "OTHER" };
++#include <linux/vserver/context.h>
+
-+ for (i=0; i<5; i++) {
-+ length += sprintf(buffer + length,
-+ "%s:", type[i]);
-+ for (j=0; j<3; j++) {
-+ length += sprintf(buffer + length,
-+ "\t%12lu/%-12lu"
-+ ,vx_sock_count(cacct, i, j)
-+ ,vx_sock_total(cacct, i, j)
-+ );
-+ }
-+ buffer[length++] = '\n';
++
++void dump_vx_info(struct vx_info *vxi, int level)
++{
++ printk("vx_info %p[#%d, %d.%d, %4x]\n", vxi, vxi->vx_id,
++ atomic_read(&vxi->vx_usecnt),
++ atomic_read(&vxi->vx_tasks),
++ vxi->vx_state);
++ if (level > 0) {
++ __dump_vx_limit(&vxi->limit);
++ __dump_vx_sched(&vxi->sched);
++ __dump_vx_cvirt(&vxi->cvirt);
++ __dump_vx_cacct(&vxi->cacct);
+ }
-+ length += sprintf(buffer + length,
-+ "forks:\t%lu\n", cacct->total_forks);
-+ return length;
++ printk("---\n");
+}
+
-+#endif /* _VX_CVIRT_PROC_H */
---- linux-2.6.18.5/kernel/vserver/dlimit.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/dlimit.c 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,548 @@
++
++EXPORT_SYMBOL_GPL(dump_vx_info);
++
+--- linux-2.6.20/kernel/vserver/dlimit.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/dlimit.c 2007-02-06 05:55:23 +0100
+@@ -0,0 +1,527 @@
+/*
+ * linux/kernel/vserver/dlimit.c
+ *
@@ -15603,12 +19904,13 @@
+ */
+
+#include <linux/fs.h>
-+#include <linux/namespace.h>
++// #include <linux/mnt_namespace.h>
+#include <linux/namei.h>
+#include <linux/statfs.h>
+#include <linux/compat.h>
+#include <linux/vserver/switch.h>
+#include <linux/vs_context.h>
++#include <linux/vs_tag.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vserver/dlimit_cmd.h>
+
@@ -15620,12 +19922,12 @@
+ * allocate an initialized dl_info struct
+ * doesn't make it visible (hash) */
+
-+static struct dl_info *__alloc_dl_info(struct super_block *sb, xid_t xid)
++static struct dl_info *__alloc_dl_info(struct super_block *sb, tag_t tag)
+{
+ struct dl_info *new = NULL;
+
+ vxdprintk(VXD_CBIT(dlim, 5),
-+ "alloc_dl_info(%p,%d)*", sb, xid);
++ "alloc_dl_info(%p,%d)*", sb, tag);
+
+ /* would this benefit from a slab cache? */
+ new = kmalloc(sizeof(struct dl_info), GFP_KERNEL);
@@ -15633,7 +19935,7 @@
+ return 0;
+
+ memset (new, 0, sizeof(struct dl_info));
-+ new->dl_xid = xid;
++ new->dl_tag = tag;
+ new->dl_sb = sb;
+ INIT_RCU_HEAD(&new->dl_rcu);
+ INIT_HLIST_NODE(&new->dl_hlist);
@@ -15644,7 +19946,7 @@
+ /* rest of init goes here */
+
+ vxdprintk(VXD_CBIT(dlim, 4),
-+ "alloc_dl_info(%p,%d) = %p", sb, xid, new);
++ "alloc_dl_info(%p,%d) = %p", sb, tag, new);
+ return new;
+}
+
@@ -15658,7 +19960,7 @@
+ "dealloc_dl_info(%p)", dli);
+
+ dli->dl_hlist.next = LIST_POISON1;
-+ dli->dl_xid = -1;
++ dli->dl_tag = -1;
+ dli->dl_sb = 0;
+
+ BUG_ON(atomic_read(&dli->dl_usecnt));
@@ -15677,9 +19979,9 @@
+static spinlock_t dl_info_hash_lock = SPIN_LOCK_UNLOCKED;
+
+
-+static inline unsigned int __hashval(struct super_block *sb, xid_t xid)
++static inline unsigned int __hashval(struct super_block *sb, tag_t tag)
+{
-+ return ((xid ^ (unsigned long)sb) % DL_HASH_SIZE);
++ return ((tag ^ (unsigned long)sb) % DL_HASH_SIZE);
+}
+
+
@@ -15694,9 +19996,9 @@
+ struct hlist_head *head;
+
+ vxdprintk(VXD_CBIT(dlim, 6),
-+ "__hash_dl_info: %p[#%d]", dli, dli->dl_xid);
++ "__hash_dl_info: %p[#%d]", dli, dli->dl_tag);
+ get_dl_info(dli);
-+ head = &dl_info_hash[__hashval(dli->dl_sb, dli->dl_xid)];
++ head = &dl_info_hash[__hashval(dli->dl_sb, dli->dl_tag)];
+ hlist_add_head_rcu(&dli->dl_hlist, head);
+}
+
@@ -15708,7 +20010,7 @@
+static inline void __unhash_dl_info(struct dl_info *dli)
+{
+ vxdprintk(VXD_CBIT(dlim, 6),
-+ "__unhash_dl_info: %p[#%d]", dli, dli->dl_xid);
++ "__unhash_dl_info: %p[#%d]", dli, dli->dl_tag);
+ hlist_del_rcu(&dli->dl_hlist);
+ put_dl_info(dli);
+}
@@ -15719,15 +20021,15 @@
+ * requires the rcu_read_lock()
+ * doesn't increment the dl_refcnt */
+
-+static inline struct dl_info *__lookup_dl_info(struct super_block *sb, xid_t xid)
++static inline struct dl_info *__lookup_dl_info(struct super_block *sb, tag_t tag)
+{
-+ struct hlist_head *head = &dl_info_hash[__hashval(sb, xid)];
++ struct hlist_head *head = &dl_info_hash[__hashval(sb, tag)];
+ struct hlist_node *pos;
+ struct dl_info *dli;
+
+ hlist_for_each_entry_rcu(dli, pos, head, dl_hlist) {
+
-+ if (dli->dl_xid == xid && dli->dl_sb == sb) {
++ if (dli->dl_tag == tag && dli->dl_sb == sb) {
+ return dli;
+ }
+ }
@@ -15735,14 +20037,14 @@
+}
+
+
-+struct dl_info *locate_dl_info(struct super_block *sb, xid_t xid)
++struct dl_info *locate_dl_info(struct super_block *sb, tag_t tag)
+{
+ struct dl_info *dli;
+
+ rcu_read_lock();
-+ dli = get_dl_info(__lookup_dl_info(sb, xid));
++ dli = get_dl_info(__lookup_dl_info(sb, tag));
+ vxdprintk(VXD_CBIT(dlim, 7),
-+ "locate_dl_info(%p,#%d) = %p", sb, xid, dli);
++ "locate_dl_info(%p,#%d) = %p", sb, tag, dli);
+ rcu_read_unlock();
+ return dli;
+}
@@ -15821,8 +20123,6 @@
+{
+ struct vcmd_ctx_dlimit_base_v0 vc_data;
+
-+ if (!vx_check(0, VX_ADMIN))
-+ return -ENOSYS;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
@@ -15833,8 +20133,6 @@
+{
+ struct vcmd_ctx_dlimit_base_v0 vc_data;
+
-+ if (!vx_check(0, VX_ADMIN))
-+ return -ENOSYS;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
@@ -15847,8 +20145,6 @@
+{
+ struct vcmd_ctx_dlimit_base_v0_x32 vc_data;
+
-+ if (!vx_check(0, VX_ADMIN))
-+ return -ENOSYS;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
@@ -15860,8 +20156,6 @@
+{
+ struct vcmd_ctx_dlimit_base_v0_x32 vc_data;
+
-+ if (!vx_check(0, VX_ADMIN))
-+ return -ENOSYS;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
@@ -15891,11 +20185,11 @@
+ goto out_release;
+ if (!(sb = nd.dentry->d_inode->i_sb))
+ goto out_release;
-+ if ((reserved != (uint32_t)CDLIM_KEEP &&
++ if ((reserved != CDLIM_KEEP &&
+ reserved > 100) ||
-+ (inodes_used != (uint32_t)CDLIM_KEEP &&
++ (inodes_used != CDLIM_KEEP &&
+ inodes_used > inodes_total) ||
-+ (space_used != (uint32_t)CDLIM_KEEP &&
++ (space_used != CDLIM_KEEP &&
+ space_used > space_total))
+ goto out_release;
+
@@ -15906,21 +20200,21 @@
+
+ spin_lock(&dli->dl_lock);
+
-+ if (inodes_used != (uint32_t)CDLIM_KEEP)
++ if (inodes_used != CDLIM_KEEP)
+ dli->dl_inodes_used = inodes_used;
-+ if (inodes_total != (uint32_t)CDLIM_KEEP)
++ if (inodes_total != CDLIM_KEEP)
+ dli->dl_inodes_total = inodes_total;
-+ if (space_used != (uint32_t)CDLIM_KEEP) {
++ if (space_used != CDLIM_KEEP) {
+ dli->dl_space_used = space_used;
+ dli->dl_space_used <<= 10;
+ }
-+ if (space_total == (uint32_t)CDLIM_INFINITY)
-+ dli->dl_space_total = (uint64_t)CDLIM_INFINITY;
-+ else if (space_total != (uint32_t)CDLIM_KEEP) {
++ 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;
+ }
-+ if (reserved != (uint32_t)CDLIM_KEEP)
++ if (reserved != CDLIM_KEEP)
+ dli->dl_nrlmult = (1 << 10) * (100 - reserved) / 100;
+
+ spin_unlock(&dli->dl_lock);
@@ -15938,8 +20232,6 @@
+{
+ struct vcmd_ctx_dlimit_v0 vc_data;
+
-+ if (!vx_check(0, VX_ADMIN))
-+ return -ENOSYS;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
@@ -15955,8 +20247,6 @@
+{
+ struct vcmd_ctx_dlimit_v0_x32 vc_data;
+
-+ if (!vx_check(0, VX_ADMIN))
-+ return -ENOSYS;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
@@ -15998,8 +20288,8 @@
+ *inodes_used = dli->dl_inodes_used;
+ *inodes_total = dli->dl_inodes_total;
+ *space_used = dli->dl_space_used >> 10;
-+ if (dli->dl_space_total == (uint64_t)CDLIM_INFINITY)
-+ *space_total = (uint32_t)CDLIM_INFINITY;
++ if (dli->dl_space_total == DLIM_INFINITY)
++ *space_total = CDLIM_INFINITY;
+ else
+ *space_total = dli->dl_space_total >> 10;
+
@@ -16022,8 +20312,6 @@
+ struct vcmd_ctx_dlimit_v0 vc_data;
+ int ret;
+
-+ if (!vx_check(0, VX_ADMIN))
-+ return -ENOSYS;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
@@ -16046,8 +20334,6 @@
+ struct vcmd_ctx_dlimit_v0_x32 vc_data;
+ int ret;
+
-+ if (!vx_check(0, VX_ADMIN))
-+ return -ENOSYS;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
@@ -16072,31 +20358,25 @@
+ __u64 blimit, bfree, bavail;
+ __u32 ifree;
+
-+ dli = locate_dl_info(sb, vx_current_xid());
++ dli = locate_dl_info(sb, dx_current_tag());
+ if (!dli)
+ return;
+
+ spin_lock(&dli->dl_lock);
-+ if (dli->dl_inodes_total == (uint32_t)CDLIM_INFINITY)
++ if (dli->dl_inodes_total == (unsigned long)DLIM_INFINITY)
+ goto no_ilim;
+
+ /* reduce max inodes available to limit */
+ if (buf->f_files > dli->dl_inodes_total)
+ buf->f_files = dli->dl_inodes_total;
+
-+ /* inode hack for reiserfs */
-+ if ((buf->f_files == 0) && (dli->dl_inodes_total > 0)) {
-+ buf->f_files = dli->dl_inodes_total;
-+ buf->f_ffree = dli->dl_inodes_total;
-+ }
-+
+ ifree = dli->dl_inodes_total - dli->dl_inodes_used;
+ /* reduce free inodes to min */
+ if (ifree < buf->f_ffree)
+ buf->f_ffree = ifree;
+
+no_ilim:
-+ if (dli->dl_space_total == (uint64_t)CDLIM_INFINITY)
++ if (dli->dl_space_total == DLIM_INFINITY)
+ goto no_blim;
+
+ blimit = dli->dl_space_total >> sb->s_blocksize_bits;
@@ -16138,9 +20418,9 @@
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
---- linux-2.6.18.5/kernel/vserver/helper.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/helper.c 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,210 @@
+--- linux-2.6.20/kernel/vserver/helper.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/helper.c 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,208 @@
+/*
+ * linux/kernel/vserver/helper.c
+ *
@@ -16249,7 +20529,7 @@
+}
+
+
-+long vs_reboot(unsigned int cmd, void __user *arg)
++long vs_reboot(unsigned int cmd, void __user * arg)
+{
+ struct vx_info *vxi = current->vx_info;
+ long ret = 0;
@@ -16310,8 +20590,7 @@
+ return 0;
+ }
+
-+ do_vshelper(vshelper_path, argv, envp, 1);
-+ return 0;
++ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
+
@@ -16347,13 +20626,12 @@
+ return 0;
+ }
+
-+ do_vshelper(vshelper_path, argv, envp, 1);
-+ return 0;
++ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
---- linux-2.6.18.5/kernel/vserver/history.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/history.c 2006-11-06 05:08:58 +0100
-@@ -0,0 +1,183 @@
+--- linux-2.6.20/kernel/vserver/history.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/history.c 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,264 @@
+/*
+ * kernel/vserver/history.c
+ *
@@ -16376,7 +20654,10 @@
+#include <asm/atomic.h>
+#include <asm/unistd.h>
+
++#include <linux/vserver/context.h>
+#include <linux/vserver/debug.h>
++#include <linux/vserver/debug_cmd.h>
++#include <linux/vserver/history.h>
+
+
+#ifdef CONFIG_VSERVER_HISTORY
@@ -16418,6 +20699,8 @@
+ return entry;
+}
+
++EXPORT_SYMBOL_GPL(vxh_advance);
++
+
+#define VXH_LOC_FMTS "(#%04x,*%d):%p"
+
@@ -16526,7 +20809,7 @@
+/* vserver syscall commands below here */
+
+
-+int vc_dump_history(uint32_t id)
++int vc_dump_history(uint32_t id)
+{
+ vxh_active = 0;
+ __vxh_dump_history();
@@ -16535,11 +20818,87 @@
+ return 0;
+}
+
-+EXPORT_SYMBOL_GPL(vxh_advance);
+
---- linux-2.6.18.5/kernel/vserver/init.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/init.c 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,43 @@
++int do_read_history(struct __user _vx_hist_entry *data,
++ int cpu, uint32_t *index, uint32_t *count)
++{
++ int pos, ret = 0;
++ struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu);
++ int end = hist->counter;
++ int start = end - VXH_SIZE + 2;
++ int idx = *index;
++
++ /* special case: get current pos */
++ if (!*count) {
++ *index = end;
++ return 0;
++ }
++
++ /* have we lost some data? */
++ if (idx < start)
++ idx = start;
++
++ for (pos = 0; (pos < *count) && (idx < end); pos++, idx++) {
++ struct _vx_hist_entry *entry =
++ &hist->entry[idx % VXH_SIZE];
++
++ /* send entry to userspace */
++ ret = copy_to_user (&data[pos], entry, sizeof(*entry));
++ if (ret)
++ break;
++ }
++ /* save new index and count */
++ *index = idx;
++ *count = pos;
++ return ret ? ret : (*index < end);
++}
++
++int vc_read_history(uint32_t id, void __user *data)
++{
++ struct vcmd_read_history_v0 vc_data;
++ int ret;
++
++ if (id >= NR_CPUS)
++ return -EINVAL;
++
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ ret = do_read_history((struct __user _vx_hist_entry *)vc_data.data,
++ id, &vc_data.index, &vc_data.count);
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return ret;
++}
++
++#ifdef CONFIG_COMPAT
++
++int vc_read_history_x32(uint32_t id, void __user *data)
++{
++ struct vcmd_read_history_v0_x32 vc_data;
++ int ret;
++
++ if (id >= NR_CPUS)
++ return -EINVAL;
++
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ ret = do_read_history((struct __user _vx_hist_entry *)
++ compat_ptr(vc_data.data_ptr),
++ id, &vc_data.index, &vc_data.count);
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return ret;
++}
++
++#endif /* CONFIG_COMPAT */
++
+--- linux-2.6.20/kernel/vserver/init.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/init.c 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,47 @@
+/*
+ * linux/kernel/init.c
+ *
@@ -16579,13 +20938,17 @@
+ return;
+}
+
++/* FIXME: GFP_ZONETYPES gone
++long vx_slab[GFP_ZONETYPES]; */
++long vx_area;
++
+
+module_init(init_vserver);
+module_exit(exit_vserver);
+
---- linux-2.6.18.5/kernel/vserver/inode.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/inode.c 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,368 @@
+--- linux-2.6.20/kernel/vserver/inode.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/inode.c 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,369 @@
+/*
+ * linux/kernel/vserver/inode.c
+ *
@@ -16598,7 +20961,6 @@
+ */
+
+#include <linux/sched.h>
-+#include <linux/vs_context.h>
+#include <linux/proc_fs.h>
+#include <linux/devpts_fs.h>
+#include <linux/namei.h>
@@ -16607,20 +20969,21 @@
+#include <linux/compat.h>
+#include <linux/vserver/inode.h>
+#include <linux/vserver/inode_cmd.h>
-+#include <linux/vserver/xid.h>
++#include <linux/vs_base.h>
++#include <linux/vs_tag.h>
+
+#include <asm/errno.h>
+#include <asm/uaccess.h>
+
+
-+static int __vc_get_iattr(struct inode *in, uint32_t *xid, uint32_t *flags, uint32_t *mask)
++static int __vc_get_iattr(struct inode *in, uint32_t *tag, uint32_t *flags, uint32_t *mask)
+{
+ struct proc_dir_entry *entry;
+
+ if (!in || !in->i_sb)
+ return -ESRCH;
+
-+ *flags = IATTR_XID
++ *flags = IATTR_TAG
+ | (IS_BARRIER(in) ? IATTR_BARRIER : 0)
+ | (IS_IUNLINK(in) ? IATTR_IUNLINK : 0)
+ | (IS_IMMUTABLE(in) ? IATTR_IMMUTABLE : 0);
@@ -16629,9 +20992,9 @@
+ if (S_ISDIR(in->i_mode))
+ *mask |= IATTR_BARRIER;
+
-+ if (IS_TAGXID(in)) {
-+ *xid = in->i_xid;
-+ *mask |= IATTR_XID;
++ if (IS_TAGGED(in)) {
++ *tag = in->i_tag;
++ *mask |= IATTR_TAG;
+ }
+
+ switch (in->i_sb->s_magic) {
@@ -16648,8 +21011,8 @@
+ break;
+
+ case DEVPTS_SUPER_MAGIC:
-+ *xid = in->i_xid;
-+ *mask |= IATTR_XID;
++ *tag = in->i_tag;
++ *mask |= IATTR_TAG;
+ break;
+
+ default:
@@ -16664,8 +21027,6 @@
+ struct vcmd_ctx_iattr_v1 vc_data = { .xid = -1 };
+ int ret;
+
-+ if (!vx_check(0, VX_ADMIN))
-+ return -ENOSYS;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
@@ -16691,7 +21052,7 @@
+ struct vcmd_ctx_iattr_v1_x32 vc_data = { .xid = -1 };
+ int ret;
+
-+ if (!vx_check(0, VX_ADMIN))
++ if (!vx_check(0, VS_ADMIN))
+ return -ENOSYS;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
@@ -16713,10 +21074,10 @@
+#endif /* CONFIG_COMPAT */
+
+
-+static int __vc_set_iattr(struct dentry *de, uint32_t *xid, uint32_t *flags, uint32_t *mask)
++static int __vc_set_iattr(struct dentry *de, uint32_t *tag, uint32_t *flags, uint32_t *mask)
+{
+ struct inode *in = de->d_inode;
-+ int error = 0, is_proc = 0, has_xid = 0;
++ int error = 0, is_proc = 0, has_tag = 0;
+ struct iattr attr = { 0 };
+
+ if (!in || !in->i_sb)
@@ -16726,15 +21087,15 @@
+ if ((*mask & IATTR_FLAGS) && !is_proc)
+ return -EINVAL;
+
-+ has_xid = IS_TAGXID(in) ||
++ has_tag = IS_TAGGED(in) ||
+ (in->i_sb->s_magic == DEVPTS_SUPER_MAGIC);
-+ if ((*mask & IATTR_XID) && !has_xid)
++ if ((*mask & IATTR_TAG) && !has_tag)
+ return -EINVAL;
+
+ mutex_lock(&in->i_mutex);
-+ if (*mask & IATTR_XID) {
-+ attr.ia_xid = *xid;
-+ attr.ia_valid |= ATTR_XID;
++ if (*mask & IATTR_TAG) {
++ attr.ia_tag = *tag;
++ attr.ia_valid |= ATTR_TAG;
+ }
+
+ if (*mask & IATTR_FLAGS) {
@@ -16795,7 +21156,7 @@
+ struct vcmd_ctx_iattr_v1 vc_data;
+ int ret;
+
-+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_LINUX_IMMUTABLE))
++ if (!capable(CAP_LINUX_IMMUTABLE))
+ return -EPERM;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
@@ -16820,7 +21181,7 @@
+ struct vcmd_ctx_iattr_v1_x32 vc_data;
+ int ret;
+
-+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_LINUX_IMMUTABLE))
++ if (!capable(CAP_LINUX_IMMUTABLE))
+ return -EPERM;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
@@ -16886,13 +21247,14 @@
+ }
+ return error;
+}
-+#endif
++#endif /* CONFIG_VSERVER_LEGACY */
+
++#ifdef CONFIG_PROPAGATE
+
-+int vx_parse_xid(char *string, xid_t *xid, int remove)
++int dx_parse_tag(char *string, tag_t *tag, int remove)
+{
+ static match_table_t tokens = {
-+ {1, "xid=%u"},
++ {1, "tagid=%u"},
+ {0, NULL}
+ };
+ substring_t args[MAX_OPT_ARGS];
@@ -16902,15 +21264,15 @@
+ return 0;
+
+ token = match_token(string, tokens, args);
-+ if (token && xid && !match_int(args, &option))
-+ *xid = option;
++ if (token && tag && !match_int(args, &option))
++ *tag = option;
+
-+ vxdprintk(VXD_CBIT(xid, 7),
-+ "vx_parse_xid(»%s«): %d:#%d",
++ vxdprintk(VXD_CBIT(tag, 7),
++ "dx_parse_tag(»%s«): %d:#%d",
+ string, token, option);
+
-+ if (token && remove) {
-+ char *p = strstr(string, "xid=");
++ if ((token == 1) && remove) {
++ char *p = strstr(string, "tagid=");
+ char *q = p;
+
+ if (p) {
@@ -16925,9 +21287,9 @@
+ return token;
+}
+
-+void vx_propagate_xid(struct nameidata *nd, struct inode *inode)
++void __dx_propagate_tag(struct nameidata *nd, struct inode *inode)
+{
-+ xid_t new_xid = 0;
++ tag_t new_tag = 0;
+ struct vfsmount *mnt;
+ int propagate;
+
@@ -16937,35 +21299,38 @@
+ if (!mnt)
+ return;
+
-+ propagate = (mnt->mnt_flags & MNT_XID);
++ propagate = (mnt->mnt_flags & MNT_TAGID);
+ if (propagate)
-+ new_xid = mnt->mnt_xid;
++ new_tag = mnt->mnt_tag;
+
-+ vxdprintk(VXD_CBIT(xid, 7),
-+ "vx_propagate_xid(%p[#%lu.%d]): %d,%d",
-+ inode, inode->i_ino, inode->i_xid,
-+ new_xid, (propagate)?1:0);
++ 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_xid = new_xid;
++ inode->i_tag = new_tag;
+}
+
+#include <linux/module.h>
+
-+EXPORT_SYMBOL_GPL(vx_propagate_xid);
++EXPORT_SYMBOL_GPL(__dx_propagate_tag);
++
++#endif /* CONFIG_PROPAGATE */
+
---- linux-2.6.18.5/kernel/vserver/legacy.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/legacy.c 2006-11-23 17:15:51 +0100
-@@ -0,0 +1,111 @@
+--- linux-2.6.20/kernel/vserver/legacy.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/legacy.c 2007-02-06 05:54:40 +0100
+@@ -0,0 +1,115 @@
+/*
+ * linux/kernel/vserver/legacy.c
+ *
+ * Virtual Server: Legacy Funtions
+ *
+ * Copyright (C) 2001-2003 Jacques Gelinas
-+ * Copyright (C) 2003-2005 Herbert Pötzl
++ * Copyright (C) 2003-2006 Herbert Pötzl
+ *
+ * V0.01 broken out from vcontext.c V0.05
++ * V0.02 updated to spaces *sigh*
+ *
+ */
+
@@ -16973,8 +21338,8 @@
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vserver/legacy.h>
-+#include <linux/vserver/namespace.h>
-+#include <linux/namespace.h>
++#include <linux/vserver/space.h>
++// #include <linux/mnt_namespace.h>
+
+#include <asm/errno.h>
+#include <asm/uaccess.h>
@@ -17018,7 +21383,9 @@
+ return ret;
+ }
+
-+ if (!vx_check(0, VX_ADMIN) || !capable(CAP_SYS_ADMIN))
++ if (!vx_check(0, VS_ADMIN) || !capable(CAP_SYS_ADMIN)
++ /* might make sense in the future, or not ... */
++ || vx_flags(VX_INFO_PRIVATE, 0))
+ return -EPERM;
+
+ /* ugly hack for Spectator */
@@ -17046,18 +21413,19 @@
+
+ new_vxi->vx_flags &= ~VXF_STATE_SETUP;
+
-+ ret = vx_migrate_task(current, new_vxi);
++ ret = vx_migrate_task(current, new_vxi, 1);
+ if (ret == 0) {
+ current->vx_info->vx_bcaps &= (~vc_data.remove_cap);
+ new_vxi->vx_flags |= vc_data.flags;
+ if (vc_data.flags & VX_INFO_INIT)
+ vx_set_initpid(new_vxi, current->tgid);
++ /* FIXME: nsproxy
+ if (vc_data.flags & VX_INFO_NAMESPACE)
+ vx_set_namespace(new_vxi,
-+ current->namespace, current->fs);
++ current->namespace, current->fs); */
+ if (vc_data.flags & VX_INFO_NPROC)
-+ new_vxi->limit.rlim[RLIMIT_NPROC] =
-+ current->signal->rlim[RLIMIT_NPROC].rlim_max;
++ __rlim_set(&new_vxi->limit, RLIMIT_NPROC,
++ current->signal->rlim[RLIMIT_NPROC].rlim_max);
+
+ /* tweak some defaults for legacy */
+ new_vxi->vx_flags |= (VXF_HIDE_NETIF|VXF_INFO_INIT);
@@ -17068,9 +21436,9 @@
+ return ret;
+}
+
---- linux-2.6.18.5/kernel/vserver/legacynet.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/legacynet.c 2006-11-23 16:37:07 +0100
-@@ -0,0 +1,85 @@
+--- linux-2.6.20/kernel/vserver/legacynet.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/legacynet.c 2007-02-06 05:54:33 +0100
+@@ -0,0 +1,84 @@
+
+/*
+ * linux/kernel/vserver/legacynet.c
@@ -17088,7 +21456,7 @@
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vserver/legacy.h>
-+#include <linux/namespace.h>
++// #include <linux/mnt_namespace.h>
+#include <linux/err.h>
+
+#include <asm/errno.h>
@@ -17150,15 +21518,14 @@
+ printk("!!! switching nx_info %p->%p\n", nxi, new_nxi);
+
+ nx_migrate_task(current, new_nxi);
-+ release_nx_info(new_nxi, NULL);
+ put_nx_info(new_nxi);
+ return 0;
+}
+
+
---- linux-2.6.18.5/kernel/vserver/limit.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/limit.c 2006-11-21 02:50:26 +0100
-@@ -0,0 +1,233 @@
+--- linux-2.6.20/kernel/vserver/limit.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/limit.c 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,319 @@
+/*
+ * linux/kernel/vserver/limit.c
+ *
@@ -17167,7 +21534,7 @@
+ * Copyright (C) 2004-2006 Herbert Pötzl
+ *
+ * V0.01 broken out from vcontext V0.05
-+ * V0.02 sync to valid limit check from 2.1.1
++ * V0.02 changed vcmds to vxi arg
+ *
+ */
+
@@ -17197,11 +21564,11 @@
+ [VLIMIT_OPENFD] = "OPENFD",
+ [VLIMIT_ANON] = "ANON",
+ [VLIMIT_SHMEM] = "SHMEM",
++ [VLIMIT_DENTRY] = "DENTRY",
+};
+
+EXPORT_SYMBOL_GPL(vlimit_name);
+
-+
+#define MASK_ENTRY(x) (1 << (x))
+
+const struct vcmd_ctx_rlimit_mask_v0 vlimit_mask = {
@@ -17224,50 +21591,60 @@
+ MASK_ENTRY( VLIMIT_OPENFD ) |
+ MASK_ENTRY( VLIMIT_ANON ) |
+ MASK_ENTRY( VLIMIT_SHMEM ) |
++ MASK_ENTRY( VLIMIT_DENTRY ) |
+ 0
+};
++ /* accounting only */
++uint32_t account_mask =
++ MASK_ENTRY( VLIMIT_SEMARY ) |
++ MASK_ENTRY( VLIMIT_NSEMS ) |
++ MASK_ENTRY( VLIMIT_MAPPED ) |
++ 0;
++
++
++static int is_valid_vlimit(int id)
++{
++ uint32_t mask = vlimit_mask.minimum |
++ vlimit_mask.softlimit | vlimit_mask.maximum;
++ return mask & (1 << id);
++}
++
++static int is_accounted_vlimit(int id)
++{
++ if (is_valid_vlimit(id))
++ return 1;
++ return account_mask & (1 << id);
++}
+
+
-+static int is_valid_vlimit(int id)
++static inline uint64_t vc_get_soft(struct vx_info *vxi, int id)
+{
-+ uint32_t mask = vlimit_mask.minimum |
-+ vlimit_mask.softlimit | vlimit_mask.maximum;
-+ return mask & (1 << id);
++ rlim_t limit = __rlim_soft(&vxi->limit, id);
++ return VX_VLIM(limit);
+}
+
-+static inline uint64_t vc_get_rlim(struct vx_info *vxi, int id)
++static inline uint64_t vc_get_hard(struct vx_info *vxi, int id)
+{
-+ unsigned long limit;
-+
-+ limit = vxi->limit.rlim[id];
-+ if (limit == RLIM_INFINITY)
-+ return CRLIM_INFINITY;
-+ return limit;
++ rlim_t limit = __rlim_hard(&vxi->limit, id);
++ return VX_VLIM(limit);
+}
+
-+static int do_get_rlimit(xid_t xid, uint32_t id,
++static int do_get_rlimit(struct vx_info *vxi, uint32_t id,
+ uint64_t *minimum, uint64_t *softlimit, uint64_t *maximum)
+{
-+ struct vx_info *vxi;
-+
+ if (!is_valid_vlimit(id))
+ return -EINVAL;
+
-+ vxi = lookup_vx_info(xid);
-+ if (!vxi)
-+ return -ESRCH;
-+
+ if (minimum)
+ *minimum = CRLIM_UNSET;
+ if (softlimit)
-+ *softlimit = CRLIM_UNSET;
++ *softlimit = vc_get_soft(vxi, id);
+ if (maximum)
-+ *maximum = vc_get_rlim(vxi, id);
-+ put_vx_info(vxi);
++ *maximum = vc_get_hard(vxi, id);
+ return 0;
+}
+
-+int vc_get_rlimit(uint32_t id, void __user *data)
++int vc_get_rlimit(struct vx_info *vxi, void __user *data)
+{
+ struct vcmd_ctx_rlimit_v0 vc_data;
+ int ret;
@@ -17275,7 +21652,7 @@
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ ret = do_get_rlimit(id, vc_data.id,
++ ret = do_get_rlimit(vxi, vc_data.id,
+ &vc_data.minimum, &vc_data.softlimit, &vc_data.maximum);
+ if (ret)
+ return ret;
@@ -17285,54 +21662,49 @@
+ return 0;
+}
+
-+static int do_set_rlimit(xid_t xid, uint32_t id,
++static int do_set_rlimit(struct vx_info *vxi, uint32_t id,
+ uint64_t minimum, uint64_t softlimit, uint64_t maximum)
+{
-+ struct vx_info *vxi;
-+
+ if (!is_valid_vlimit(id))
+ return -EINVAL;
+
-+ vxi = lookup_vx_info(xid);
-+ if (!vxi)
-+ return -ESRCH;
-+
+ if (maximum != CRLIM_KEEP)
-+ vxi->limit.rlim[id] = maximum;
++ __rlim_hard(&vxi->limit, id) = VX_RLIM(maximum);
++ if (softlimit != CRLIM_KEEP)
++ __rlim_soft(&vxi->limit, id) = VX_RLIM(softlimit);
++
++ /* clamp soft limit */
++ if (__rlim_soft(&vxi->limit, id) > __rlim_hard(&vxi->limit, id))
++ __rlim_soft(&vxi->limit, id) = __rlim_hard(&vxi->limit, id);
+
-+ put_vx_info(vxi);
+ return 0;
+}
+
-+int vc_set_rlimit(uint32_t id, void __user *data)
++int vc_set_rlimit(struct vx_info *vxi, void __user *data)
+{
+ struct vcmd_ctx_rlimit_v0 vc_data;
+
-+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RESOURCE))
-+ return -EPERM;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ return do_set_rlimit(id, vc_data.id,
++ return do_set_rlimit(vxi, vc_data.id,
+ vc_data.minimum, vc_data.softlimit, vc_data.maximum);
+}
+
+#ifdef CONFIG_IA32_EMULATION
+
-+int vc_set_rlimit_x32(uint32_t id, void __user *data)
++int vc_set_rlimit_x32(struct vx_info *vxi, void __user *data)
+{
+ struct vcmd_ctx_rlimit_v0_x32 vc_data;
+
-+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RESOURCE))
-+ return -EPERM;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ return do_set_rlimit(id, vc_data.id,
++ return do_set_rlimit(vxi, vc_data.id,
+ vc_data.minimum, vc_data.softlimit, vc_data.maximum);
+}
+
-+int vc_get_rlimit_x32(uint32_t id, void __user *data)
++int vc_get_rlimit_x32(struct vx_info *vxi, void __user *data)
+{
+ struct vcmd_ctx_rlimit_v0_x32 vc_data;
+ int ret;
@@ -17340,7 +21712,7 @@
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ ret = do_get_rlimit(id, vc_data.id,
++ ret = do_get_rlimit(vxi, vc_data.id,
+ &vc_data.minimum, &vc_data.softlimit, &vc_data.maximum);
+ if (ret)
+ return ret;
@@ -17361,16 +21733,67 @@
+}
+
+
++static inline void vx_reset_minmax(struct _vx_limit *limit)
++{
++ rlim_t value;
++ int lim;
++
++ for (lim=0; lim<NUM_LIMITS; lim++) {
++ value = __rlim_get(limit, lim);
++ __rlim_rmax(limit, lim) = value;
++ __rlim_rmin(limit, lim) = value;
++ }
++}
++
++
++int vc_reset_minmax(struct vx_info *vxi, void __user *data)
++{
++ vx_reset_minmax(&vxi->limit);
++ return 0;
++}
++
++
++int vc_rlimit_stat(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_rlimit_stat_v0 vc_data;
++ struct _vx_limit *limit = &vxi->limit;
++ int id;
++
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ id = vc_data.id;
++ if (!is_accounted_vlimit(id))
++ return -EINVAL;
++
++ vx_limit_fixup(limit, id);
++ vc_data.hits = atomic_read(&__rlim_lhit(limit, id));
++ vc_data.value = __rlim_get(limit, id);
++ vc_data.minimum = __rlim_rmin(limit, id);
++ vc_data.maximum = __rlim_rmax(limit, id);
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return 0;
++}
++
++
+void vx_vsi_meminfo(struct sysinfo *val)
+{
+ struct vx_info *vxi = current->vx_info;
-+ unsigned long v;
++ unsigned long totalram, freeram;
++ rlim_t v;
++
++ /* we blindly accept the max */
++ v = __rlim_soft(&vxi->limit, RLIMIT_RSS);
++ totalram = (v != RLIM_INFINITY) ? v : val->totalram;
++
++ /* total minus used equals free */
++ v = __vx_cres_array_fixup(&vxi->limit, VLA_RSS);
++ freeram = (v < totalram) ? totalram - v : 0;
+
-+ v = vxi->limit.rlim[RLIMIT_RSS];
-+ if (v != RLIM_INFINITY)
-+ val->totalram = min(val->totalram, v);
-+ v = atomic_read(&vxi->limit.rcur[RLIMIT_RSS]);
-+ val->freeram = (v < val->totalram) ? val->totalram - v : 0;
++ val->totalram = totalram;
++ val->freeram = freeram;
+ val->bufferram = 0;
+ val->totalhigh = 0;
+ val->freehigh = 0;
@@ -17380,21 +21803,51 @@
+void vx_vsi_swapinfo(struct sysinfo *val)
+{
+ struct vx_info *vxi = current->vx_info;
-+ unsigned long v, w;
++ unsigned long totalswap, freeswap;
++ rlim_t v, w;
++
++ v = __rlim_soft(&vxi->limit, RLIMIT_RSS);
++ if (v == RLIM_INFINITY) {
++ val->freeswap = val->totalswap;
++ return;
++ }
++
++ /* we blindly accept the max */
++ w = __rlim_hard(&vxi->limit, RLIMIT_RSS);
++ totalswap = (w != RLIM_INFINITY) ? (w - v) : val->totalswap;
++
++ /* currently 'used' swap */
++ w = __vx_cres_array_fixup(&vxi->limit, VLA_RSS);
++ w -= (w > v) ? v : w;
+
-+ v = vxi->limit.rlim[RLIMIT_RSS];
-+ w = vxi->limit.rlim[RLIMIT_AS];
-+ if (w != RLIM_INFINITY)
-+ val->totalswap = min(val->totalswap, w -
-+ ((v != RLIM_INFINITY) ? v : 0));
-+ w = atomic_read(&vxi->limit.rcur[RLIMIT_AS]);
-+ val->freeswap = (w < val->totalswap) ? val->totalswap - w : 0;
++ /* total minus used equals free */
++ freeswap = (w < totalswap) ? totalswap - w : 0;
++
++ val->totalswap = totalswap;
++ val->freeswap = freeswap;
+ return;
+}
+
---- linux-2.6.18.5/kernel/vserver/limit_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/limit_init.h 2006-10-29 05:06:18 +0100
-@@ -0,0 +1,29 @@
++
++unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm)
++{
++ struct vx_info *vxi = mm->mm_vx_info;
++ unsigned long points;
++ rlim_t v, w;
++
++ if (!vxi)
++ return 0;
++
++ v = __vx_cres_array_fixup(&vxi->limit, VLA_RSS);
++ w = __rlim_soft(&vxi->limit, RLIMIT_RSS);
++ points = (v > w) ? (v - w) : 0;
++
++ return points;
++}
++
+--- linux-2.6.20/kernel/vserver/limit_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/limit_init.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,33 @@
+
+
+static inline void vx_info_init_limit(struct _vx_limit *limit)
@@ -17402,208 +21855,241 @@
+ int lim;
+
+ for (lim=0; lim<NUM_LIMITS; lim++) {
-+ limit->rlim[lim] = RLIM_INFINITY;
-+ limit->rmax[lim] = 0;
-+ atomic_set(&limit->rcur[lim], 0);
-+ atomic_set(&limit->lhit[lim], 0);
++ __rlim_soft(limit, lim) = RLIM_INFINITY;
++ __rlim_hard(limit, lim) = RLIM_INFINITY;
++ __rlim_set(limit, lim, 0);
++ atomic_set(&__rlim_lhit(limit, lim), 0);
++ __rlim_rmin(limit, lim) = 0;
++ __rlim_rmax(limit, lim) = 0;
+ }
+}
+
+static inline void vx_info_exit_limit(struct _vx_limit *limit)
+{
+#ifdef CONFIG_VSERVER_DEBUG
-+ unsigned long value;
-+ unsigned int lim;
++ rlim_t value;
++ int lim;
+
+ for (lim=0; lim<NUM_LIMITS; lim++) {
-+ value = atomic_read(&limit->rcur[lim]);
++ if ((1 << lim) & VLIM_NOCHECK)
++ continue;
++ value = __rlim_get(limit, lim);
+ vxwprintk(value,
+ "!!! limit: %p[%s,%d] = %ld on exit.",
-+ limit, vlimit_name[lim], lim, value);
++ limit, vlimit_name[lim], lim, (long)value);
+ }
+#endif
+}
+
---- linux-2.6.18.5/kernel/vserver/limit_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/limit_proc.h 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/kernel/vserver/limit_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/limit_proc.h 2007-02-06 03:05:22 +0100
@@ -0,0 +1,58 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
+
++#include <linux/vserver/limit_int.h>
+
-+static inline void vx_limit_fixup(struct _vx_limit *limit)
-+{
-+ unsigned long value;
-+ unsigned int lim;
-+
-+ for (lim=0; lim<NUM_LIMITS; lim++) {
-+ value = atomic_read(&limit->rcur[lim]);
-+ if (value > limit->rmax[lim])
-+ limit->rmax[lim] = value;
-+ if (limit->rmax[lim] > limit->rlim[lim])
-+ limit->rmax[lim] = limit->rlim[lim];
-+ }
-+}
+
-+#define VX_LIMIT_FMT ":\t%10d\t%10ld\t%10ld\t%6d\n"
++#define VX_LIMIT_FMT ":\t%8ld\t%8ld/%8ld\t%8lld/%8lld\t%6d\n"
++#define VX_LIMIT_TOP \
++ "Limit\t current\t min/max\t\t soft/hard\t\thits\n"
+
+#define VX_LIMIT_ARG(r) \
-+ ,atomic_read(&limit->rcur[r]) \
-+ ,limit->rmax[r] \
-+ ,limit->rlim[r] \
-+ ,atomic_read(&limit->lhit[r])
++ ,(unsigned long)__rlim_get(limit, r) \
++ ,(unsigned long)__rlim_rmin(limit, r) \
++ ,(unsigned long)__rlim_rmax(limit, r) \
++ ,VX_VLIM(__rlim_soft(limit, r)) \
++ ,VX_VLIM(__rlim_hard(limit, r)) \
++ ,atomic_read(&__rlim_lhit(limit, r))
+
+static inline int vx_info_proc_limit(struct _vx_limit *limit, char *buffer)
+{
-+ vx_limit_fixup(limit);
-+ return sprintf(buffer,
++ vx_limit_fixup(limit, -1);
++ return sprintf(buffer, VX_LIMIT_TOP
+ "PROC" VX_LIMIT_FMT
+ "VM" VX_LIMIT_FMT
+ "VML" VX_LIMIT_FMT
+ "RSS" VX_LIMIT_FMT
+ "ANON" VX_LIMIT_FMT
++ "RMAP" VX_LIMIT_FMT
+ "FILES" VX_LIMIT_FMT
+ "OFD" VX_LIMIT_FMT
+ "LOCKS" VX_LIMIT_FMT
+ "SOCK" VX_LIMIT_FMT
+ "MSGQ" VX_LIMIT_FMT
+ "SHM" VX_LIMIT_FMT
++ "SEMA" VX_LIMIT_FMT
++ "SEMS" VX_LIMIT_FMT
++ "DENT" VX_LIMIT_FMT
+ VX_LIMIT_ARG(RLIMIT_NPROC)
+ VX_LIMIT_ARG(RLIMIT_AS)
+ VX_LIMIT_ARG(RLIMIT_MEMLOCK)
+ VX_LIMIT_ARG(RLIMIT_RSS)
+ VX_LIMIT_ARG(VLIMIT_ANON)
++ VX_LIMIT_ARG(VLIMIT_MAPPED)
+ VX_LIMIT_ARG(RLIMIT_NOFILE)
+ VX_LIMIT_ARG(VLIMIT_OPENFD)
+ VX_LIMIT_ARG(RLIMIT_LOCKS)
+ VX_LIMIT_ARG(VLIMIT_NSOCK)
+ VX_LIMIT_ARG(RLIMIT_MSGQUEUE)
+ VX_LIMIT_ARG(VLIMIT_SHMEM)
++ VX_LIMIT_ARG(VLIMIT_SEMARY)
++ VX_LIMIT_ARG(VLIMIT_NSEMS)
++ VX_LIMIT_ARG(VLIMIT_DENTRY)
+ );
+}
+
+#endif /* _VX_LIMIT_PROC_H */
+
+
---- linux-2.6.18.5/kernel/vserver/namespace.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/namespace.c 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,113 @@
+--- linux-2.6.20/kernel/vserver/monitor.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/monitor.c 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,142 @@
+/*
-+ * linux/kernel/vserver/namespace.c
++ * kernel/vserver/monitor.c
+ *
-+ * Virtual Server: Context Namespace Support
++ * Virtual Context Scheduler Monitor
+ *
-+ * Copyright (C) 2003-2005 Herbert Pötzl
++ * Copyright (C) 2006 Herbert Pötzl
+ *
-+ * V0.01 broken out from context.c 0.07
-+ * V0.02 added task locking for namespace
++ * V0.01 basic design
+ *
+ */
+
-+#include <linux/utsname.h>
-+#include <linux/sched.h>
-+#include <linux/vs_context.h>
-+#include <linux/vserver/namespace.h>
-+#include <linux/vserver/namespace_cmd.h>
-+#include <linux/dcache.h>
-+#include <linux/mount.h>
-+#include <linux/fs.h>
++#include <linux/errno.h>
++#include <linux/module.h>
++#include <linux/types.h>
++#include <linux/ctype.h>
+
-+#include <asm/errno.h>
+#include <asm/uaccess.h>
++#include <asm/atomic.h>
++#include <asm/unistd.h>
+
++#include <linux/vserver/monitor.h>
++#include <linux/vserver/debug_cmd.h>
+
-+/* namespace functions */
+
-+#include <linux/namespace.h>
++#ifdef CONFIG_VSERVER_MONITOR
++#define VXM_SIZE CONFIG_VSERVER_MONITOR_SIZE
++#else
++#define VXM_SIZE 64
++#endif
+
-+int vx_set_namespace(struct vx_info *vxi, struct namespace *ns, struct fs_struct *fs)
-+{
-+ struct fs_struct *fs_copy;
++struct _vx_monitor {
++ unsigned int counter;
+
-+ if (vxi->vx_namespace)
-+ return -EPERM;
-+ if (!ns || !fs)
-+ return -EINVAL;
++ struct _vx_mon_entry entry[VXM_SIZE+1];
++};
+
-+ fs_copy = copy_fs_struct(fs);
-+ if (!fs_copy)
-+ return -ENOMEM;
+
-+ get_namespace(ns);
-+ vxi->vx_namespace = ns;
-+ vxi->vx_fs = fs_copy;
-+ return 0;
++DEFINE_PER_CPU(struct _vx_monitor, vx_monitor_buffer);
++
++unsigned volatile int vxm_active = 1;
++
++static atomic_t sequence = ATOMIC_INIT(0);
++
++
++/* vxm_advance()
++
++ * requires disabled preemption */
++
++struct _vx_mon_entry *vxm_advance(int cpu)
++{
++ struct _vx_monitor *mon = &per_cpu(vx_monitor_buffer, cpu);
++ struct _vx_mon_entry *entry;
++ unsigned int index;
++
++ index = vxm_active ? (mon->counter++ % VXM_SIZE) : VXM_SIZE;
++ entry = &mon->entry[index];
++
++ entry->ev.seq = atomic_inc_return(&sequence);
++ entry->ev.jif = jiffies;
++ return entry;
+}
+
-+int vc_enter_namespace(uint32_t id, void __user *data)
++EXPORT_SYMBOL_GPL(vxm_advance);
++
++
++int do_read_monitor(struct __user _vx_mon_entry *data,
++ int cpu, uint32_t *index, uint32_t *count)
+{
-+ struct vx_info *vxi;
-+ struct fs_struct *old_fs, *fs;
-+ struct namespace *old_ns;
-+ int ret = 0;
++ int pos, ret = 0;
++ struct _vx_monitor *mon = &per_cpu(vx_monitor_buffer, cpu);
++ int end = mon->counter;
++ int start = end - VXM_SIZE + 2;
++ int idx = *index;
+
-+ if (!vx_check(0, VX_ADMIN))
-+ return -ENOSYS;
++ /* special case: get current pos */
++ if (!*count) {
++ *index = end;
++ return 0;
++ }
+
-+ vxi = lookup_vx_info(id);
-+ if (!vxi)
-+ return -ESRCH;
++ /* have we lost some data? */
++ if (idx < start)
++ idx = start;
++
++ for (pos = 0; (pos < *count) && (idx < end); pos++, idx++) {
++ struct _vx_mon_entry *entry =
++ &mon->entry[idx % VXM_SIZE];
++
++ /* send entry to userspace */
++ ret = copy_to_user (&data[pos], entry, sizeof(*entry));
++ if (ret)
++ break;
++ }
++ /* save new index and count */
++ *index = idx;
++ *count = pos;
++ return ret ? ret : (*index < end);
++}
+
-+ ret = -EINVAL;
-+ if (!vxi->vx_namespace)
-+ goto out_put;
++int vc_read_monitor(uint32_t id, void __user *data)
++{
++ struct vcmd_read_monitor_v0 vc_data;
++ int ret;
+
-+ ret = -ENOMEM;
-+ fs = copy_fs_struct(vxi->vx_fs);
-+ if (!fs)
-+ goto out_put;
++ if (id >= NR_CPUS)
++ return -EINVAL;
+
-+ ret = 0;
-+ task_lock(current);
-+ old_ns = current->namespace;
-+ old_fs = current->fs;
-+ get_namespace(vxi->vx_namespace);
-+ current->namespace = vxi->vx_namespace;
-+ current->fs = fs;
-+ task_unlock(current);
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
+
-+ put_namespace(old_ns);
-+ put_fs_struct(old_fs);
-+out_put:
-+ put_vx_info(vxi);
++ ret = do_read_monitor((struct __user _vx_mon_entry *)vc_data.data,
++ id, &vc_data.index, &vc_data.count);
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
+ return ret;
+}
+
-+int vc_set_namespace(uint32_t id, void __user *data)
++#ifdef CONFIG_COMPAT
++
++int vc_read_monitor_x32(uint32_t id, void __user *data)
+{
-+ struct fs_struct *fs;
-+ struct namespace *ns;
-+ struct vx_info *vxi;
++ struct vcmd_read_monitor_v0_x32 vc_data;
+ int ret;
+
-+ vxi = lookup_vx_info(id);
-+ if (!vxi)
-+ return -ESRCH;
++ if (id >= NR_CPUS)
++ return -EINVAL;
+
-+ task_lock(current);
-+ fs = current->fs;
-+ atomic_inc(&fs->count);
-+ ns = current->namespace;
-+ get_namespace(current->namespace);
-+ task_unlock(current);
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
+
-+ ret = vx_set_namespace(vxi, ns, fs);
++ ret = do_read_monitor((struct __user _vx_mon_entry *)
++ compat_ptr(vc_data.data_ptr),
++ id, &vc_data.index, &vc_data.count);
+
-+ put_namespace(ns);
-+ put_fs_struct(fs);
-+ put_vx_info(vxi);
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
+ return ret;
+}
+
---- linux-2.6.18.5/kernel/vserver/network.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/network.c 2006-12-10 16:35:48 +0100
-@@ -0,0 +1,808 @@
++#endif /* CONFIG_COMPAT */
++
+--- linux-2.6.20/kernel/vserver/network.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/network.c 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,770 @@
+/*
+ * linux/kernel/vserver/network.c
+ *
@@ -17616,16 +22102,21 @@
+ * V0.03 added equiv nx commands
+ * V0.04 switch to RCU based hash
+ * V0.05 and back to locking again
-+ * V0.06 have __create claim() the nxi
++ * V0.06 changed vcmds to nxi arg
+ *
+ */
+
+#include <linux/slab.h>
-+#include <linux/vserver/network_cmd.h>
+#include <linux/rcupdate.h>
+#include <net/tcp.h>
+
+#include <asm/errno.h>
++#include <linux/vserver/base.h>
++#include <linux/vserver/network_cmd.h>
++
++
++atomic_t nx_global_ctotal = ATOMIC_INIT(0);
++atomic_t nx_global_cactive = ATOMIC_INIT(0);
+
+
+/* __alloc_nx_info()
@@ -17657,6 +22148,7 @@
+
+ vxdprintk(VXD_CBIT(nid, 0),
+ "alloc_nx_info(%d) = %p", nid, new);
++ atomic_inc(&nx_global_ctotal);
+ return new;
+}
+
@@ -17677,6 +22169,7 @@
+
+ nxi->nx_state |= NXS_RELEASED;
+ kfree(nxi);
++ atomic_dec(&nx_global_ctotal);
+}
+
+static void __shutdown_nx_info(struct nx_info *nxi)
@@ -17737,6 +22230,7 @@
+ nxi->nx_state |= NXS_HASHED;
+ head = &nx_info_hash[__hashval(nxi->nx_id)];
+ hlist_add_head(&nxi->nx_hlist, head);
++ atomic_inc(&nx_global_cactive);
+}
+
+/* __unhash_nx_info()
@@ -17746,16 +22240,19 @@
+
+static inline void __unhash_nx_info(struct nx_info *nxi)
+{
++ vxd_assert_lock(&nx_info_hash_lock);
+ vxdprintk(VXD_CBIT(nid, 4),
-+ "__unhash_nx_info: %p[#%d]", nxi, nxi->nx_id);
++ "__unhash_nx_info: %p[#%d.%d.%d]", nxi, nxi->nx_id,
++ atomic_read(&nxi->nx_usecnt), atomic_read(&nxi->nx_tasks));
+
-+ spin_lock(&nx_info_hash_lock);
+ /* context must be hashed */
+ BUG_ON(!nx_info_state(nxi, NXS_HASHED));
++ /* but without tasks */
++ BUG_ON(atomic_read(&nxi->nx_tasks));
+
+ nxi->nx_state &= ~NXS_HASHED;
+ hlist_del(&nxi->nx_hlist);
-+ spin_unlock(&nx_info_hash_lock);
++ atomic_dec(&nx_global_cactive);
+}
+
+
@@ -17812,7 +22309,7 @@
+/* __create_nx_info()
+
+ * create the requested context
-+ * get(), claim() and hash it */
++ * get() and hash it */
+
+static struct nx_info * __create_nx_info(int id)
+{
@@ -17828,6 +22325,7 @@
+
+ /* dynamic context requested */
+ if (id == NX_DYNAMIC_ID) {
++#ifdef CONFIG_VSERVER_DYNAMIC_IDS
+ id = __nx_dynamic_id();
+ if (!id) {
+ printk(KERN_ERR "no dynamic context available.\n");
@@ -17835,6 +22333,11 @@
+ goto out_unlock;
+ }
+ new->nx_id = id;
++#else
++ printk(KERN_ERR "dynamic contexts disabled.\n");
++ nxi = ERR_PTR(-EINVAL);
++ goto out_unlock;
++#endif
+ }
+ /* static context requested */
+ else if ((nxi = __lookup_nx_info(id))) {
@@ -17857,7 +22360,6 @@
+ /* new context */
+ vxdprintk(VXD_CBIT(nid, 0),
+ "create_nx_info(%d) = %p (new)", id, new);
-+ claim_nx_info(new, NULL);
+ __hash_nx_info(get_nx_info(new));
+ nxi = new, new = NULL;
+
@@ -17876,7 +22378,9 @@
+void unhash_nx_info(struct nx_info *nxi)
+{
+ __shutdown_nx_info(nxi);
++ spin_lock(&nx_info_hash_lock);
+ __unhash_nx_info(nxi);
++ spin_unlock(&nx_info_hash_lock);
+}
+
+#ifdef CONFIG_VSERVER_LEGACYNET
@@ -17924,10 +22428,23 @@
+
+#ifdef CONFIG_PROC_FS
+
++/* get_nid_list()
++
++ * get a subset of hashed nids for proc
++ * assumes size is at least one */
++
+int get_nid_list(int index, unsigned int *nids, int size)
+{
+ int hindex, nr_nids = 0;
+
++ /* only show current and children */
++ if (!nx_check(0, VS_ADMIN|VS_WATCH)) {
++ if (index > 0)
++ return 0;
++ nids[nr_nids] = nx_current_nid();
++ return 1;
++ }
++
+ for (hindex = 0; hindex < NX_HASH_SIZE; hindex++) {
+ struct hlist_head *head = &nx_info_hash[hindex];
+ struct hlist_node *pos;
@@ -17974,6 +22491,13 @@
+ atomic_read(&nxi->nx_usecnt),
+ atomic_read(&nxi->nx_tasks));
+
++ if (nx_info_flags(nxi, NXF_INFO_PRIVATE, 0) &&
++ !nx_info_flags(nxi, NXF_STATE_SETUP, 0))
++ return -EACCES;
++
++ if (nx_info_state(nxi, NXS_SHUTDOWN))
++ return -EFAULT;
++
+ /* maybe disallow this completely? */
+ old_nxi = task_get_nx_info(p);
+ if (old_nxi == nxi)
@@ -18096,11 +22620,8 @@
+
+void nx_set_persistent(struct nx_info *nxi)
+{
-+ vxdprintk(VXD_CBIT(nid, 6),
-+ "nx_set_persistent(%p[#%d])", nxi, nxi->nx_id);
-+
+ get_nx_info(nxi);
-+ claim_nx_info(nxi, NULL);
++ claim_nx_info(nxi, current);
+}
+
+void nx_clear_persistent(struct nx_info *nxi)
@@ -18108,7 +22629,7 @@
+ vxdprintk(VXD_CBIT(nid, 6),
+ "nx_clear_persistent(%p[#%d])", nxi, nxi->nx_id);
+
-+ release_nx_info(nxi, NULL);
++ release_nx_info(nxi, current);
+ put_nx_info(nxi);
+}
+
@@ -18134,7 +22655,7 @@
+ if (id) {
+ struct task_struct *tsk;
+
-+ if (!vx_check(0, VX_ADMIN|VX_WATCH))
++ if (!nx_check(0, VS_ADMIN|VS_WATCH))
+ return -EPERM;
+
+ read_lock(&tasklist_lock);
@@ -18148,22 +22669,11 @@
+}
+
+
-+int vc_nx_info(uint32_t id, void __user *data)
++int vc_nx_info(struct nx_info *nxi, void __user *data)
+{
-+ struct nx_info *nxi;
+ struct vcmd_nx_info_v0 vc_data;
+
-+ if (!vx_check(0, VX_ADMIN))
-+ return -ENOSYS;
-+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RESOURCE))
-+ return -EPERM;
-+
-+ nxi = lookup_nx_info(id);
-+ if (!nxi)
-+ return -ESRCH;
-+
+ vc_data.nid = nxi->nx_id;
-+ put_nx_info(nxi);
+
+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
@@ -18179,12 +22689,10 @@
+ struct nx_info *new_nxi;
+ int ret;
+
-+ if (!capable(CAP_SYS_ADMIN))
-+ return -EPERM;
+ if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ if ((nid > MAX_S_CONTEXT) && (nid != VX_DYNAMIC_ID))
++ if ((nid > MAX_S_CONTEXT) && (nid != NX_DYNAMIC_ID))
+ return -EINVAL;
+ if (nid < 2)
+ return -EINVAL;
@@ -18196,50 +22704,42 @@
+ /* initial flags */
+ new_nxi->nx_flags = vc_data.flagword;
+
++ /* get a reference for persistent contexts */
++ if ((vc_data.flagword & NXF_PERSISTENT))
++ nx_set_persistent(new_nxi);
++
+ ret = -ENOEXEC;
+ if (vs_net_change(new_nxi, VSC_NETUP))
-+ goto out;
++ goto out_err;
+
+ ret = nx_migrate_task(current, new_nxi);
-+ if (ret)
++ if (!ret) {
++ /* return context id on success */
++ ret = new_nxi->nx_id;
+ goto out;
-+
-+ /* return context id on success */
-+ ret = new_nxi->nx_id;
-+
-+ /* get a reference for persistent contexts */
++ }
++out_err:
++ /* prepare for context disposal */
++ new_nxi->nx_state |= NXS_SHUTDOWN;
++ new_nxi->nx_flags &= NXF_PERSISTENT;
+ if ((vc_data.flagword & NXF_PERSISTENT))
-+ nx_set_persistent(new_nxi);
++ nx_clear_persistent(new_nxi);
+out:
-+ release_nx_info(new_nxi, NULL);
+ put_nx_info(new_nxi);
+ return ret;
+}
+
+
-+int vc_net_migrate(uint32_t id, void __user *data)
++int vc_net_migrate(struct nx_info *nxi, void __user *data)
+{
-+ struct nx_info *nxi;
-+
-+ if (!capable(CAP_SYS_ADMIN))
-+ return -EPERM;
-+
-+ nxi = lookup_nx_info(id);
-+ if (!nxi)
-+ return -ESRCH;
-+ nx_migrate_task(current, nxi);
-+ put_nx_info(nxi);
-+ return 0;
++ return nx_migrate_task(current, nxi);
+}
+
-+int vc_net_add(uint32_t nid, void __user *data)
++int vc_net_add(struct nx_info *nxi, void __user *data)
+{
+ struct vcmd_net_addr_v0 vc_data;
-+ struct nx_info *nxi;
+ int index, pos, ret = 0;
+
-+ if (!capable(CAP_SYS_ADMIN))
-+ return -EPERM;
+ if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
@@ -18253,10 +22753,6 @@
+ break;
+ }
+
-+ nxi = lookup_nx_info(nid);
-+ if (!nxi)
-+ return -ESRCH;
-+
+ switch (vc_data.type) {
+ case NXA_TYPE_IPV4:
+ index = 0;
@@ -18279,130 +22775,82 @@
+ ret = -EINVAL;
+ break;
+ }
-+
-+ put_nx_info(nxi);
+ return ret;
+}
+
-+int vc_net_remove(uint32_t nid, void __user *data)
++int vc_net_remove(struct nx_info * nxi, void __user *data)
+{
+ struct vcmd_net_addr_v0 vc_data;
-+ struct nx_info *nxi;
-+ int ret = 0;
+
-+ if (!capable(CAP_SYS_ADMIN))
-+ return -EPERM;
+ if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ nxi = lookup_nx_info(nid);
-+ if (!nxi)
-+ return -ESRCH;
-+
+ switch (vc_data.type) {
+ case NXA_TYPE_ANY:
+ nxi->nbipv4 = 0;
+ break;
+
+ default:
-+ ret = -EINVAL;
-+ break;
++ return -EINVAL;
+ }
-+
-+ put_nx_info(nxi);
-+ return ret;
++ return 0;
+}
+
-+int vc_get_nflags(uint32_t id, void __user *data)
++int vc_get_nflags(struct nx_info *nxi, void __user *data)
+{
-+ struct nx_info *nxi;
+ struct vcmd_net_flags_v0 vc_data;
+
-+ if (!capable(CAP_SYS_ADMIN))
-+ return -EPERM;
-+
-+ nxi = lookup_nx_info(id);
-+ if (!nxi)
-+ return -ESRCH;
-+
+ vc_data.flagword = nxi->nx_flags;
+
+ /* special STATE flag handling */
-+ vc_data.mask = vx_mask_flags(~0UL, nxi->nx_flags, NXF_ONE_TIME);
-+
-+ put_nx_info(nxi);
++ vc_data.mask = vs_mask_flags(~0UL, nxi->nx_flags, NXF_ONE_TIME);
+
+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+
-+int vc_set_nflags(uint32_t id, void __user *data)
++int vc_set_nflags(struct nx_info *nxi, void __user *data)
+{
-+ struct nx_info *nxi;
+ struct vcmd_net_flags_v0 vc_data;
+ uint64_t mask, trigger;
+
-+ if (!capable(CAP_SYS_ADMIN))
-+ return -EPERM;
-+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
-+ return -EFAULT;
-+
-+ nxi = lookup_nx_info(id);
-+ if (!nxi)
-+ return -ESRCH;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
+
+ /* special STATE flag handling */
-+ mask = vx_mask_mask(vc_data.mask, nxi->nx_flags, NXF_ONE_TIME);
++ mask = vs_mask_mask(vc_data.mask, nxi->nx_flags, NXF_ONE_TIME);
+ trigger = (mask & nxi->nx_flags) ^ (mask & vc_data.flagword);
+
-+ nxi->nx_flags = vx_mask_flags(nxi->nx_flags,
++ nxi->nx_flags = vs_mask_flags(nxi->nx_flags,
+ vc_data.flagword, mask);
+ if (trigger & NXF_PERSISTENT)
+ nx_update_persistent(nxi);
+
-+ put_nx_info(nxi);
+ return 0;
+}
+
-+int vc_get_ncaps(uint32_t id, void __user *data)
++int vc_get_ncaps(struct nx_info *nxi, void __user *data)
+{
-+ struct nx_info *nxi;
+ struct vcmd_net_caps_v0 vc_data;
+
-+ if (!capable(CAP_SYS_ADMIN))
-+ return -EPERM;
-+
-+ nxi = lookup_nx_info(id);
-+ if (!nxi)
-+ return -ESRCH;
-+
+ vc_data.ncaps = nxi->nx_ncaps;
+ vc_data.cmask = ~0UL;
-+ put_nx_info(nxi);
+
+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+ return -EFAULT;
+ return 0;
+}
+
-+int vc_set_ncaps(uint32_t id, void __user *data)
++int vc_set_ncaps(struct nx_info *nxi, void __user *data)
+{
-+ struct nx_info *nxi;
+ struct vcmd_net_caps_v0 vc_data;
+
-+ if (!capable(CAP_SYS_ADMIN))
-+ return -EPERM;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ nxi = lookup_nx_info(id);
-+ if (!nxi)
-+ return -ESRCH;
-+
-+ nxi->nx_ncaps = vx_mask_flags(nxi->nx_ncaps,
++ nxi->nx_ncaps = vs_mask_flags(nxi->nx_ncaps,
+ vc_data.ncaps, vc_data.cmask);
-+ put_nx_info(nxi);
+ return 0;
+}
+
@@ -18412,15 +22860,15 @@
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
---- linux-2.6.18.5/kernel/vserver/proc.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/proc.c 2006-11-21 00:13:49 +0100
-@@ -0,0 +1,862 @@
+--- linux-2.6.20/kernel/vserver/proc.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/proc.c 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,1012 @@
+/*
+ * linux/kernel/vserver/proc.c
+ *
+ * Virtual Context Support
+ *
-+ * Copyright (C) 2003-2005 Herbert Pötzl
++ * Copyright (C) 2003-2006 Herbert Pötzl
+ *
+ * V0.01 basic structure
+ * V0.02 adaptation vs1.3.0
@@ -18429,6 +22877,7 @@
+ * V0.05 next generation procfs
+ * V0.06 inode validation
+ * V0.07 generic rewrite vid
++ * V0.08 remove inode type
+ *
+ */
+
@@ -18440,41 +22889,30 @@
+#include <linux/vs_cvirt.h>
+
+#include <linux/vserver/switch.h>
++#include <linux/vserver/global.h>
+
+#include <asm/uaccess.h>
+#include <asm/unistd.h>
+
+#include "cvirt_proc.h"
++#include "cacct_proc.h"
+#include "limit_proc.h"
+#include "sched_proc.h"
+#include "vci_config.h"
+
+static struct proc_dir_entry *proc_virtual;
+
-+static struct proc_dir_entry *proc_vnet;
++static struct proc_dir_entry *proc_virtnet;
+
+
-+enum vid_directory_inos {
-+ PROC_XID_INO = 32,
-+ PROC_XID_INFO,
-+ PROC_XID_STATUS,
-+ PROC_XID_LIMIT,
-+ PROC_XID_SCHED,
-+ PROC_XID_CVIRT,
-+ PROC_XID_CACCT,
+
-+ PROC_NID_INO = 64,
-+ PROC_NID_INFO,
-+ PROC_NID_STATUS,
-+};
-+
-+#define PROC_VID_MASK 0x60
++// #define PROC_VID_MASK 0x60
+
+
+/* first the actual feeds */
+
+
-+static int proc_virtual_info(int vid, char *buffer)
++static int proc_vci(char *buffer)
+{
+ return sprintf(buffer,
+ "VCIVersion:\t%04x:%04x\n"
@@ -18487,15 +22925,32 @@
+ );
+}
+
++static int proc_virtual_info(char *buffer)
++{
++ return proc_vci(buffer);
++}
++
++static int proc_virtual_status(char *buffer)
++{
++ return sprintf(buffer,
++ "#CTotal:\t%d\n"
++ "#CActive:\t%d\n"
++ "#NSProxy:\t%d\t%d %d %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)
++ );
++}
++
+
-+int proc_xid_info (int vid, char *buffer)
++int proc_vxi_info (struct vx_info *vxi, char *buffer)
+{
-+ struct vx_info *vxi;
+ int length;
+
-+ vxi = lookup_vx_info(vid);
-+ if (!vxi)
-+ return 0;
+ length = sprintf(buffer,
+ "ID:\t%d\n"
+ "Info:\t%p\n"
@@ -18504,110 +22959,94 @@
+ ,vxi
+ ,vxi->vx_initpid
+ );
-+ put_vx_info(vxi);
+ return length;
+}
+
-+int proc_xid_status (int vid, char *buffer)
++int proc_vxi_status (struct vx_info *vxi, char *buffer)
+{
-+ struct vx_info *vxi;
+ int length;
+
-+ vxi = lookup_vx_info(vid);
-+ if (!vxi)
-+ return 0;
+ length = sprintf(buffer,
+ "UseCnt:\t%d\n"
+ "Tasks:\t%d\n"
+ "Flags:\t%016llx\n"
+ "BCaps:\t%016llx\n"
+ "CCaps:\t%016llx\n"
-+ "Ticks:\t%d\n"
++ "Spaces:\t%08lx\n"
++// "Ticks:\t%d\n"
+ ,atomic_read(&vxi->vx_usecnt)
+ ,atomic_read(&vxi->vx_tasks)
+ ,(unsigned long long)vxi->vx_flags
+ ,(unsigned long long)vxi->vx_bcaps
+ ,(unsigned long long)vxi->vx_ccaps
-+ ,atomic_read(&vxi->limit.ticks)
++ ,vxi->vx_nsmask
++// ,atomic_read(&vxi->limit.ticks)
+ );
-+ put_vx_info(vxi);
+ return length;
+}
+
-+int proc_xid_limit (int vid, char *buffer)
++int proc_vxi_limit (struct vx_info *vxi, char *buffer)
+{
-+ struct vx_info *vxi;
-+ int length;
-+
-+ vxi = lookup_vx_info(vid);
-+ if (!vxi)
-+ return 0;
-+ length = vx_info_proc_limit(&vxi->limit, buffer);
-+ put_vx_info(vxi);
-+ return length;
++ return vx_info_proc_limit(&vxi->limit, buffer);
+}
+
-+int proc_xid_sched (int vid, char *buffer)
++int proc_vxi_sched (struct vx_info *vxi, char *buffer)
+{
-+ struct vx_info *vxi;
-+ int length;
++ int cpu, length;
+
-+ vxi = lookup_vx_info(vid);
-+ if (!vxi)
-+ return 0;
+ length = vx_info_proc_sched(&vxi->sched, buffer);
-+ put_vx_info(vxi);
++ for_each_online_cpu(cpu) {
++ length += vx_info_proc_sched_pc(
++ &vx_per_cpu(vxi, sched_pc, cpu),
++ buffer + length, cpu);
++ }
+ return length;
+}
+
-+int proc_xid_cvirt (int vid, char *buffer)
++int proc_vxi_nsproxy (struct vx_info *vxi, char *buffer)
+{
-+ struct vx_info *vxi;
-+ int length;
++ return vx_info_proc_nsproxy(vxi->vx_nsproxy, buffer);
++}
++
++int proc_vxi_cvirt (struct vx_info *vxi, char *buffer)
++{
++ int cpu, length;
+
-+ vxi = lookup_vx_info(vid);
-+ if (!vxi)
-+ return 0;
+ vx_update_load(vxi);
+ length = vx_info_proc_cvirt(&vxi->cvirt, buffer);
-+ put_vx_info(vxi);
++ for_each_online_cpu(cpu) {
++ length += vx_info_proc_cvirt_pc(
++ &vx_per_cpu(vxi, cvirt_pc, cpu),
++ buffer + length, cpu);
++ }
+ return length;
+}
+
-+int proc_xid_cacct (int vid, char *buffer)
++int proc_vxi_cacct (struct vx_info *vxi, char *buffer)
+{
-+ struct vx_info *vxi;
-+ int length;
-+
-+ vxi = lookup_vx_info(vid);
-+ if (!vxi)
-+ return 0;
-+ length = vx_info_proc_cacct(&vxi->cacct, buffer);
-+ put_vx_info(vxi);
-+ return length;
++ return vx_info_proc_cacct(&vxi->cacct, buffer);
+}
+
+
-+static int proc_vnet_info(int vid, char *buffer)
++static int proc_virtnet_info(char *buffer)
++{
++ return proc_vci(buffer);
++}
++
++static int proc_virtnet_status(char *buffer)
+{
+ return sprintf(buffer,
-+ "VCIVersion:\t%04x:%04x\n"
-+ "VCISyscall:\t%d\n"
-+ ,VCI_VERSION >> 16
-+ ,VCI_VERSION & 0xFFFF
-+ ,__NR_vserver
++ "#CTotal:\t%d\n"
++ "#CActive:\t%d\n"
++ ,atomic_read(&nx_global_ctotal)
++ ,atomic_read(&nx_global_cactive)
+ );
+}
+
-+
-+int proc_nid_info (int vid, char *buffer)
++int proc_nxi_info (struct nx_info *nxi, char *buffer)
+{
-+ struct nx_info *nxi;
+ int length, i;
+
-+ nxi = lookup_nx_info(vid);
-+ if (!nxi)
-+ return 0;
+ length = sprintf(buffer,
+ "ID:\t%d\n"
+ "Info:\t%p\n"
@@ -18619,168 +23058,431 @@
+ "%d:\t" NIPQUAD_FMT "/" NIPQUAD_FMT "\n", i,
+ NIPQUAD(nxi->ipv4[i]), NIPQUAD(nxi->mask[i]));
+ }
-+ put_nx_info(nxi);
+ return length;
+}
+
-+int proc_nid_status (int vid, char *buffer)
++int proc_nxi_status (struct nx_info *nxi, char *buffer)
+{
-+ struct nx_info *nxi;
+ int length;
+
-+ nxi = lookup_nx_info(vid);
-+ if (!nxi)
-+ return 0;
+ length = sprintf(buffer,
+ "UseCnt:\t%d\n"
+ "Tasks:\t%d\n"
-+ "Flags:\t%016llx\n"
+ ,atomic_read(&nxi->nx_usecnt)
+ ,atomic_read(&nxi->nx_tasks)
-+ ,(unsigned long long)nxi->nx_flags
+ );
-+ put_nx_info(nxi);
+ return length;
+}
+
-+/* here the inode helpers */
-+
-+
-+#define fake_ino(id,nr) (((nr) & 0xFFFF) | \
-+ (((id) & 0xFFFF) << 16))
+
-+#define inode_vid(i) (((i)->i_ino >> 16) & 0xFFFF)
-+#define inode_type(i) ((i)->i_ino & 0xFFFF)
+
-+#define MAX_MULBY10 ((~0U-9)/10)
++/* here the inode helpers */
+
++struct vs_entry {
++ int len;
++ char *name;
++ mode_t mode;
++ struct inode_operations *iop;
++ struct file_operations *fop;
++ union proc_op op;
++};
+
-+static struct inode *proc_vid_make_inode(struct super_block * sb,
-+ int vid, int ino)
++static struct inode *vs_proc_make_inode(struct super_block *sb, struct vs_entry *p)
+{
+ struct inode *inode = new_inode(sb);
+
+ if (!inode)
+ goto out;
+
-+ inode->i_mtime = inode->i_atime =
-+ inode->i_ctime = CURRENT_TIME;
-+ inode->i_ino = fake_ino(vid, ino);
++ inode->i_mode = p->mode;
++ if (p->iop)
++ inode->i_op = p->iop;
++ if (p->fop)
++ inode->i_fop = p->fop;
++
++ inode->i_nlink = (p->mode & S_IFDIR) ? 2 : 1;
++ inode->i_flags |= S_IMMUTABLE;
++
++ inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+
+ inode->i_uid = 0;
+ inode->i_gid = 0;
++ inode->i_tag = 0;
+out:
+ return inode;
+}
+
-+static int proc_vid_revalidate(struct dentry * dentry, struct nameidata *nd)
++static struct dentry *vs_proc_instantiate(struct inode *dir,
++ struct dentry *dentry, int id, void *ptr)
+{
-+ struct inode * inode = dentry->d_inode;
-+ int vid, hashed=0;
++ struct vs_entry *p = ptr;
++ struct inode *inode = vs_proc_make_inode(dir->i_sb, p);
++ struct dentry *error = ERR_PTR(-EINVAL);
+
-+ vid = inode_vid(inode);
-+ switch (inode_type(inode) & PROC_VID_MASK) {
-+ case PROC_XID_INO:
-+ hashed = xid_is_hashed(vid);
-+ break;
-+ case PROC_NID_INO:
-+ hashed = nid_is_hashed(vid);
-+ break;
++ if (!inode)
++ goto out;
++
++ PROC_I(inode)->op = p->op;
++ PROC_I(inode)->fd = id;
++ d_add(dentry, inode);
++ error = NULL;
++out:
++ return error;
++}
++
++/* Lookups */
++
++typedef struct dentry *instantiate_t(struct inode *, struct dentry *, int, void *);
++
++/*
++ * Fill a directory entry.
++ *
++ * If possible create the dcache entry and derive our inode number and
++ * file type from dcache entry.
++ *
++ * Since all of the proc inode numbers are dynamically generated, the inode
++ * numbers do not exist until the inode is cache. This means creating the
++ * the dcache entry in readdir is necessary to keep the inode numbers
++ * reported by readdir in sync with the inode numbers reported
++ * by stat.
++ */
++static int proc_fill_cache(struct file *filp, void *dirent, filldir_t filldir,
++ char *name, int len, instantiate_t instantiate, int id, void *ptr)
++{
++ struct dentry *child, *dir = filp->f_dentry;
++ struct inode *inode;
++ struct qstr qname;
++ ino_t ino = 0;
++ unsigned type = DT_UNKNOWN;
++
++ qname.name = name;
++ qname.len = len;
++ qname.hash = full_name_hash(name, len);
++
++ child = d_lookup(dir, &qname);
++ if (!child) {
++ struct dentry *new;
++ new = d_alloc(dir, &qname);
++ if (new) {
++ child = instantiate(dir->d_inode, new, id, ptr);
++ if (child)
++ dput(new);
++ else
++ child = new;
++ }
++ }
++ if (!child || IS_ERR(child) || !child->d_inode)
++ goto end_instantiate;
++ inode = child->d_inode;
++ if (inode) {
++ ino = inode->i_ino;
++ type = inode->i_mode >> 12;
+ }
-+ if (hashed)
++ dput(child);
++end_instantiate:
++ if (!ino)
++ ino = find_inode_number(dir, &qname);
++ if (!ino)
++ ino = 1;
++ return filldir(dirent, name, len, filp->f_pos, ino, type);
++}
++
++
++
++/* get and revalidate vx_info/xid */
++
++static inline
++struct vx_info *get_proc_vx_info(struct inode *inode)
++{
++ return lookup_vx_info(PROC_I(inode)->fd);
++}
++
++static int proc_xid_revalidate(struct dentry * dentry, struct nameidata *nd)
++{
++ struct inode *inode = dentry->d_inode;
++ xid_t xid = PROC_I(inode)->fd;
++
++ if (!xid || xid_is_hashed(xid))
++ return 1;
++ d_drop(dentry);
++ return 0;
++}
++
++
++/* get and revalidate nx_info/nid */
++
++static int proc_nid_revalidate(struct dentry * dentry, struct nameidata *nd)
++{
++ struct inode *inode = dentry->d_inode;
++ nid_t nid = PROC_I(inode)->fd;
++
++ if (!nid || nid_is_hashed(nid))
+ return 1;
+ d_drop(dentry);
+ return 0;
+}
+
+
++
+#define PROC_BLOCK_SIZE (PAGE_SIZE - 1024)
+
-+static ssize_t proc_vid_info_read(struct file * file, char __user * buf,
++static ssize_t proc_vs_info_read(struct file * file, char __user * buf,
+ size_t count, loff_t *ppos)
+{
-+ struct inode * inode = file->f_dentry->d_inode;
++ struct inode *inode = file->f_dentry->d_inode;
+ unsigned long page;
-+ ssize_t length;
-+ int vid;
++ ssize_t length = 0;
+
+ if (count > PROC_BLOCK_SIZE)
+ count = PROC_BLOCK_SIZE;
++
++ /* fade that out as soon as stable */
++ WARN_ON(PROC_I(inode)->fd);
++
+ if (!(page = __get_free_page(GFP_KERNEL)))
+ return -ENOMEM;
+
-+ vid = inode_vid(inode);
-+ length = PROC_I(inode)->op.proc_vid_read(vid, (char*)page);
++ BUG_ON(!PROC_I(inode)->op.proc_vs_read);
++ length = PROC_I(inode)->op.proc_vs_read((char*)page);
+
+ if (length >= 0)
+ length = simple_read_from_buffer(buf, count, ppos,
+ (char *)page, length);
++
+ free_page(page);
+ return length;
+}
+
++static ssize_t proc_vx_info_read(struct file * file, char __user * buf,
++ size_t count, loff_t *ppos)
++{
++ struct inode *inode = file->f_dentry->d_inode;
++ struct vx_info *vxi = NULL;
++ xid_t xid = PROC_I(inode)->fd;
++ unsigned long page;
++ ssize_t length = 0;
+
++ if (count > PROC_BLOCK_SIZE)
++ count = PROC_BLOCK_SIZE;
+
++ /* fade that out as soon as stable */
++ WARN_ON(!xid);
++ vxi = lookup_vx_info(xid);
++ if (!vxi)
++ goto out;
+
++ length = -ENOMEM;
++ if (!(page = __get_free_page(GFP_KERNEL)))
++ goto out_put;
+
-+/* here comes the lower level (vid) */
++ BUG_ON(!PROC_I(inode)->op.proc_vxi_read);
++ length = PROC_I(inode)->op.proc_vxi_read(vxi, (char*)page);
+
-+static struct file_operations proc_vid_info_file_operations = {
-+ .read = proc_vid_info_read,
-+};
++ if (length >= 0)
++ length = simple_read_from_buffer(buf, count, ppos,
++ (char *)page, length);
+
-+static struct dentry_operations proc_vid_dentry_operations = {
-+ .d_revalidate = proc_vid_revalidate,
-+};
++ free_page(page);
++out_put:
++ put_vx_info(vxi);
++out:
++ return length;
++}
++
++static ssize_t proc_nx_info_read(struct file * file, char __user * buf,
++ size_t count, loff_t *ppos)
++{
++ struct inode *inode = file->f_dentry->d_inode;
++ struct nx_info *nxi = NULL;
++ nid_t nid = PROC_I(inode)->fd;
++ unsigned long page;
++ ssize_t length = 0;
+
++ if (count > PROC_BLOCK_SIZE)
++ count = PROC_BLOCK_SIZE;
+
-+struct vid_entry {
-+ int type;
-+ int len;
-+ char *name;
-+ mode_t mode;
++ /* fade that out as soon as stable */
++ WARN_ON(!nid);
++ nxi = lookup_nx_info(nid);
++ if (!nxi)
++ goto out;
++
++ length = -ENOMEM;
++ if (!(page = __get_free_page(GFP_KERNEL)))
++ goto out_put;
++
++ BUG_ON(!PROC_I(inode)->op.proc_nxi_read);
++ length = PROC_I(inode)->op.proc_nxi_read(nxi, (char*)page);
++
++ if (length >= 0)
++ length = simple_read_from_buffer(buf, count, ppos,
++ (char *)page, length);
++
++ free_page(page);
++out_put:
++ put_nx_info(nxi);
++out:
++ return length;
++}
++
++
++
++/* here comes the lower level */
++
++
++#define NOD(NAME, MODE, IOP, FOP, OP) { \
++ .len = sizeof(NAME) - 1, \
++ .name = (NAME), \
++ .mode = MODE, \
++ .iop = IOP, \
++ .fop = FOP, \
++ .op = OP, \
++}
++
++
++#define DIR(NAME, MODE, OTYPE) \
++ NOD(NAME, (S_IFDIR|(MODE)), \
++ &proc_##OTYPE##_inode_operations, \
++ &proc_##OTYPE##_file_operations, { } )
++
++#define INF(NAME, MODE, OTYPE) \
++ NOD(NAME, (S_IFREG|(MODE)), NULL, \
++ &proc_vs_info_file_operations, \
++ { .proc_vs_read = &proc_##OTYPE } )
++
++#define VINF(NAME, MODE, OTYPE) \
++ NOD(NAME, (S_IFREG|(MODE)), NULL, \
++ &proc_vx_info_file_operations, \
++ { .proc_vxi_read = &proc_##OTYPE } )
++
++#define NINF(NAME, MODE, OTYPE) \
++ NOD(NAME, (S_IFREG|(MODE)), NULL, \
++ &proc_nx_info_file_operations, \
++ { .proc_nxi_read = &proc_##OTYPE } )
++
++
++static struct file_operations proc_vs_info_file_operations = {
++ .read = proc_vs_info_read,
+};
+
-+#define E(type,name,mode) {(type),sizeof(name)-1,(name),(mode)}
++static struct file_operations proc_vx_info_file_operations = {
++ .read = proc_vx_info_read,
++};
+
-+static struct vid_entry vx_base_stuff[] = {
-+ E(PROC_XID_INFO, "info", S_IFREG|S_IRUGO),
-+ E(PROC_XID_STATUS, "status", S_IFREG|S_IRUGO),
-+ E(PROC_XID_LIMIT, "limit", S_IFREG|S_IRUGO),
-+ E(PROC_XID_SCHED, "sched", S_IFREG|S_IRUGO),
-+ E(PROC_XID_CVIRT, "cvirt", S_IFREG|S_IRUGO),
-+ E(PROC_XID_CACCT, "cacct", S_IFREG|S_IRUGO),
-+ {0,0,NULL,0}
++static struct dentry_operations proc_xid_dentry_operations = {
++ .d_revalidate = proc_xid_revalidate,
+};
+
-+static struct vid_entry vn_base_stuff[] = {
-+ E(PROC_NID_INFO, "info", S_IFREG|S_IRUGO),
-+ E(PROC_NID_STATUS, "status", S_IFREG|S_IRUGO),
-+ {0,0,NULL,0}
++static struct vs_entry vx_base_stuff[] = {
++ VINF("info", S_IRUGO, vxi_info),
++ VINF("status", S_IRUGO, vxi_status),
++ VINF("limit", S_IRUGO, vxi_limit),
++ VINF("sched", S_IRUGO, vxi_sched),
++ VINF("nsproxy", S_IRUGO, vxi_nsproxy),
++ VINF("cvirt", S_IRUGO, vxi_cvirt),
++ VINF("cacct", S_IRUGO, vxi_cacct),
++ {}
+};
+
+
+
-+static struct dentry *proc_vid_lookup(struct inode *dir,
-+ struct dentry *dentry, struct nameidata *nd)
++
++static struct dentry *proc_xid_instantiate(struct inode *dir,
++ struct dentry *dentry, int id, void *ptr)
+{
-+ struct inode *inode;
-+ struct vid_entry *p;
-+ int error;
++ dentry->d_op = &proc_xid_dentry_operations;
++ return vs_proc_instantiate(dir, dentry, id, ptr);
++}
+
-+ error = -ENOENT;
-+ inode = NULL;
++static struct dentry *proc_xid_lookup(struct inode *dir,
++ struct dentry *dentry, struct nameidata *nd)
++{
++ struct vs_entry *p = vx_base_stuff;
++ struct dentry *error = ERR_PTR(-ENOENT);
+
-+ switch (inode_type(dir)) {
-+ case PROC_XID_INO:
-+ p = vx_base_stuff;
-+ break;
-+ case PROC_NID_INO:
-+ p = vn_base_stuff;
++ for (; p->name; p++) {
++ if (p->len != dentry->d_name.len)
++ continue;
++ if (!memcmp(dentry->d_name.name, p->name, p->len))
+ break;
-+ default:
++ }
++ if (!p->name)
++ goto out;
++
++ error = proc_xid_instantiate(dir, dentry, PROC_I(dir)->fd, p);
++out:
++ return error;
++}
++
++static int proc_xid_readdir(struct file * filp,
++ void * dirent, filldir_t filldir)
++{
++ struct dentry *dentry = filp->f_dentry;
++ struct inode *inode = dentry->d_inode;
++ struct vs_entry *p = vx_base_stuff;
++ int size = sizeof(vx_base_stuff)/sizeof(struct vs_entry);
++ int pos, index;
++ u64 ino;
++
++ pos = filp->f_pos;
++ switch (pos) {
++ case 0:
++ ino = inode->i_ino;
++ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
++ goto out;
++ pos++;
++ /* fall through */
++ case 1:
++ ino = parent_ino(dentry);
++ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
+ goto out;
++ pos++;
++ /* fall through */
++ default:
++ index = pos - 2;
++ if (index >= size)
++ goto out;
++ for (p += index; p->name; p++) {
++ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
++ vs_proc_instantiate, PROC_I(inode)->fd, p))
++ goto out;
++ pos++;
++ }
+ }
++out:
++ filp->f_pos = pos;
++ return 1;
++}
++
++
++
++static struct file_operations proc_nx_info_file_operations = {
++ .read = proc_nx_info_read,
++};
++
++static struct dentry_operations proc_nid_dentry_operations = {
++ .d_revalidate = proc_nid_revalidate,
++};
++
++static struct vs_entry nx_base_stuff[] = {
++ NINF("info", S_IRUGO, nxi_info),
++ NINF("status", S_IRUGO, nxi_status),
++ {}
++};
++
++
++static struct dentry *proc_nid_instantiate(struct inode *dir,
++ struct dentry *dentry, int id, void *ptr)
++{
++ dentry->d_op = &proc_nid_dentry_operations;
++ return vs_proc_instantiate(dir, dentry, id, ptr);
++}
++
++static struct dentry *proc_nid_lookup(struct inode *dir,
++ struct dentry *dentry, struct nameidata *nd)
++{
++ struct vs_entry *p = nx_base_stuff;
++ struct dentry *error = ERR_PTR(-ENOENT);
+
+ for (; p->name; p++) {
+ if (p->len != dentry->d_name.len)
@@ -18791,124 +23493,55 @@
+ if (!p->name)
+ goto out;
+
-+ error = -EINVAL;
-+ inode = proc_vid_make_inode(dir->i_sb, inode_vid(dir), p->type);
-+ if (!inode)
-+ goto out;
-+
-+ switch(p->type) {
-+ case PROC_XID_INFO:
-+ PROC_I(inode)->op.proc_vid_read = proc_xid_info;
-+ break;
-+ case PROC_XID_STATUS:
-+ PROC_I(inode)->op.proc_vid_read = proc_xid_status;
-+ break;
-+ case PROC_XID_LIMIT:
-+ PROC_I(inode)->op.proc_vid_read = proc_xid_limit;
-+ break;
-+ case PROC_XID_SCHED:
-+ PROC_I(inode)->op.proc_vid_read = proc_xid_sched;
-+ break;
-+ case PROC_XID_CVIRT:
-+ PROC_I(inode)->op.proc_vid_read = proc_xid_cvirt;
-+ break;
-+ case PROC_XID_CACCT:
-+ PROC_I(inode)->op.proc_vid_read = proc_xid_cacct;
-+ break;
-+
-+ case PROC_NID_INFO:
-+ PROC_I(inode)->op.proc_vid_read = proc_nid_info;
-+ break;
-+ case PROC_NID_STATUS:
-+ PROC_I(inode)->op.proc_vid_read = proc_nid_status;
-+ break;
-+
-+ default:
-+ printk("procfs: impossible type (%d)",p->type);
-+ iput(inode);
-+ return ERR_PTR(-EINVAL);
-+ }
-+ inode->i_mode = p->mode;
-+ inode->i_fop = &proc_vid_info_file_operations;
-+ inode->i_nlink = 1;
-+ inode->i_flags|=S_IMMUTABLE;
-+
-+ dentry->d_op = &proc_vid_dentry_operations;
-+ d_add(dentry, inode);
-+ error = 0;
++ error = proc_nid_instantiate(dir, dentry, PROC_I(dir)->fd, p);
+out:
-+ return ERR_PTR(error);
++ return error;
+}
+
-+
-+static int proc_vid_readdir(struct file * filp,
++static int proc_nid_readdir(struct file * filp,
+ void * dirent, filldir_t filldir)
+{
-+ int i, size;
-+ struct inode *inode = filp->f_dentry->d_inode;
-+ struct vid_entry *p;
++ struct dentry *dentry = filp->f_dentry;
++ struct inode *inode = dentry->d_inode;
++ struct vs_entry *p = nx_base_stuff;
++ int size = sizeof(nx_base_stuff)/sizeof(struct vs_entry);
++ int pos, index;
++ u64 ino;
+
-+ i = filp->f_pos;
-+ switch (i) {
++ pos = filp->f_pos;
++ switch (pos) {
+ case 0:
-+ if (filldir(dirent, ".", 1, i,
-+ inode->i_ino, DT_DIR) < 0)
-+ return 0;
-+ i++;
-+ filp->f_pos++;
++ ino = inode->i_ino;
++ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
++ goto out;
++ pos++;
+ /* fall through */
+ case 1:
-+ if (filldir(dirent, "..", 2, i,
-+ PROC_ROOT_INO, DT_DIR) < 0)
-+ return 0;
-+ i++;
-+ filp->f_pos++;
++ ino = parent_ino(dentry);
++ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
++ goto out;
++ pos++;
+ /* fall through */
+ default:
-+ i -= 2;
-+ switch (inode_type(inode)) {
-+ case PROC_XID_INO:
-+ size = sizeof(vx_base_stuff);
-+ p = vx_base_stuff + i;
-+ break;
-+ case PROC_NID_INO:
-+ size = sizeof(vn_base_stuff);
-+ p = vn_base_stuff + i;
-+ break;
-+ default:
-+ return 1;
-+ }
-+ if (i >= size/sizeof(struct vid_entry))
-+ return 1;
-+ while (p->name) {
-+ if (filldir(dirent, p->name, p->len,
-+ filp->f_pos, fake_ino(inode_vid(inode),
-+ p->type), p->mode >> 12) < 0)
-+ return 0;
-+ filp->f_pos++;
-+ p++;
++ index = pos - 2;
++ if (index >= size)
++ goto out;
++ for (p += index; p->name; p++) {
++ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
++ vs_proc_instantiate, PROC_I(inode)->fd, p))
++ goto out;
++ pos++;
+ }
+ }
++out:
++ filp->f_pos = pos;
+ return 1;
+}
+
+
++#define MAX_MULBY10 ((~0U-9)/10)
+
-+
-+/* now the upper level (virtual) */
-+
-+static struct file_operations proc_vid_file_operations = {
-+ .read = generic_read_dir,
-+ .readdir = proc_vid_readdir,
-+};
-+
-+static struct inode_operations proc_vid_inode_operations = {
-+ .lookup = proc_vid_lookup,
-+};
-+
-+
-+
-+static __inline__ int atovid(const char *str, int len)
++static inline int atovid(const char *str, int len)
+{
+ int vid, c;
+
@@ -18928,199 +23561,154 @@
+ return vid;
+}
+
++/* now the upper level (virtual) */
++
++
++static struct file_operations proc_xid_file_operations = {
++ .read = generic_read_dir,
++ .readdir = proc_xid_readdir,
++};
++
++static struct inode_operations proc_xid_inode_operations = {
++ .lookup = proc_xid_lookup,
++};
++
++static struct vs_entry vx_virtual_stuff[] = {
++ INF("info", S_IRUGO, virtual_info),
++ INF("status", S_IRUGO, virtual_status),
++ DIR(NULL, S_IRUGO|S_IXUGO, xid),
++};
++
+
-+struct dentry *proc_virtual_lookup(struct inode *dir,
-+ struct dentry * dentry, struct nameidata *nd)
++static struct dentry *proc_virtual_lookup(struct inode *dir,
++ struct dentry *dentry, struct nameidata *nd)
+{
-+ int xid, len, ret;
-+ struct vx_info *vxi;
-+ const char *name;
-+ struct inode *inode;
++ struct vs_entry *p = vx_virtual_stuff;
++ struct dentry *error = ERR_PTR(-ENOENT);
++ int id = 0;
+
-+ name = dentry->d_name.name;
-+ len = dentry->d_name.len;
-+ ret = -ENOMEM;
-+
-+ if (len == 7 && !memcmp(name, "current", 7)) {
-+ inode = new_inode(dir->i_sb);
-+ if (!inode)
-+ goto out;
-+ inode->i_mtime = inode->i_atime =
-+ inode->i_ctime = CURRENT_TIME;
-+ inode->i_ino = fake_ino(1, PROC_XID_INO);
-+ inode->i_mode = S_IFLNK|S_IRWXUGO;
-+ inode->i_uid = inode->i_gid = 0;
-+ d_add(dentry, inode);
-+ return NULL;
-+ }
-+ if (len == 4 && !memcmp(name, "info", 4)) {
-+ inode = proc_vid_make_inode(dir->i_sb, 0, PROC_XID_INFO);
-+ if (!inode)
-+ goto out;
-+ inode->i_fop = &proc_vid_info_file_operations;
-+ PROC_I(inode)->op.proc_vid_read = proc_virtual_info;
-+ inode->i_mode = S_IFREG|S_IRUGO;
-+ d_add(dentry, inode);
-+ return NULL;
++ for (; p->name; p++) {
++ if (p->len != dentry->d_name.len)
++ continue;
++ if (!memcmp(dentry->d_name.name, p->name, p->len))
++ break;
+ }
++ if (p->name)
++ goto instantiate;
+
-+ ret = -ENOENT;
-+ xid = atovid(name, len);
-+ if (xid < 0)
-+ goto out;
-+ vxi = lookup_vx_info(xid);
-+ if (!vxi)
++ id = atovid(dentry->d_name.name, dentry->d_name.len);
++ if ((id < 0) || !xid_is_hashed(id))
+ goto out;
+
-+ inode = NULL;
-+ if (vx_check(xid, VX_ADMIN|VX_WATCH|VX_IDENT))
-+ inode = proc_vid_make_inode(dir->i_sb,
-+ vxi->vx_id, PROC_XID_INO);
-+ if (!inode)
-+ goto out_release;
++instantiate:
++ error = proc_xid_instantiate(dir, dentry, id, p);
++out:
++ return error;
++}
+
-+ inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
-+ inode->i_op = &proc_vid_inode_operations;
-+ inode->i_fop = &proc_vid_file_operations;
-+ inode->i_nlink = 2;
-+ inode->i_flags|=S_IMMUTABLE;
++static struct file_operations proc_nid_file_operations = {
++ .read = generic_read_dir,
++ .readdir = proc_nid_readdir,
++};
+
-+ dentry->d_op = &proc_vid_dentry_operations;
-+ d_add(dentry, inode);
-+ ret = 0;
++static struct inode_operations proc_nid_inode_operations = {
++ .lookup = proc_nid_lookup,
++};
+
-+out_release:
-+ put_vx_info(vxi);
-+out:
-+ return ERR_PTR(ret);
-+}
++static struct vs_entry nx_virtnet_stuff[] = {
++ INF("info", S_IRUGO, virtnet_info),
++ INF("status", S_IRUGO, virtnet_status),
++ DIR(NULL, S_IRUGO|S_IXUGO, nid),
++};
+
+
-+struct dentry *proc_vnet_lookup(struct inode *dir,
-+ struct dentry * dentry, struct nameidata *nd)
++static struct dentry *proc_virtnet_lookup(struct inode *dir,
++ struct dentry *dentry, struct nameidata *nd)
+{
-+ int nid, len, ret;
-+ struct nx_info *nxi;
-+ const char *name;
-+ struct inode *inode;
++ struct vs_entry *p = nx_virtnet_stuff;
++ struct dentry *error = ERR_PTR(-ENOENT);
++ int id = 0;
+
-+ name = dentry->d_name.name;
-+ len = dentry->d_name.len;
-+ ret = -ENOMEM;
-+ if (len == 7 && !memcmp(name, "current", 7)) {
-+ inode = new_inode(dir->i_sb);
-+ if (!inode)
-+ goto out;
-+ inode->i_mtime = inode->i_atime =
-+ inode->i_ctime = CURRENT_TIME;
-+ inode->i_ino = fake_ino(1, PROC_NID_INO);
-+ inode->i_mode = S_IFLNK|S_IRWXUGO;
-+ inode->i_uid = inode->i_gid = 0;
-+ d_add(dentry, inode);
-+ return NULL;
-+ }
-+ if (len == 4 && !memcmp(name, "info", 4)) {
-+ inode = proc_vid_make_inode(dir->i_sb, 0, PROC_NID_INFO);
-+ if (!inode)
-+ goto out;
-+ inode->i_fop = &proc_vid_info_file_operations;
-+ PROC_I(inode)->op.proc_vid_read = proc_vnet_info;
-+ inode->i_mode = S_IFREG|S_IRUGO;
-+ d_add(dentry, inode);
-+ return NULL;
++ for (; p->name; p++) {
++ if (p->len != dentry->d_name.len)
++ continue;
++ if (!memcmp(dentry->d_name.name, p->name, p->len))
++ break;
+ }
++ if (p->name)
++ goto instantiate;
+
-+ ret = -ENOENT;
-+ nid = atovid(name, len);
-+ if (nid < 0)
-+ goto out;
-+ nxi = lookup_nx_info(nid);
-+ if (!nxi)
++ id = atovid(dentry->d_name.name, dentry->d_name.len);
++ if ((id < 0) || !nid_is_hashed(id))
+ goto out;
+
-+ inode = NULL;
-+ if (1)
-+ inode = proc_vid_make_inode(dir->i_sb,
-+ nxi->nx_id, PROC_NID_INO);
-+ if (!inode)
-+ goto out_release;
-+
-+ inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
-+ inode->i_op = &proc_vid_inode_operations;
-+ inode->i_fop = &proc_vid_file_operations;
-+ inode->i_nlink = 2;
-+ inode->i_flags|=S_IMMUTABLE;
-+
-+ dentry->d_op = &proc_vid_dentry_operations;
-+ d_add(dentry, inode);
-+ ret = 0;
-+
-+out_release:
-+ put_nx_info(nxi);
++instantiate:
++ error = proc_nid_instantiate(dir, dentry, id, p);
+out:
-+ return ERR_PTR(ret);
++ return error;
+}
+
+
+
-+
+#define PROC_NUMBUF 10
+#define PROC_MAXVIDS 32
+
+int proc_virtual_readdir(struct file * filp,
+ void * dirent, filldir_t filldir)
+{
++ struct dentry *dentry = filp->f_dentry;
++ struct inode *inode = dentry->d_inode;
++ struct vs_entry *p = vx_virtual_stuff;
++ int size = sizeof(vx_virtual_stuff)/sizeof(struct vs_entry);
++ int pos, index;
+ unsigned int xid_array[PROC_MAXVIDS];
+ char buf[PROC_NUMBUF];
-+ unsigned int nr = filp->f_pos-3;
+ unsigned int nr_xids, i;
-+ ino_t ino;
++ u64 ino;
+
-+ switch ((long)filp->f_pos) {
++ pos = filp->f_pos;
++ switch (pos) {
+ case 0:
-+ ino = fake_ino(0, PROC_XID_INO);
-+ if (filldir(dirent, ".", 1,
-+ filp->f_pos, ino, DT_DIR) < 0)
-+ return 0;
-+ filp->f_pos++;
++ ino = inode->i_ino;
++ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
++ goto out;
++ pos++;
+ /* fall through */
+ case 1:
-+ ino = filp->f_dentry->d_parent->d_inode->i_ino;
-+ if (filldir(dirent, "..", 2,
-+ filp->f_pos, ino, DT_DIR) < 0)
-+ return 0;
-+ filp->f_pos++;
-+ /* fall through */
-+ case 2:
-+ ino = fake_ino(0, PROC_XID_INFO);
-+ if (filldir(dirent, "info", 4,
-+ filp->f_pos, ino, DT_LNK) < 0)
-+ return 0;
-+ filp->f_pos++;
++ ino = parent_ino(dentry);
++ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
++ goto out;
++ pos++;
+ /* fall through */
-+ case 3:
-+ if (vx_current_xid() > 1) {
-+ ino = fake_ino(1, PROC_XID_INO);
-+ if (filldir(dirent, "current", 7,
-+ filp->f_pos, ino, DT_LNK) < 0)
-+ return 0;
++ default:
++ index = pos - 2;
++ if (index >= size)
++ goto entries;
++ for (p += index; p->name; p++) {
++ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
++ vs_proc_instantiate, 0, p))
++ goto out;
++ pos++;
+ }
-+ filp->f_pos++;
-+ }
-+
-+ nr_xids = get_xid_list(nr, xid_array, PROC_MAXVIDS);
-+ for (i = 0; i < nr_xids; i++) {
-+ int xid = xid_array[i];
-+ ino_t ino = fake_ino(xid, PROC_XID_INO);
-+ unsigned int j = PROC_NUMBUF;
++ entries:
++ index = pos - size;
++ p = &vx_virtual_stuff[size-1];
++ nr_xids = get_xid_list(index, xid_array, PROC_MAXVIDS);
++ for (i = 0; i < nr_xids; i++) {
++ int n, xid = xid_array[i];
++ unsigned int j = PROC_NUMBUF;
+
-+ do buf[--j] = '0' + (xid % 10); while (xid/=10);
++ n = xid;
++ do buf[--j] = '0' + (n % 10); while (n /= 10);
+
-+ if (filldir(dirent, buf+j, PROC_NUMBUF-j,
-+ filp->f_pos, ino, DT_DIR) < 0)
-+ break;
-+ filp->f_pos++;
++ if (proc_fill_cache(filp, dirent, filldir, buf+j, PROC_NUMBUF-j,
++ vs_proc_instantiate, xid, p))
++ goto out;
++ pos++;
++ }
+ }
++out:
++ filp->f_pos = pos;
+ return 0;
+}
+
@@ -19135,63 +23723,76 @@
+};
+
+
-+int proc_vnet_readdir(struct file * filp,
++
++
++
++int proc_virtnet_readdir(struct file * filp,
+ void * dirent, filldir_t filldir)
+{
++ struct dentry *dentry = filp->f_dentry;
++ struct inode *inode = dentry->d_inode;
++ struct vs_entry *p = nx_virtnet_stuff;
++ int size = sizeof(nx_virtnet_stuff)/sizeof(struct vs_entry);
++ int pos, index;
+ unsigned int nid_array[PROC_MAXVIDS];
+ char buf[PROC_NUMBUF];
-+ unsigned int nr = filp->f_pos-2;
+ unsigned int nr_nids, i;
-+ ino_t ino;
++ u64 ino;
+
-+ switch ((long)filp->f_pos) {
++ pos = filp->f_pos;
++ switch (pos) {
+ case 0:
-+ ino = fake_ino(0, PROC_NID_INO);
-+ if (filldir(dirent, ".", 1,
-+ filp->f_pos, ino, DT_DIR) < 0)
-+ return 0;
-+ filp->f_pos++;
++ ino = inode->i_ino;
++ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
++ goto out;
++ pos++;
+ /* fall through */
+ case 1:
-+ ino = filp->f_dentry->d_parent->d_inode->i_ino;
-+ if (filldir(dirent, "..", 2,
-+ filp->f_pos, ino, DT_DIR) < 0)
-+ return 0;
-+ filp->f_pos++;
-+ /* fall through */
-+ case 2:
-+ ino = fake_ino(0, PROC_NID_INFO);
-+ if (filldir(dirent, "info", 4,
-+ filp->f_pos, ino, DT_REG) < 0)
-+ return 0;
-+ filp->f_pos++;
++ ino = parent_ino(dentry);
++ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
++ goto out;
++ pos++;
+ /* fall through */
-+ }
-+
-+ nr_nids = get_nid_list(nr, nid_array, PROC_MAXVIDS);
-+ for (i = 0; i < nr_nids; i++) {
-+ int nid = nid_array[i];
-+ ino_t ino = fake_ino(nid, PROC_NID_INO);
-+ unsigned long j = PROC_NUMBUF;
++ default:
++ index = pos - 2;
++ if (index >= size)
++ goto entries;
++ for (p += index; p->name; p++) {
++ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
++ vs_proc_instantiate, 0, p))
++ goto out;
++ pos++;
++ }
++ entries:
++ index = pos - size;
++ p = &nx_virtnet_stuff[size-1];
++ nr_nids = get_nid_list(index, nid_array, PROC_MAXVIDS);
++ for (i = 0; i < nr_nids; i++) {
++ int n, nid = nid_array[i];
++ unsigned int j = PROC_NUMBUF;
+
-+ do buf[--j] = '0' + (nid % 10); while (nid/=10);
++ n = nid;
++ do buf[--j] = '0' + (n % 10); while (n /= 10);
+
-+ if (filldir(dirent, buf+j, PROC_NUMBUF-j,
-+ filp->f_pos, ino, DT_DIR) < 0)
-+ break;
-+ filp->f_pos++;
++ if (proc_fill_cache(filp, dirent, filldir, buf+j, PROC_NUMBUF-j,
++ vs_proc_instantiate, nid, p))
++ goto out;
++ pos++;
++ }
+ }
++out:
++ filp->f_pos = pos;
+ return 0;
+}
+
+
-+static struct file_operations proc_vnet_dir_operations = {
++static struct file_operations proc_virtnet_dir_operations = {
+ .read = generic_read_dir,
-+ .readdir = proc_vnet_readdir,
++ .readdir = proc_virtnet_readdir,
+};
+
-+static struct inode_operations proc_vnet_dir_inode_operations = {
-+ .lookup = proc_vnet_lookup,
++static struct inode_operations proc_virtnet_dir_inode_operations = {
++ .lookup = proc_virtnet_lookup,
+};
+
+
@@ -19209,10 +23810,10 @@
+
+ ent = proc_mkdir("virtnet", 0);
+ if (ent) {
-+ ent->proc_fops = &proc_vnet_dir_operations;
-+ ent->proc_iops = &proc_vnet_dir_inode_operations;
++ ent->proc_fops = &proc_virtnet_dir_operations;
++ ent->proc_iops = &proc_virtnet_dir_inode_operations;
+ }
-+ proc_vnet = ent;
++ proc_virtnet = ent;
+}
+
+
@@ -19227,8 +23828,6 @@
+ char * orig = buffer;
+
+ buffer += sprintf (buffer,"XID:\t%d\n", vx_task_xid(p));
-+ if (vx_flags(VXF_INFO_HIDE, 0))
-+ goto out;
+
+ vxi = task_get_vx_info(p);
+ if (!vxi)
@@ -19256,8 +23855,7 @@
+ int i;
+
+ buffer += sprintf (buffer,"NID:\t%d\n", nx_task_nid(p));
-+ if (vx_flags(VXF_INFO_HIDE, 0))
-+ goto out;
++
+ nxi = task_get_nx_info(p);
+ if (!nxi)
+ goto out;
@@ -19277,18 +23875,19 @@
+ return buffer - orig;
+}
+
---- linux-2.6.18.5/kernel/vserver/sched.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/sched.c 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,217 @@
+--- linux-2.6.20/kernel/vserver/sched.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/sched.c 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/sched.c
+ *
+ * Virtual Server: Scheduler Support
+ *
-+ * Copyright (C) 2004-2005 Herbert Pötzl
++ * Copyright (C) 2004-2006 Herbert Pötzl
+ *
+ * V0.01 adapted Sam Vilains version to 2.6.3
+ * V0.02 removed legacy interface
++ * V0.03 changed vcmds to vxi arg
+ *
+ */
+
@@ -19300,232 +23899,469 @@
+#include <asm/errno.h>
+#include <asm/uaccess.h>
+
++#define vxd_check_range(val, min, max) do { \
++ vxlprintk((val<min) || (val>max), \
++ "check_range(%ld,%ld,%ld)", \
++ (long)val, (long)min, (long)max, \
++ __FILE__, __LINE__); \
++ } while (0)
++
++
++void vx_update_sched_param(struct _vx_sched *sched,
++ struct _vx_sched_pc *sched_pc)
++{
++ unsigned int set_mask = sched->update_mask;
++
++ if (set_mask & VXSM_FILL_RATE)
++ sched_pc->fill_rate[0] = sched->fill_rate[0];
++ if (set_mask & VXSM_INTERVAL)
++ sched_pc->interval[0] = sched->interval[0];
++ if (set_mask & VXSM_FILL_RATE2)
++ sched_pc->fill_rate[1] = sched->fill_rate[1];
++ if (set_mask & VXSM_INTERVAL2)
++ sched_pc->interval[1] = sched->interval[1];
++ if (set_mask & VXSM_TOKENS)
++ sched_pc->tokens = sched->tokens;
++ if (set_mask & VXSM_TOKENS_MIN)
++ sched_pc->tokens_min = sched->tokens_min;
++ if (set_mask & VXSM_TOKENS_MAX)
++ sched_pc->tokens_max = sched->tokens_max;
++ if (set_mask & VXSM_PRIO_BIAS)
++ sched_pc->prio_bias = sched->prio_bias;
++
++ if (set_mask & VXSM_IDLE_TIME)
++ sched_pc->flags |= VXSF_IDLE_TIME;
++ else
++ sched_pc->flags &= ~VXSF_IDLE_TIME;
++
++ /* reset time */
++ sched_pc->norm_time = jiffies;
++}
++
++
++/*
++ * recalculate the context's scheduling tokens
++ *
++ * ret > 0 : number of tokens available
++ * ret < 0 : on hold, check delta_min[]
++ * -1 only jiffies
++ * -2 also idle time
++ *
++ */
++int vx_tokens_recalc(struct _vx_sched_pc *sched_pc,
++ unsigned long *norm_time, unsigned long *idle_time, int delta_min[2])
++{
++ long delta;
++ long tokens = 0;
++ int flags = sched_pc->flags;
++
++ /* how much time did pass? */
++ delta = *norm_time - sched_pc->norm_time;
++ vxd_check_range(delta, 0, INT_MAX);
++
++ if (delta >= sched_pc->interval[0]) {
++ long tokens, integral;
++
++ /* calc integral token part */
++ tokens = delta / sched_pc->interval[0];
++ integral = tokens * sched_pc->interval[0];
++ tokens *= sched_pc->fill_rate[0];
++#ifdef CONFIG_VSERVER_HARDCPU
++ delta_min[0] = delta - integral;
++ vxd_check_range(delta_min[0], 0, sched_pc->interval[0]);
++#endif
++ /* advance time */
++ sched_pc->norm_time += delta;
++
++ /* add tokens */
++ sched_pc->tokens += tokens;
++ sched_pc->token_time += tokens;
++ }
++ else
++ delta_min[0] = delta;
++
++#ifdef CONFIG_VSERVER_IDLETIME
++ if (!(flags & VXSF_IDLE_TIME))
++ goto skip_idle;
++
++ /* how much was the idle skip? */
++ delta = *idle_time - sched_pc->idle_time;
++ vxd_check_range(delta, 0, INT_MAX);
++
++ if (delta >= sched_pc->interval[1]) {
++ long tokens, integral;
++
++ /* calc fair share token part */
++ tokens = delta / sched_pc->interval[1];
++ integral = tokens * sched_pc->interval[1];
++ tokens *= sched_pc->fill_rate[1];
++ delta_min[1] = delta - integral;
++ vxd_check_range(delta_min[1], 0, sched_pc->interval[1]);
++
++ /* advance idle time */
++ sched_pc->idle_time += integral;
++
++ /* add tokens */
++ sched_pc->tokens += tokens;
++ sched_pc->token_time += tokens;
++ }
++ else
++ delta_min[1] = delta;
++skip_idle:
++#endif
++
++ /* clip at maximum */
++ if (sched_pc->tokens > sched_pc->tokens_max)
++ sched_pc->tokens = sched_pc->tokens_max;
++ tokens = sched_pc->tokens;
++
++ if ((flags & VXSF_ONHOLD)) {
++ /* can we unhold? */
++ if (tokens >= sched_pc->tokens_min) {
++ flags &= ~VXSF_ONHOLD;
++ sched_pc->hold_ticks +=
++ *norm_time - sched_pc->onhold;
++ }
++ else
++ goto on_hold;
++ } else {
++ /* put on hold? */
++ if (tokens <= 0) {
++ flags |= VXSF_ONHOLD;
++ sched_pc->onhold = *norm_time;
++ goto on_hold;
++ }
++ }
++ sched_pc->flags = flags;
++ return tokens;
++
++on_hold:
++ tokens = sched_pc->tokens_min - tokens;
++ sched_pc->flags = flags;
++ BUG_ON(tokens < 0);
++
++#ifdef CONFIG_VSERVER_HARDCPU
++ /* next interval? */
++ if (!sched_pc->fill_rate[0])
++ delta_min[0] = HZ;
++ else if (tokens > sched_pc->fill_rate[0])
++ delta_min[0] += sched_pc->interval[0] *
++ tokens / sched_pc->fill_rate[0];
++ else
++ delta_min[0] = sched_pc->interval[0] - delta_min[0];
++ vxd_check_range(delta_min[0], 0, INT_MAX);
++
++#ifdef CONFIG_VSERVER_IDLETIME
++ if (!(flags & VXSF_IDLE_TIME))
++ return -1;
++
++ /* next interval? */
++ if (!sched_pc->fill_rate[1])
++ delta_min[1] = HZ;
++ else if (tokens > sched_pc->fill_rate[1])
++ delta_min[1] += sched_pc->interval[1] *
++ tokens / sched_pc->fill_rate[1];
++ else
++ delta_min[1] = sched_pc->interval[1] - delta_min[1];
++ vxd_check_range(delta_min[1], 0, INT_MAX);
++
++ return -2;
++#else
++ return -1;
++#endif /* CONFIG_VSERVER_IDLETIME */
++#else
++ return 0;
++#endif /* CONFIG_VSERVER_HARDCPU */
++}
++
++static inline unsigned long msec_to_ticks(unsigned long msec)
++{
++ return msecs_to_jiffies(msec);
++}
++
++static inline unsigned long ticks_to_msec(unsigned long ticks)
++{
++ return jiffies_to_msecs(ticks);
++}
++
++static inline unsigned long ticks_to_usec(unsigned long ticks)
++{
++ return jiffies_to_usecs(ticks);
++}
++
++
++static int do_set_sched(struct vx_info *vxi, struct vcmd_sched_v5 *data)
++{
++ unsigned int set_mask = data->mask;
++ unsigned int update_mask;
++ int i;
++
++ /* Sanity check data values */
++ if (data->tokens_max <= 0)
++ data->tokens_max = HZ;
++ if (data->tokens_min < 0)
++ data->tokens_min = HZ/3;
++ if (data->tokens_min >= data->tokens_max)
++ data->tokens_min = data->tokens_max;
++
++ if (data->prio_bias > MAX_PRIO_BIAS)
++ data->prio_bias = MAX_PRIO_BIAS;
++ if (data->prio_bias < MIN_PRIO_BIAS)
++ data->prio_bias = MIN_PRIO_BIAS;
++
++ spin_lock(&vxi->sched.tokens_lock);
++
++ if (set_mask & VXSM_FILL_RATE)
++ vxi->sched.fill_rate[0] = data->fill_rate[0];
++ if (set_mask & VXSM_FILL_RATE2)
++ vxi->sched.fill_rate[1] = data->fill_rate[1];
++ if (set_mask & VXSM_INTERVAL)
++ vxi->sched.interval[0] = (set_mask & VXSM_MSEC) ?
++ msec_to_ticks(data->interval[0]) : data->interval[0];
++ if (set_mask & VXSM_INTERVAL2)
++ vxi->sched.interval[1] = (set_mask & VXSM_MSEC) ?
++ msec_to_ticks(data->interval[1]) : data->interval[1];
++ if (set_mask & VXSM_TOKENS)
++ vxi->sched.tokens = data->tokens;
++ if (set_mask & VXSM_TOKENS_MIN)
++ vxi->sched.tokens_min = data->tokens_min;
++ if (set_mask & VXSM_TOKENS_MAX)
++ vxi->sched.tokens_max = data->tokens_max;
++ if (set_mask & VXSM_PRIO_BIAS)
++ vxi->sched.prio_bias = data->prio_bias;
++
++ /* Sanity check rate/interval */
++ for (i=0; i<2; i++) {
++ if (data->fill_rate[i] < 0)
++ data->fill_rate[i] = 0;
++ if (data->interval[i] <= 0)
++ data->interval[i] = HZ;
++ }
++
++ update_mask = vxi->sched.update_mask & VXSM_SET_MASK;
++ update_mask |= (set_mask & (VXSM_SET_MASK|VXSM_IDLE_TIME));
++ vxi->sched.update_mask = update_mask;
++#ifdef CONFIG_SMP
++ rmb();
++ if (set_mask & VXSM_CPU_ID)
++ vxi->sched.update = cpumask_of_cpu(data->cpu_id);
++ else
++ vxi->sched.update = CPU_MASK_ALL;
++ /* forced reload? */
++ if (set_mask & VXSM_FORCE) {
++ int cpu;
++
++ for_each_possible_cpu(cpu)
++ vx_update_sched_param(&vxi->sched,
++ &vx_per_cpu(vxi, sched_pc, cpu));
++ }
++#else
++ /* on UP we update immediately */
++ vx_update_sched_param(&vxi->sched,
++ &vx_per_cpu(vxi, sched_pc, 0));
++#endif
++
++ spin_unlock(&vxi->sched.tokens_lock);
++ return 0;
++}
++
++#define COPY_IDS(C) C(cpu_id); C(bucket_id)
++#define COPY_PRI(C) C(prio_bias)
++#define COPY_TOK(C) C(tokens); C(tokens_min); C(tokens_max)
++#define COPY_FRI(C) C(fill_rate[0]); C(interval[0]); \
++ C(fill_rate[1]); C(interval[1]);
++
++#define COPY_VALUE(name) vc_data.name = data->name
++
++static int do_set_sched_v4(struct vx_info *vxi, struct vcmd_set_sched_v4 *data)
++{
++ struct vcmd_sched_v5 vc_data;
++
++ vc_data.mask = data->set_mask;
++ COPY_IDS(COPY_VALUE);
++ COPY_PRI(COPY_VALUE);
++ COPY_TOK(COPY_VALUE);
++ vc_data.fill_rate[0] = vc_data.fill_rate[1] = data->fill_rate;
++ vc_data.interval[0] = vc_data.interval[1] = data->interval;
++ return do_set_sched(vxi, &vc_data);
++}
++
++#ifdef CONFIG_VSERVER_LEGACY
++
++#define COPY_MASK_V2(name, mask) \
++ if (vc_data.name != SCHED_KEEP) { \
++ vc_data_v4.name = vc_data.name; \
++ vc_data_v4.set_mask |= mask; \
++ }
++
++int vc_set_sched_v2(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_set_sched_v2 vc_data;
++ struct vcmd_set_sched_v4 vc_data_v4 = { .set_mask = 0 };
++
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ COPY_MASK_V2(fill_rate, VXSM_FILL_RATE);
++ COPY_MASK_V2(interval, VXSM_INTERVAL);
++ COPY_MASK_V2(tokens, VXSM_TOKENS);
++ COPY_MASK_V2(tokens_min, VXSM_TOKENS_MIN);
++ COPY_MASK_V2(tokens_max, VXSM_TOKENS_MAX);
++ vc_data_v4.bucket_id = 0;
++
++ do_set_sched_v4(vxi, &vc_data_v4);
++ return 0;
++}
++#endif
+
-+/*
-+ * recalculate the context's scheduling tokens
-+ *
-+ * ret > 0 : number of tokens available
-+ * ret = 0 : context is paused
-+ * ret < 0 : number of jiffies until new tokens arrive
-+ *
-+ */
-+int vx_tokens_recalc(struct vx_info *vxi)
++int vc_set_sched_v3(struct vx_info *vxi, void __user *data)
+{
-+ long delta, tokens = 0;
++ struct vcmd_set_sched_v3 vc_data;
++ struct vcmd_set_sched_v4 vc_data_v4;
+
-+ if (vx_info_flags(vxi, VXF_SCHED_PAUSE, 0))
-+ /* we are paused */
-+ return 0;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
+
-+ delta = jiffies - vxi->sched.jiffies;
++ /* structures are binary compatible */
++ memcpy(&vc_data_v4, &vc_data, sizeof(vc_data));
++ vc_data_v4.set_mask &= VXSM_V3_MASK;
++ vc_data_v4.bucket_id = 0;
+
-+ if (delta >= vxi->sched.interval) {
-+ /* lockdown scheduler info */
-+ spin_lock(&vxi->sched.tokens_lock);
++ return do_set_sched_v4(vxi, &vc_data_v4);
++}
+
-+ /* calc integral token part */
-+ delta = jiffies - vxi->sched.jiffies;
-+ tokens = delta / vxi->sched.interval;
-+ delta = tokens * vxi->sched.interval;
-+ tokens *= vxi->sched.fill_rate;
-+
-+ atomic_add(tokens, &vxi->sched.tokens);
-+ vxi->sched.jiffies += delta;
-+ tokens = atomic_read(&vxi->sched.tokens);
-+
-+ if (tokens > vxi->sched.tokens_max) {
-+ tokens = vxi->sched.tokens_max;
-+ atomic_set(&vxi->sched.tokens, tokens);
-+ }
-+ spin_unlock(&vxi->sched.tokens_lock);
-+ } else {
-+ /* no new tokens */
-+ tokens = vx_tokens_avail(vxi);
-+ if (tokens <= 0)
-+ vxi->vx_state |= VXS_ONHOLD;
-+ if (tokens < vxi->sched.tokens_min) {
-+ /* enough tokens will be available in */
-+ if (vxi->sched.tokens_min == 0)
-+ return delta - vxi->sched.interval;
-+ return delta - vxi->sched.interval *
-+ vxi->sched.tokens_min / vxi->sched.fill_rate;
-+ }
-+ }
++int vc_set_sched_v4(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_set_sched_v4 vc_data;
+
-+ /* we have some tokens left */
-+ if (vx_info_state(vxi, VXS_ONHOLD) &&
-+ (tokens >= vxi->sched.tokens_min))
-+ vxi->vx_state &= ~VXS_ONHOLD;
-+ if (vx_info_state(vxi, VXS_ONHOLD))
-+ tokens -= vxi->sched.tokens_min;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
+
-+ return tokens;
++ return do_set_sched_v4(vxi, &vc_data);
+}
+
-+/*
-+ * 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.
-+ */
-+int vx_effective_vavavoom(struct vx_info *vxi, int max_prio)
++ /* latest interface is v5 */
++
++int vc_set_sched(struct vx_info *vxi, void __user *data)
+{
-+ int vavavoom, max;
++ struct vcmd_sched_v5 vc_data;
+
-+ /* lots of tokens = lots of vavavoom
-+ * no tokens = no vavavoom */
-+ if ((vavavoom = atomic_read(&vxi->sched.tokens)) >= 0) {
-+ max = vxi->sched.tokens_max;
-+ vavavoom = max - vavavoom;
-+ max = max * max;
-+ vavavoom = max_prio * VAVAVOOM_RATIO / 100
-+ * (vavavoom*vavavoom - (max >> 2)) / max;
-+ } else
-+ vavavoom = 0;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
+
-+ vxi->sched.vavavoom = vavavoom;
-+ return vavavoom + vxi->sched.priority_bias;
++ return do_set_sched(vxi, &vc_data);
+}
+
+
-+int vc_set_sched_v2(uint32_t xid, void __user *data)
++int vc_get_sched(struct vx_info *vxi, void __user *data)
+{
-+ struct vcmd_set_sched_v2 vc_data;
-+ struct vx_info *vxi;
++ struct vcmd_sched_v5 vc_data;
+
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ vxi = lookup_vx_info(xid);
-+ if (!vxi)
-+ return -EINVAL;
++ if (vc_data.mask & VXSM_CPU_ID) {
++ int cpu = vc_data.cpu_id;
++ struct _vx_sched_pc *data;
+
-+ spin_lock(&vxi->sched.tokens_lock);
++ if (!cpu_possible(cpu))
++ return -EINVAL;
+
-+ if (vc_data.interval != SCHED_KEEP)
-+ vxi->sched.interval = vc_data.interval;
-+ if (vc_data.fill_rate != SCHED_KEEP)
-+ vxi->sched.fill_rate = vc_data.fill_rate;
-+ if (vc_data.tokens_min != SCHED_KEEP)
-+ vxi->sched.tokens_min = vc_data.tokens_min;
-+ if (vc_data.tokens_max != SCHED_KEEP)
-+ vxi->sched.tokens_max = vc_data.tokens_max;
-+ if (vc_data.tokens != SCHED_KEEP)
-+ atomic_set(&vxi->sched.tokens, vc_data.tokens);
-+
-+ /* Sanity check the resultant values */
-+ if (vxi->sched.fill_rate <= 0)
-+ vxi->sched.fill_rate = 1;
-+ if (vxi->sched.interval <= 0)
-+ vxi->sched.interval = HZ;
-+ if (vxi->sched.tokens_max == 0)
-+ vxi->sched.tokens_max = 1;
-+ if (atomic_read(&vxi->sched.tokens) > vxi->sched.tokens_max)
-+ atomic_set(&vxi->sched.tokens, vxi->sched.tokens_max);
-+ if (vxi->sched.tokens_min > vxi->sched.tokens_max)
-+ vxi->sched.tokens_min = vxi->sched.tokens_max;
++ data = &vx_per_cpu(vxi, sched_pc, cpu);
++ COPY_TOK(COPY_VALUE);
++ COPY_PRI(COPY_VALUE);
++ COPY_FRI(COPY_VALUE);
+
-+ spin_unlock(&vxi->sched.tokens_lock);
-+ put_vx_info(vxi);
++ if (data->flags & VXSF_IDLE_TIME)
++ vc_data.mask |= VXSM_IDLE_TIME;
++ } else {
++ struct _vx_sched *data = &vxi->sched;
++
++ COPY_TOK(COPY_VALUE);
++ COPY_PRI(COPY_VALUE);
++ COPY_FRI(COPY_VALUE);
++ }
++
++ if (vc_data.mask & VXSM_MSEC) {
++ vc_data.interval[0] = ticks_to_msec(vc_data.interval[0]);
++ vc_data.interval[1] = ticks_to_msec(vc_data.interval[1]);
++ }
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
+ return 0;
+}
+
+
-+int vc_set_sched(uint32_t xid, void __user *data)
++int vc_sched_info(struct vx_info *vxi, void __user *data)
+{
-+ struct vcmd_set_sched_v3 vc_data;
-+ struct vx_info *vxi;
-+ unsigned int set_mask;
++ struct vcmd_sched_info vc_data;
++ int cpu;
+
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ vxi = lookup_vx_info(xid);
-+ if (!vxi)
++ cpu = vc_data.cpu_id;
++ if (!cpu_possible(cpu))
+ return -EINVAL;
+
-+ set_mask = vc_data.set_mask;
-+
-+ spin_lock(&vxi->sched.tokens_lock);
-+
-+ if (set_mask & VXSM_FILL_RATE)
-+ vxi->sched.fill_rate = vc_data.fill_rate;
-+ if (set_mask & VXSM_INTERVAL)
-+ vxi->sched.interval = vc_data.interval;
-+ if (set_mask & VXSM_TOKENS)
-+ atomic_set(&vxi->sched.tokens, vc_data.tokens);
-+ if (set_mask & VXSM_TOKENS_MIN)
-+ vxi->sched.tokens_min = vc_data.tokens_min;
-+ if (set_mask & VXSM_TOKENS_MAX)
-+ vxi->sched.tokens_max = vc_data.tokens_max;
-+ if (set_mask & VXSM_PRIO_BIAS)
-+ vxi->sched.priority_bias = vc_data.priority_bias;
++ if (vxi) {
++ struct _vx_sched_pc *sched_pc =
++ &vx_per_cpu(vxi, sched_pc, cpu);
+
-+ /* Sanity check the resultant values */
-+ if (vxi->sched.fill_rate <= 0)
-+ vxi->sched.fill_rate = 1;
-+ if (vxi->sched.interval <= 0)
-+ vxi->sched.interval = HZ;
-+ if (vxi->sched.tokens_max == 0)
-+ vxi->sched.tokens_max = 1;
-+ if (atomic_read(&vxi->sched.tokens) > vxi->sched.tokens_max)
-+ atomic_set(&vxi->sched.tokens, vxi->sched.tokens_max);
-+ if (vxi->sched.tokens_min > vxi->sched.tokens_max)
-+ vxi->sched.tokens_min = vxi->sched.tokens_max;
-+ if (vxi->sched.priority_bias > MAX_PRIO_BIAS)
-+ vxi->sched.priority_bias = MAX_PRIO_BIAS;
-+ if (vxi->sched.priority_bias < MIN_PRIO_BIAS)
-+ vxi->sched.priority_bias = MIN_PRIO_BIAS;
++ vc_data.user_msec = ticks_to_msec(sched_pc->user_ticks);
++ vc_data.sys_msec = ticks_to_msec(sched_pc->sys_ticks);
++ vc_data.hold_msec = ticks_to_msec(sched_pc->hold_ticks);
++ vc_data.vavavoom = sched_pc->vavavoom;
++ }
++ vc_data.token_usec = ticks_to_usec(1);
+
-+ spin_unlock(&vxi->sched.tokens_lock);
-+ put_vx_info(vxi);
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
+ return 0;
+}
+
---- linux-2.6.18.5/kernel/vserver/sched_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/sched_init.h 2006-11-06 05:08:58 +0100
-@@ -0,0 +1,33 @@
+--- linux-2.6.20/kernel/vserver/sched_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/sched_init.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,50 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
+{
+ static struct lock_class_key tokens_lock_key;
-+ int i;
+
+ /* scheduling; hard code starting values as constants */
-+ sched->fill_rate = 1;
-+ sched->interval = 4;
++ sched->fill_rate[0] = 1;
++ sched->interval[0] = 4;
++ sched->fill_rate[1] = 1;
++ sched->interval[1] = 8;
++ sched->tokens = HZ >> 2;
+ sched->tokens_min = HZ >> 4;
+ sched->tokens_max = HZ >> 1;
-+ sched->jiffies = jiffies;
+ sched->tokens_lock = SPIN_LOCK_UNLOCKED;
++ sched->prio_bias = 0;
+
+ lockdep_set_class(&sched->tokens_lock, &tokens_lock_key);
++}
+
-+ atomic_set(&sched->tokens, HZ >> 2);
-+ sched->cpus_allowed = CPU_MASK_ALL;
-+ sched->priority_bias = 0;
-+ sched->vavavoom = 0;
-+
-+ for_each_possible_cpu(i) {
-+ sched->cpu[i].user_ticks = 0;
-+ sched->cpu[i].sys_ticks = 0;
-+ sched->cpu[i].hold_ticks = 0;
-+ }
++static inline
++void vx_info_init_sched_pc(struct _vx_sched_pc *sched_pc, int cpu)
++{
++ sched_pc->fill_rate[0] = 1;
++ sched_pc->interval[0] = 4;
++ sched_pc->fill_rate[1] = 1;
++ sched_pc->interval[1] = 8;
++ sched_pc->tokens = HZ >> 2;
++ sched_pc->tokens_min = HZ >> 4;
++ sched_pc->tokens_max = HZ >> 1;
++ sched_pc->prio_bias = 0;
++ sched_pc->vavavoom = 0;
++ sched_pc->token_time = 0;
++ sched_pc->idle_time = 0;
++ sched_pc->norm_time = jiffies;
++
++ sched_pc->user_ticks = 0;
++ sched_pc->sys_ticks = 0;
++ sched_pc->hold_ticks = 0;
+}
+
+static inline void vx_info_exit_sched(struct _vx_sched *sched)
@@ -19533,60 +24369,89 @@
+ return;
+}
+
---- linux-2.6.18.5/kernel/vserver/sched_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/sched_proc.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,40 @@
++static inline
++void vx_info_exit_sched_pc(struct _vx_sched_pc *sched_pc, int cpu)
++{
++ return;
++}
+--- linux-2.6.20/kernel/vserver/sched_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/sched_proc.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,62 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
+
+
-+static inline int vx_info_proc_sched(struct _vx_sched *sched, char *buffer)
++static inline
++int vx_info_proc_sched(struct _vx_sched *sched, char *buffer)
+{
+ int length = 0;
-+ int i;
+
+ length += sprintf(buffer,
-+ "Token:\t\t%8d\n"
-+ "FillRate:\t%8d\n"
-+ "Interval:\t%8d\n"
++ "FillRate:\t%8d,%d\n"
++ "Interval:\t%8d,%d\n"
+ "TokensMin:\t%8d\n"
+ "TokensMax:\t%8d\n"
+ "PrioBias:\t%8d\n"
-+ "VaVaVoom:\t%8d\n"
-+ ,atomic_read(&sched->tokens)
-+ ,sched->fill_rate
-+ ,sched->interval
++ ,sched->fill_rate[0]
++ ,sched->fill_rate[1]
++ ,sched->interval[0]
++ ,sched->interval[1]
+ ,sched->tokens_min
+ ,sched->tokens_max
-+ ,sched->priority_bias
-+ ,sched->vavavoom
++ ,sched->prio_bias
+ );
++ return length;
++}
+
-+ for_each_online_cpu(i) {
-+ length += sprintf(buffer + length,
-+ "cpu %d: %lld %lld %lld\n"
-+ ,i
-+ ,(long long)sched->cpu[i].user_ticks
-+ ,(long long)sched->cpu[i].sys_ticks
-+ ,(long long)sched->cpu[i].hold_ticks
-+ );
-+ }
++static inline
++int vx_info_proc_sched_pc(struct _vx_sched_pc *sched_pc,
++ char *buffer, int cpu)
++{
++ int length = 0;
+
++ length += sprintf(buffer + length,
++ "cpu %d: %lld %lld %lld %ld %ld"
++ ,cpu
++ ,(unsigned long long)sched_pc->user_ticks
++ ,(unsigned long long)sched_pc->sys_ticks
++ ,(unsigned long long)sched_pc->hold_ticks
++ ,sched_pc->token_time
++ ,sched_pc->idle_time
++ );
++ length += sprintf(buffer + length,
++ " %c%c %d %d %d %d/%d %d/%d"
++ ,(sched_pc->flags & VXSF_ONHOLD) ? 'H' : 'R'
++ ,(sched_pc->flags & VXSF_IDLE_TIME) ? 'I' : '-'
++ ,sched_pc->tokens
++ ,sched_pc->tokens_min
++ ,sched_pc->tokens_max
++ ,sched_pc->fill_rate[0]
++ ,sched_pc->interval[0]
++ ,sched_pc->fill_rate[1]
++ ,sched_pc->interval[1]
++ );
++ length += sprintf(buffer + length,
++ " %d %d\n"
++ ,sched_pc->prio_bias
++ ,sched_pc->vavavoom
++ );
+ return length;
+}
+
+#endif /* _VX_SCHED_PROC_H */
---- linux-2.6.18.5/kernel/vserver/signal.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/signal.c 2006-11-06 05:08:58 +0100
-@@ -0,0 +1,139 @@
+--- linux-2.6.20/kernel/vserver/signal.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/signal.c 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,134 @@
+/*
+ * linux/kernel/vserver/signal.c
+ *
+ * Virtual Server: Signal Support
+ *
-+ * Copyright (C) 2003-2005 Herbert Pötzl
++ * Copyright (C) 2003-2007 Herbert Pötzl
+ *
+ * V0.01 broken out from vcontext V0.05
++ * V0.02 changed vcmds to vxi arg
++ * V0.03 adjusted siginfo for kill
+ *
+ */
+
@@ -19603,7 +24468,7 @@
+{
+ int retval, count=0;
+ struct task_struct *p;
-+ unsigned long priv = 0;
++ struct siginfo *sip = SEND_SIG_PRIV;
+
+ retval = -ESRCH;
+ vxdprintk(VXD_CBIT(misc, 4),
@@ -19612,7 +24477,6 @@
+ read_lock(&tasklist_lock);
+ switch (pid) {
+ case 0:
-+ priv = 1;
+ case -1:
+ for_each_process(p) {
+ int err = 0;
@@ -19621,7 +24485,7 @@
+ (pid && vxi->vx_initpid == p->pid))
+ continue;
+
-+ err = group_send_sig_info(sig, (void*)priv, p);
++ err = group_send_sig_info(sig, sip, p);
+ ++count;
+ if (err != -EPERM)
+ retval = err;
@@ -19631,43 +24495,43 @@
+ case 1:
+ if (vxi->vx_initpid) {
+ pid = vxi->vx_initpid;
-+ priv = 1;
++ /* for now, only SIGINT to private init ... */
++ if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) &&
++ /* ... as long as there are tasks left */
++ (atomic_read(&vxi->vx_tasks) > 1))
++ sig = SIGINT;
+ }
+ /* fallthrough */
+ default:
+ p = find_task_by_real_pid(pid);
+ if (p) {
+ if (vx_task_xid(p) == vxi->vx_id)
-+ retval = group_send_sig_info(sig,
-+ (void*)priv, p);
++ retval = group_send_sig_info(sig, sip, p);
+ }
+ break;
+ }
+ read_unlock(&tasklist_lock);
+ vxdprintk(VXD_CBIT(misc, 4),
-+ "vx_info_kill(%p[#%d],%d,%d) = %d",
-+ vxi, vxi->vx_id, pid, sig, retval);
++ "vx_info_kill(%p[#%d],%d,%d,%ld) = %d",
++ vxi, vxi->vx_id, pid, sig, (long)sip, retval);
+ return retval;
+}
+
-+int vc_ctx_kill(uint32_t id, void __user *data)
++int vc_ctx_kill(struct vx_info *vxi, void __user *data)
+{
-+ int retval;
+ struct vcmd_ctx_kill_v0 vc_data;
-+ struct vx_info *vxi;
+
-+ if (!vx_check(0, VX_ADMIN))
-+ return -ENOSYS;
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+
-+ vxi = lookup_vx_info(id);
-+ if (!vxi)
-+ return -ESRCH;
++ /* special check to allow guest shutdown */
++ if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) &&
++ /* forbid killall pid=0 when init is present */
++ (((vc_data.pid < 1) && vxi->vx_initpid) ||
++ (vc_data.pid > 1)))
++ return -EACCES;
+
-+ retval = vx_info_kill(vxi, vc_data.pid, vc_data.sig);
-+ put_vx_info(vxi);
-+ return retval;
++ return vx_info_kill(vxi, vc_data.pid, vc_data.sig);
+}
+
+
@@ -19676,57 +24540,329 @@
+ DECLARE_WAITQUEUE(wait, current);
+ int ret = 0;
+
-+ add_wait_queue(&vxi->vx_wait, &wait);
-+ set_current_state(TASK_INTERRUPTIBLE);
++ add_wait_queue(&vxi->vx_wait, &wait);
++ set_current_state(TASK_INTERRUPTIBLE);
++
++wait:
++ if (vx_info_state(vxi,
++ VXS_SHUTDOWN|VXS_HASHED|VXS_HELPER) == VXS_SHUTDOWN)
++ goto out;
++ if (signal_pending(current)) {
++ ret = -ERESTARTSYS;
++ goto out;
++ }
++ schedule();
++ goto wait;
++
++out:
++ set_current_state(TASK_RUNNING);
++ remove_wait_queue(&vxi->vx_wait, &wait);
++ return ret;
++}
++
++
++
++int vc_wait_exit(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_wait_exit_v0 vc_data;
++ int ret;
++
++ ret = __wait_exit(vxi);
++ vc_data.reboot_cmd = vxi->reboot_cmd;
++ vc_data.exit_code = vxi->exit_code;
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ ret = -EFAULT;
++ return ret;
++}
++
+--- linux-2.6.20/kernel/vserver/space.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/space.c 2007-02-06 05:32:00 +0100
+@@ -0,0 +1,275 @@
++/*
++ * linux/kernel/vserver/space.c
++ *
++ * Virtual Server: Context Space Support
++ *
++ * Copyright (C) 2003-2006 Herbert Pötzl
++ *
++ * V0.01 broken out from context.c 0.07
++ * V0.02 added task locking for namespace
++ * V0.03 broken out vx_enter_namespace
++ * V0.04 added *space support and commands
++ *
++ */
++
++#include <linux/utsname.h>
++#include <linux/sched.h>
++#include <linux/vs_context.h>
++#include <linux/vserver/space.h>
++#include <linux/vserver/space_cmd.h>
++#include <linux/dcache.h>
++#include <linux/mount.h>
++#include <linux/nsproxy.h>
++#include <linux/fs.h>
++
++#include <asm/errno.h>
++#include <asm/uaccess.h>
++
++
++atomic_t vs_global_nsproxy = ATOMIC_INIT(0);
++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);
++
++
++/* namespace functions */
++
++#include <linux/mnt_namespace.h>
++
++const struct vcmd_space_mask space_mask = {
++ .mask = CLONE_NEWNS |
++ CLONE_NEWUTS |
++ CLONE_NEWIPC |
++ CLONE_FS
++};
++
++
++/*
++ * build a new nsproxy mix
++ * assumes that both proxies are 'const'
++ * does not touch nsproxy refcounts
++ * will hold a reference on the result.
++ */
++
++struct nsproxy *vs_mix_nsproxy(struct nsproxy *old_nsproxy,
++ struct nsproxy *new_nsproxy, unsigned long mask)
++{
++ struct mnt_namespace *old_ns;
++ struct uts_namespace *old_uts;
++ struct ipc_namespace *old_ipc;
++ struct nsproxy *nsproxy;
++
++ nsproxy = dup_namespaces(old_nsproxy);
++ if (!nsproxy)
++ goto out;
++
++ if (mask & CLONE_NEWNS) {
++ old_ns = nsproxy->mnt_ns;
++ nsproxy->mnt_ns = new_nsproxy->mnt_ns;
++ if (nsproxy->mnt_ns)
++ get_mnt_ns(nsproxy->mnt_ns);
++ } else
++ old_ns = NULL;
++
++ if (mask & CLONE_NEWUTS) {
++ old_uts = nsproxy->uts_ns;
++ nsproxy->uts_ns = new_nsproxy->uts_ns;
++ if (nsproxy->uts_ns)
++ get_uts_ns(nsproxy->uts_ns);
++ } else
++ old_uts = NULL;
++
++ if (mask & CLONE_NEWIPC) {
++ old_ipc = nsproxy->ipc_ns;
++ nsproxy->ipc_ns = new_nsproxy->ipc_ns;
++ if (nsproxy->ipc_ns)
++ get_ipc_ns(nsproxy->ipc_ns);
++ } else
++ old_ipc = NULL;
++
++ if (old_ns)
++ put_mnt_ns(old_ns);
++ if (old_uts)
++ put_uts_ns(old_uts);
++ if (old_ipc)
++ put_ipc_ns(old_ipc);
++out:
++ return nsproxy;
++}
++
++
++/*
++ * merge two nsproxy structs into a new one.
++ * will hold a reference on the result.
++ */
++
++static inline
++struct nsproxy * __vs_merge_nsproxy(struct nsproxy *old,
++ struct nsproxy *proxy, unsigned long mask)
++{
++ struct nsproxy null_proxy = { .mnt_ns = NULL };
++
++ if (!proxy)
++ return NULL;
++
++ if (mask)
++ return vs_mix_nsproxy(old ? old : &null_proxy,
++ proxy, mask);
++ 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))
++ return old;
++
++ if (!fs)
++ return NULL;
++
++ return copy_fs_struct(fs);
++}
++
++
++int vx_enter_space(struct vx_info *vxi, unsigned long mask)
++{
++ struct nsproxy *proxy, *proxy_cur, *proxy_new;
++ struct fs_struct *fs, *fs_cur, *fs_new;
++ int ret;
++
++ if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0))
++ return -EACCES;
++
++ if (!mask)
++ mask = vxi->vx_nsmask;
++
++ if ((mask & vxi->vx_nsmask) != mask)
++ return -EINVAL;
++
++ proxy = vxi->vx_nsproxy;
++ fs = vxi->vx_fs;
++
++ task_lock(current);
++ fs_cur = current->fs;
++ atomic_inc(&fs_cur->count);
++ 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;
++ }
++
++ proxy_new = __vs_merge_nsproxy(proxy_cur, proxy, mask);
++ if (IS_ERR(proxy_new)) {
++ ret = PTR_ERR(proxy_new);
++ goto out_put_fs;
++ }
++
++ 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)
++{
++ struct nsproxy *proxy_vxi, *proxy_cur, *proxy_new;
++ struct fs_struct *fs_vxi, *fs_cur, *fs_new;
++ int ret;
++
++ if (!mask)
++ mask = space_mask.mask;
++
++ if ((mask & space_mask.mask) != mask)
++ return -EINVAL;
++
++ proxy_vxi = vxi->vx_nsproxy;
++ fs_vxi = vxi->vx_fs;
+
-+wait:
-+ if (vx_info_state(vxi,
-+ VXS_SHUTDOWN|VXS_HASHED|VXS_HELPER) == VXS_SHUTDOWN)
-+ goto out;
-+ if (signal_pending(current)) {
-+ ret = -ERESTARTSYS;
-+ goto out;
++ task_lock(current);
++ fs_cur = current->fs;
++ atomic_inc(&fs_cur->count);
++ 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;
+ }
-+ schedule();
-+ goto wait;
+
-+out:
-+ set_current_state(TASK_RUNNING);
-+ remove_wait_queue(&vxi->vx_wait, &wait);
++ proxy_new = __vs_merge_nsproxy(proxy_vxi, proxy_cur, mask);
++ if (IS_ERR(proxy_new)) {
++ ret = PTR_ERR(proxy_new);
++ goto out_put_fs;
++ }
++
++ fs_new = xchg(&vxi->vx_fs, fs_new);
++ proxy_new = xchg(&vxi->vx_nsproxy, proxy_new);
++ vxi->vx_nsmask |= 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;
+}
+
+
++int vc_enter_space(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_space_mask vc_data = { .mask = 0 };
++
++ if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
+
-+int vc_wait_exit(uint32_t id, void __user *data)
++ return vx_enter_space(vxi, vc_data.mask);
++}
++
++int vc_set_space(struct vx_info *vxi, void __user *data)
+{
-+ struct vx_info *vxi;
-+ struct vcmd_wait_exit_v0 vc_data;
-+ int ret;
++ struct vcmd_space_mask vc_data = { .mask = 0 };
+
-+ vxi = lookup_vx_info(id);
-+ if (!vxi)
-+ return -ESRCH;
++ if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
+
-+ ret = __wait_exit(vxi);
-+ vc_data.reboot_cmd = vxi->reboot_cmd;
-+ vc_data.exit_code = vxi->exit_code;
-+ put_vx_info(vxi);
++ return vx_set_space(vxi, vc_data.mask);
++}
+
-+ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
-+ ret = -EFAULT;
-+ return ret;
++int vc_get_space_mask(struct vx_info *vxi, void __user *data)
++{
++ if (copy_to_user(data, &space_mask, sizeof(space_mask)))
++ return -EFAULT;
++ return 0;
+}
+
---- linux-2.6.18.5/kernel/vserver/switch.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/switch.c 2006-11-06 05:08:58 +0100
-@@ -0,0 +1,268 @@
+--- linux-2.6.20/kernel/vserver/switch.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/switch.c 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,527 @@
+/*
+ * linux/kernel/vserver/switch.c
+ *
+ * Virtual Server: Syscall Switch
+ *
-+ * Copyright (C) 2003-2005 Herbert Pötzl
++ * Copyright (C) 2003-2006 Herbert Pötzl
+ *
+ * V0.01 syscall switch
+ * V0.02 added signal to context
@@ -19734,6 +24870,8 @@
+ * V0.04 added iattr, task/xid functions
+ * V0.05 added debug/history stuff
+ * V0.06 added compat32 layer
++ * V0.07 vcmd args and perms
++ * V0.08 added status commands
+ *
+ */
+
@@ -19742,10 +24880,11 @@
+#include <linux/compat.h>
+#include <asm/errno.h>
+
-+#include <linux/vserver/network.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
+#include <linux/vserver/switch.h>
-+#include <linux/vserver/debug.h>
+
++#include "vci_config.h"
+
+static inline
+int vc_get_version(uint32_t id)
@@ -19757,8 +24896,15 @@
+ return VCI_VERSION;
+}
+
++static inline
++int vc_get_vci(uint32_t id)
++{
++ return vci_kernel_config();
++}
++
+#include <linux/vserver/context_cmd.h>
+#include <linux/vserver/cvirt_cmd.h>
++#include <linux/vserver/cacct_cmd.h>
+#include <linux/vserver/limit_cmd.h>
+#include <linux/vserver/network_cmd.h>
+#include <linux/vserver/sched_cmd.h>
@@ -19766,7 +24912,7 @@
+#include <linux/vserver/inode_cmd.h>
+#include <linux/vserver/dlimit_cmd.h>
+#include <linux/vserver/signal_cmd.h>
-+#include <linux/vserver/namespace_cmd.h>
++#include <linux/vserver/space_cmd.h>
+
+#include <linux/vserver/legacy.h>
+#include <linux/vserver/inode.h>
@@ -19783,118 +24929,110 @@
+
+
+static inline
-+long do_vserver(uint32_t cmd, uint32_t id, void __user *data, int compat)
++long do_vcmd(uint32_t cmd, uint32_t id,
++ struct vx_info *vxi, struct nx_info *nxi,
++ void __user *data, int compat)
+{
-+ vxdprintk(VXD_CBIT(switch, 0),
-+ "vc: VCMD_%02d_%d[%d], %d,%p,%d",
-+ VC_CATEGORY(cmd), VC_COMMAND(cmd),
-+ VC_VERSION(cmd), id, data, compat);
-+
-+#ifdef CONFIG_VSERVER_LEGACY
-+ if (!capable(CAP_CONTEXT) &&
-+ /* dirty hack for capremove */
-+ !(cmd==VCMD_new_s_context && id==-2))
-+ return -EPERM;
-+#else
-+ if (!capable(CAP_CONTEXT))
-+ return -EPERM;
-+#endif
-+
+ switch (cmd) {
++
+ case VCMD_get_version:
+ return vc_get_version(id);
-+
-+ case VCMD_dump_history:
-+#ifdef CONFIG_VSERVER_HISTORY
-+ return vc_dump_history(id);
-+#else
-+ return -ENOSYS;
-+#endif
-+
-+#ifdef CONFIG_VSERVER_LEGACY
-+ case VCMD_new_s_context:
-+ return vc_new_s_context(id, data);
-+#endif
-+#ifdef CONFIG_VSERVER_LEGACYNET
-+ case VCMD_set_ipv4root:
-+ return vc_set_ipv4root(id, data);
-+#endif
++ case VCMD_get_vci:
++ return vc_get_vci(id);
+
+ case VCMD_task_xid:
+ return vc_task_xid(id, data);
+ case VCMD_vx_info:
-+ return vc_vx_info(id, data);
++ return vc_vx_info(vxi, data);
+
+ case VCMD_task_nid:
+ return vc_task_nid(id, data);
+ case VCMD_nx_info:
-+ return vc_nx_info(id, data);
-+
-+ case VCMD_set_namespace_v0:
-+ return vc_set_namespace(-1, data);
-+ case VCMD_set_namespace:
-+ return vc_set_namespace(id, data);
-+ }
++ return vc_nx_info(nxi, data);
+
-+ /* those are allowed while in setup too */
-+ if (!vx_check(0, VX_ADMIN|VX_WATCH) &&
-+ !vx_flags(VXF_STATE_SETUP,0))
-+ return -EPERM;
++ case VCMD_set_space_v0:
++ /* this is version 1 */
++ case VCMD_set_space:
++ return vc_set_space(vxi, data);
+
-+#ifdef CONFIG_VSERVER_LEGACY
-+ switch (cmd) {
-+ case VCMD_set_cflags:
-+ case VCMD_set_ccaps:
-+ if (vx_check(0, VX_WATCH))
-+ return 0;
-+ }
-+#endif
++ case VCMD_get_space_mask:
++ return vc_get_space_mask(vxi, data);
+
-+ switch (cmd) {
+#ifdef CONFIG_IA32_EMULATION
+ case VCMD_get_rlimit:
-+ return __COMPAT(vc_get_rlimit, id, data, compat);
++ return __COMPAT(vc_get_rlimit, vxi, data, compat);
+ case VCMD_set_rlimit:
-+ return __COMPAT(vc_set_rlimit, id, data, compat);
++ return __COMPAT(vc_set_rlimit, vxi, data, compat);
+#else
+ case VCMD_get_rlimit:
-+ return vc_get_rlimit(id, data);
++ return vc_get_rlimit(vxi, data);
+ case VCMD_set_rlimit:
-+ return vc_set_rlimit(id, data);
++ return vc_set_rlimit(vxi, data);
+#endif
+ case VCMD_get_rlimit_mask:
+ return vc_get_rlimit_mask(id, data);
++ case VCMD_reset_minmax:
++ return vc_reset_minmax(vxi, data);
+
+ case VCMD_get_vhi_name:
-+ return vc_get_vhi_name(id, data);
++ return vc_get_vhi_name(vxi, data);
+ case VCMD_set_vhi_name:
-+ return vc_set_vhi_name(id, data);
++ return vc_set_vhi_name(vxi, data);
++
++ case VCMD_ctx_stat:
++ return vc_ctx_stat(vxi, data);
++ case VCMD_virt_stat:
++ return vc_virt_stat(vxi, data);
++ case VCMD_sock_stat:
++ return vc_sock_stat(vxi, data);
++ case VCMD_rlimit_stat:
++ return vc_rlimit_stat(vxi, data);
+
+ case VCMD_set_cflags:
-+ return vc_set_cflags(id, data);
++ return vc_set_cflags(vxi, data);
+ case VCMD_get_cflags:
-+ return vc_get_cflags(id, data);
++ return vc_get_cflags(vxi, data);
+
++ case VCMD_set_ccaps_v0:
++ return vc_set_ccaps_v0(vxi, data);
++ /* this is version 1 */
+ case VCMD_set_ccaps:
-+ return vc_set_ccaps(id, data);
++ return vc_set_ccaps(vxi, data);
++ case VCMD_get_ccaps_v0:
++ return vc_get_ccaps_v0(vxi, data);
++ /* this is version 1 */
+ case VCMD_get_ccaps:
-+ return vc_get_ccaps(id, data);
++ return vc_get_ccaps(vxi, data);
++ case VCMD_set_bcaps:
++ return vc_set_bcaps(vxi, data);
++ case VCMD_get_bcaps:
++ return vc_get_bcaps(vxi, data);
+
+ case VCMD_set_nflags:
-+ return vc_set_nflags(id, data);
++ return vc_set_nflags(nxi, data);
+ case VCMD_get_nflags:
-+ return vc_get_nflags(id, data);
++ return vc_get_nflags(nxi, data);
+
+ case VCMD_set_ncaps:
-+ return vc_set_ncaps(id, data);
++ return vc_set_ncaps(nxi, data);
+ case VCMD_get_ncaps:
-+ return vc_get_ncaps(id, data);
++ return vc_get_ncaps(nxi, data);
+
++#ifdef CONFIG_VSERVER_LEGACY
+ case VCMD_set_sched_v2:
-+ return vc_set_sched_v2(id, data);
-+ /* this is version 3 */
++ return vc_set_sched_v2(vxi, data);
++#endif
++ case VCMD_set_sched_v3:
++ return vc_set_sched_v3(vxi, data);
++ case VCMD_set_sched_v4:
++ return vc_set_sched_v4(vxi, data);
++ /* this is version 5 */
+ case VCMD_set_sched:
-+ return vc_set_sched(id, data);
++ return vc_set_sched(vxi, data);
++ case VCMD_get_sched:
++ return vc_get_sched(vxi, data);
++ case VCMD_sched_info:
++ return vc_sched_info(vxi, data);
+
+ case VCMD_add_dlimit:
+ return __COMPAT(vc_add_dlimit, id, data, compat);
@@ -19904,24 +25042,16 @@
+ return __COMPAT(vc_set_dlimit, id, data, compat);
+ case VCMD_get_dlimit:
+ return __COMPAT(vc_get_dlimit, id, data, compat);
-+ }
-+
-+ /* below here only with VX_ADMIN */
-+ if (!vx_check(0, VX_ADMIN|VX_WATCH))
-+ return -EPERM;
+
-+ switch (cmd) {
+ case VCMD_ctx_kill:
-+ return vc_ctx_kill(id, data);
++ return vc_ctx_kill(vxi, data);
+
+ case VCMD_wait_exit:
-+ return vc_wait_exit(id, data);
++ return vc_wait_exit(vxi, data);
+
-+ case VCMD_create_context:
+#ifdef CONFIG_VSERVER_LEGACY
++ case VCMD_create_context:
+ return vc_ctx_create(id, NULL);
-+#else
-+ return -ENOSYS;
+#endif
+
+ case VCMD_get_iattr:
@@ -19929,69 +25059,334 @@
+ case VCMD_set_iattr:
+ return __COMPAT(vc_set_iattr, id, data, compat);
+
-+ case VCMD_enter_namespace:
-+ return vc_enter_namespace(id, data);
++ case VCMD_enter_space_v0:
++ return vc_enter_space(vxi, NULL);
++ /* this is version 1 */
++ case VCMD_enter_space:
++ return vc_enter_space(vxi, data);
+
+ case VCMD_ctx_create_v0:
-+#ifdef CONFIG_VSERVER_LEGACY
-+ if (id == 1) {
-+ current->xid = 1;
-+ return 1;
-+ }
-+#endif
+ return vc_ctx_create(id, NULL);
+ case VCMD_ctx_create:
+ return vc_ctx_create(id, data);
+ case VCMD_ctx_migrate_v0:
-+ return vc_ctx_migrate(id, NULL);
++ return vc_ctx_migrate(vxi, NULL);
+ case VCMD_ctx_migrate:
-+ return vc_ctx_migrate(id, data);
++ return vc_ctx_migrate(vxi, data);
+
+ case VCMD_net_create_v0:
+ return vc_net_create(id, NULL);
+ case VCMD_net_create:
+ return vc_net_create(id, data);
+ case VCMD_net_migrate:
-+ return vc_net_migrate(id, data);
++ return vc_net_migrate(nxi, data);
+ case VCMD_net_add:
-+ return vc_net_add(id, data);
++ return vc_net_add(nxi, data);
+ case VCMD_net_remove:
-+ return vc_net_remove(id, data);
++ return vc_net_remove(nxi, data);
+
++#ifdef CONFIG_VSERVER_HISTORY
++ case VCMD_dump_history:
++ return vc_dump_history(id);
++ case VCMD_read_history:
++ return __COMPAT(vc_read_history, id, data, compat);
++#endif
++#ifdef CONFIG_VSERVER_MONITOR
++ case VCMD_read_monitor:
++ return __COMPAT(vc_read_monitor, id, data, compat);
++#endif
++#ifdef CONFIG_VSERVER_LEGACY
++ case VCMD_new_s_context:
++ return vc_new_s_context(id, data);
++#endif
++#ifdef CONFIG_VSERVER_LEGACYNET
++ case VCMD_set_ipv4root:
++ return vc_set_ipv4root(id, data);
++#endif
++ default:
++ vxwprintk(1, "unimplemented VCMD_%02d_%d[%d]",
++ VC_CATEGORY(cmd), VC_COMMAND(cmd), VC_VERSION(cmd));
+ }
+ return -ENOSYS;
+}
+
-+asmlinkage long
-+sys_vserver(uint32_t cmd, uint32_t id, void __user *data)
++
++#define __VCMD(vcmd, _perm, _args, _flags) \
++ case VCMD_ ## vcmd: perm = _perm; \
++ args = _args; flags = _flags; break
++
++
++#define VCA_NONE 0x00
++#define VCA_VXI 0x01
++#define VCA_NXI 0x02
++
++#define VCF_NONE 0x00
++#define VCF_INFO 0x01
++#define VCF_ADMIN 0x02
++#define VCF_ARES 0x06 /* includes admin */
++#define VCF_SETUP 0x08
++
++#define VCF_ZIDOK 0x10 /* zero id okay */
++
++
++static inline
++long do_vserver(uint32_t cmd, uint32_t id, void __user *data, int compat)
+{
-+ long ret = do_vserver(cmd, id, data, 0);
++ long ret;
++ int permit = -1, state = 0;
++ int perm = -1, args = 0, flags = 0;
++ struct vx_info *vxi = NULL;
++ struct nx_info *nxi = NULL;
++
++ switch (cmd) {
++ /* unpriviledged commands */
++ __VCMD(get_version, 0, VCA_NONE, 0);
++ __VCMD(get_vci, 0, VCA_NONE, 0);
++ __VCMD(get_rlimit_mask, 0, VCA_NONE, 0);
++ __VCMD(get_space_mask, 0, VCA_NONE, 0);
++
++ /* info commands */
++ __VCMD(task_xid, 2, VCA_NONE, 0);
++ __VCMD(reset_minmax, 2, VCA_VXI, 0);
++ __VCMD(vx_info, 3, VCA_VXI, VCF_INFO);
++ __VCMD(get_bcaps, 3, VCA_VXI, VCF_INFO);
++ __VCMD(get_ccaps_v0, 3, VCA_VXI, VCF_INFO);
++ __VCMD(get_ccaps, 3, VCA_VXI, VCF_INFO);
++ __VCMD(get_cflags, 3, VCA_VXI, VCF_INFO);
++ __VCMD(get_vhi_name, 3, VCA_VXI, VCF_INFO);
++ __VCMD(get_rlimit, 3, VCA_VXI, VCF_INFO);
++
++ __VCMD(ctx_stat, 3, VCA_VXI, VCF_INFO);
++ __VCMD(virt_stat, 3, VCA_VXI, VCF_INFO);
++ __VCMD(sock_stat, 3, VCA_VXI, VCF_INFO);
++ __VCMD(rlimit_stat, 3, VCA_VXI, VCF_INFO);
++
++ __VCMD(task_nid, 2, VCA_NONE, 0);
++ __VCMD(nx_info, 3, VCA_NXI, VCF_INFO);
++ __VCMD(get_ncaps, 3, VCA_NXI, VCF_INFO);
++ __VCMD(get_nflags, 3, VCA_NXI, VCF_INFO);
++
++ __VCMD(get_iattr, 2, VCA_NONE, 0);
++ __VCMD(get_dlimit, 3, VCA_NONE, VCF_INFO);
++ __VCMD(get_sched, 3, VCA_VXI, VCF_INFO);
++ __VCMD(sched_info, 3, VCA_VXI, VCF_INFO|VCF_ZIDOK);
++
++ /* lower admin commands */
++ __VCMD(wait_exit, 4, VCA_VXI, VCF_INFO);
++ __VCMD(ctx_create_v0, 5, VCA_NONE, 0);
++ __VCMD(ctx_create, 5, VCA_NONE, 0);
++ __VCMD(ctx_migrate_v0, 5, VCA_VXI, VCF_ADMIN);
++ __VCMD(ctx_migrate, 5, VCA_VXI, VCF_ADMIN);
++ __VCMD(enter_space_v0, 5, VCA_VXI, VCF_ADMIN);
++ __VCMD(enter_space, 5, VCA_VXI, VCF_ADMIN);
++
++ __VCMD(net_create_v0, 5, VCA_NONE, 0);
++ __VCMD(net_create, 5, VCA_NONE, 0);
++ __VCMD(net_migrate, 5, VCA_NXI, VCF_ADMIN);
++
++ /* higher admin commands */
++ __VCMD(ctx_kill, 6, VCA_VXI, VCF_ARES);
++ __VCMD(set_space_v0, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
++ __VCMD(set_space, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
++
++ __VCMD(set_ccaps_v0, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
++ __VCMD(set_ccaps, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
++ __VCMD(set_bcaps, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
++ __VCMD(set_cflags, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
++
++ __VCMD(set_vhi_name, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
++ __VCMD(set_rlimit, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
++ __VCMD(set_sched, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
++ __VCMD(set_sched_v2, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
++ __VCMD(set_sched_v3, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
++ __VCMD(set_sched_v4, 7, VCA_VXI, VCF_ARES|VCF_SETUP);
++
++ __VCMD(set_ncaps, 7, VCA_NXI, VCF_ARES|VCF_SETUP);
++ __VCMD(set_nflags, 7, VCA_NXI, VCF_ARES|VCF_SETUP);
++ __VCMD(net_add, 8, VCA_NXI, VCF_ARES|VCF_SETUP);
++ __VCMD(net_remove, 8, VCA_NXI, VCF_ARES|VCF_SETUP);
++
++ __VCMD(set_iattr, 7, VCA_NONE, 0);
++ __VCMD(set_dlimit, 7, VCA_NONE, VCF_ARES);
++ __VCMD(add_dlimit, 8, VCA_NONE, VCF_ARES);
++ __VCMD(rem_dlimit, 8, VCA_NONE, VCF_ARES);
++
++ /* debug level admin commands */
++#ifdef CONFIG_VSERVER_HISTORY
++ __VCMD(dump_history, 9, VCA_NONE, 0);
++ __VCMD(read_history, 9, VCA_NONE, 0);
++#endif
++#ifdef CONFIG_VSERVER_MONITOR
++ __VCMD(read_monitor, 9, VCA_NONE, 0);
++#endif
++
++ /* legacy commands */
++#ifdef CONFIG_VSERVER_LEGACY
++ __VCMD(create_context, 5, VCA_NONE, 0);
++ __VCMD(new_s_context, 5, VCA_NONE, 0);
++#endif
++#ifdef CONFIG_VSERVER_LEGACYNET
++ __VCMD(set_ipv4root, 5, VCA_NONE, 0);
++#endif
++ default:
++ perm = -1;
++ }
++
++ vxdprintk(VXD_CBIT(switch, 0),
++ "vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]",
++ VC_CATEGORY(cmd), VC_COMMAND(cmd),
++ VC_VERSION(cmd), id, data, compat,
++ perm, args, flags);
++
++ ret = -ENOSYS;
++ if (perm < 0)
++ goto out;
++
++ state = 1;
++#ifdef CONFIG_VSERVER_LEGACY
++ if (!capable(CAP_CONTEXT) &&
++ /* dirty hack for capremove */
++ !(cmd==VCMD_new_s_context && id==-2))
++ goto out;
++#else
++ if (!capable(CAP_CONTEXT))
++ goto out;
++#endif
++
++ state = 2;
++ /* moved here from the individual commands */
++ ret = -EPERM;
++ if ((perm > 1) && !capable(CAP_SYS_ADMIN))
++ goto out;
++
++ state = 3;
++ /* vcmd involves resource management */
++ ret = -EPERM;
++ if ((flags & VCF_ARES) && !capable(CAP_SYS_RESOURCE))
++ goto out;
++
++ state = 4;
++ /* various legacy exceptions */
++ switch (cmd) {
++#ifdef CONFIG_VSERVER_LEGACY
++ case VCMD_set_cflags:
++ case VCMD_set_ccaps_v0:
++ ret = 0;
++ if (vx_check(0, VS_WATCH))
++ goto out;
++ break;
++
++ case VCMD_ctx_create_v0:
++#endif
++ /* will go away when spectator is a cap */
++ case VCMD_ctx_migrate_v0:
++ case VCMD_ctx_migrate:
++ if (id == 1) {
++ current->xid = 1;
++ ret = 1;
++ goto out;
++ }
++ break;
++
++ /* will go away when spectator is a cap */
++ case VCMD_net_migrate:
++ if (id == 1) {
++ current->nid = 1;
++ ret = 1;
++ goto out;
++ }
++ break;
++
++ /* legacy special casing */
++ case VCMD_set_space_v0:
++ id = -1;
++ break;
++ }
++
++ /* vcmds are fine by default */
++ permit = 1;
++
++ /* admin type vcmds require admin ... */
++ if (flags & VCF_ADMIN)
++ permit = vx_check(0, VS_ADMIN) ? 1 : 0;
++
++ /* ... but setup type vcmds override that */
++ if (!permit && (flags & VCF_SETUP))
++ permit = vx_flags(VXF_STATE_SETUP, 0) ? 2 : 0;
++
++ state = 5;
++ ret = -EPERM;
++ if (!permit)
++ goto out;
++
++ state = 6;
++ if (!id && (flags & VCF_ZIDOK))
++ goto skip_id;
++
++ ret = -ESRCH;
++ if (args & VCA_VXI) {
++ vxi = lookup_vx_info(id);
++ if (!vxi)
++ goto out;
+
++ if ((flags & VCF_ADMIN) &&
++ /* special case kill for shutdown */
++ (cmd != VCMD_ctx_kill) &&
++ /* can context be administrated? */
++ !vx_info_flags(vxi, VXF_STATE_ADMIN, 0)) {
++ ret = -EACCES;
++ goto out_vxi;
++ }
++ }
++ state = 7;
++ if (args & VCA_NXI) {
++ nxi = lookup_nx_info(id);
++ if (!nxi)
++ goto out_vxi;
++
++ if ((flags & VCF_ADMIN) &&
++ /* can context be administrated? */
++ !nx_info_flags(nxi, NXF_STATE_ADMIN, 0)) {
++ ret = -EACCES;
++ goto out_nxi;
++ }
++ }
++skip_id:
++ state = 8;
++ ret = do_vcmd(cmd, id, vxi, nxi, data, compat);
++
++out_nxi:
++ if ((args & VCA_NXI) && nxi)
++ put_nx_info(nxi);
++out_vxi:
++ if ((args & VCA_VXI) && vxi)
++ put_vx_info(vxi);
++out:
+ vxdprintk(VXD_CBIT(switch, 1),
-+ "vc: VCMD_%02d_%d[%d] = %08lx(%ld)",
++ "vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]",
+ VC_CATEGORY(cmd), VC_COMMAND(cmd),
-+ VC_VERSION(cmd), ret, ret);
++ VC_VERSION(cmd), ret, ret, state, permit);
+ return ret;
+}
+
++asmlinkage long
++sys_vserver(uint32_t cmd, uint32_t id, void __user *data)
++{
++ return do_vserver(cmd, id, data, 0);
++}
++
+#ifdef CONFIG_COMPAT
+
+asmlinkage long
+sys32_vserver(uint32_t cmd, uint32_t id, void __user *data)
+{
-+ long ret = do_vserver(cmd, id, data, 1);
-+
-+ vxdprintk(VXD_CBIT(switch, 1),
-+ "vc: VCMD_%02d_%d[%d] = %08lx(%ld)",
-+ VC_CATEGORY(cmd), VC_COMMAND(cmd),
-+ VC_VERSION(cmd), ret, ret);
-+ return ret;
++ return do_vserver(cmd, id, data, 1);
+}
+
+#endif /* CONFIG_COMPAT */
---- linux-2.6.18.5/kernel/vserver/sysctl.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/sysctl.c 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,227 @@
+--- linux-2.6.20/kernel/vserver/sysctl.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/sysctl.c 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,242 @@
+/*
+ * kernel/vserver/sysctl.c
+ *
@@ -20018,28 +25413,32 @@
+#define CTL_VSERVER 4242 /* unused? */
+
+enum {
-+ CTL_DEBUG_ERROR = 0,
-+ CTL_DEBUG_SWITCH = 1,
++ CTL_DEBUG_ERROR = 0,
++ CTL_DEBUG_SWITCH = 1,
+ CTL_DEBUG_XID,
+ CTL_DEBUG_NID,
++ CTL_DEBUG_TAG,
+ CTL_DEBUG_NET,
+ CTL_DEBUG_LIMIT,
+ CTL_DEBUG_CRES,
+ CTL_DEBUG_DLIM,
++ CTL_DEBUG_QUOTA,
+ CTL_DEBUG_CVIRT,
+ CTL_DEBUG_MISC,
+};
+
+
-+unsigned int vx_debug_switch = 0;
-+unsigned int vx_debug_xid = 0;
-+unsigned int vx_debug_nid = 0;
-+unsigned int vx_debug_net = 0;
-+unsigned int vx_debug_limit = 0;
-+unsigned int vx_debug_cres = 0;
-+unsigned int vx_debug_dlim = 0;
-+unsigned int vx_debug_cvirt = 0;
-+unsigned int vx_debug_misc = 0;
++unsigned int vx_debug_switch = 0;
++unsigned int vx_debug_xid = 0;
++unsigned int vx_debug_nid = 0;
++unsigned int vx_debug_tag = 0;
++unsigned int vx_debug_net = 0;
++unsigned int vx_debug_limit = 0;
++unsigned int vx_debug_cres = 0;
++unsigned int vx_debug_dlim = 0;
++unsigned int vx_debug_quota = 0;
++unsigned int vx_debug_cvirt = 0;
++unsigned int vx_debug_misc = 0;
+
+
+static struct ctl_table_header *vserver_table_header;
@@ -20121,80 +25520,28 @@
+}
+
+
++#define CTL_ENTRY(ctl, name) \
++ { \
++ .ctl_name = ctl, \
++ .procname = #name, \
++ .data = &vx_##name, \
++ .maxlen = sizeof(int), \
++ .mode = 0644, \
++ .proc_handler = &proc_dodebug \
++ }
+
-+static ctl_table debug_table[] = {
-+ {
-+ .ctl_name = CTL_DEBUG_SWITCH,
-+ .procname = "debug_switch",
-+ .data = &vx_debug_switch,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dodebug
-+ },
-+ {
-+ .ctl_name = CTL_DEBUG_XID,
-+ .procname = "debug_xid",
-+ .data = &vx_debug_xid,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dodebug
-+ },
-+ {
-+ .ctl_name = CTL_DEBUG_NID,
-+ .procname = "debug_nid",
-+ .data = &vx_debug_nid,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dodebug
-+ },
-+ {
-+ .ctl_name = CTL_DEBUG_NET,
-+ .procname = "debug_net",
-+ .data = &vx_debug_net,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dodebug
-+ },
-+ {
-+ .ctl_name = CTL_DEBUG_LIMIT,
-+ .procname = "debug_limit",
-+ .data = &vx_debug_limit,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dodebug
-+ },
-+ {
-+ .ctl_name = CTL_DEBUG_CRES,
-+ .procname = "debug_cres",
-+ .data = &vx_debug_cres,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dodebug
-+ },
-+ {
-+ .ctl_name = CTL_DEBUG_DLIM,
-+ .procname = "debug_dlim",
-+ .data = &vx_debug_dlim,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dodebug
-+ },
-+ {
-+ .ctl_name = CTL_DEBUG_CVIRT,
-+ .procname = "debug_cvirt",
-+ .data = &vx_debug_cvirt,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dodebug
-+ },
-+ {
-+ .ctl_name = CTL_DEBUG_MISC,
-+ .procname = "debug_misc",
-+ .data = &vx_debug_misc,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dodebug
-+ },
++static ctl_table debug_table[] = {
++ CTL_ENTRY (CTL_DEBUG_SWITCH, debug_switch),
++ CTL_ENTRY (CTL_DEBUG_XID, debug_xid),
++ CTL_ENTRY (CTL_DEBUG_NID, debug_nid),
++ CTL_ENTRY (CTL_DEBUG_TAG, debug_tag),
++ CTL_ENTRY (CTL_DEBUG_NET, debug_net),
++ CTL_ENTRY (CTL_DEBUG_LIMIT, debug_limit),
++ CTL_ENTRY (CTL_DEBUG_CRES, debug_cres),
++ CTL_ENTRY (CTL_DEBUG_DLIM, debug_dlim),
++ CTL_ENTRY (CTL_DEBUG_QUOTA, debug_quota),
++ CTL_ENTRY (CTL_DEBUG_CVIRT, debug_cvirt),
++ CTL_ENTRY (CTL_DEBUG_MISC, debug_misc),
+ { .ctl_name = 0 }
+};
+
@@ -20209,6 +25556,68 @@
+};
+
+
++static match_table_t tokens = {
++ { CTL_DEBUG_SWITCH, "switch=%x" },
++ { CTL_DEBUG_XID, "xid=%x" },
++ { CTL_DEBUG_NID, "nid=%x" },
++ { CTL_DEBUG_TAG, "tag=%x" },
++ { CTL_DEBUG_NET, "net=%x" },
++ { CTL_DEBUG_LIMIT, "limit=%x" },
++ { CTL_DEBUG_CRES, "cres=%x" },
++ { CTL_DEBUG_DLIM, "dlim=%x" },
++ { CTL_DEBUG_QUOTA, "quota=%x" },
++ { CTL_DEBUG_CVIRT, "cvirt=%x" },
++ { CTL_DEBUG_MISC, "misc=%x" },
++ { CTL_DEBUG_ERROR, NULL }
++};
++
++#define HANDLE_CASE(id, name, val) \
++ case CTL_DEBUG_ ## id: \
++ vx_debug_ ## name = val; \
++ printk("vs_debug_" #name "=0x%x\n", val); \
++ break
++
++
++static int __init vs_debug_setup(char *str)
++{
++ char *p;
++ int token;
++
++ printk("vs_debug_setup(%s)\n", str);
++ while ((p = strsep(&str, ",")) != NULL) {
++ substring_t args[MAX_OPT_ARGS];
++ unsigned int value;
++
++ if (!*p)
++ continue;
++
++ token = match_token(p, tokens, args);
++ value = (token>0)?simple_strtoul(args[0].from, NULL, 0):0;
++
++ switch (token) {
++ HANDLE_CASE(SWITCH, switch, value);
++ HANDLE_CASE(XID, xid, value);
++ HANDLE_CASE(NID, nid, value);
++ HANDLE_CASE(TAG, tag, value);
++ HANDLE_CASE(NET, net, value);
++ HANDLE_CASE(LIMIT, limit, value);
++ HANDLE_CASE(CRES, cres, value);
++ HANDLE_CASE(DLIM, dlim, value);
++ HANDLE_CASE(QUOTA, quota, value);
++ HANDLE_CASE(CVIRT, cvirt, value);
++ HANDLE_CASE(MISC, misc, value);
++ default:
++ return -EINVAL;
++ break;
++ }
++ }
++ return 1;
++}
++
++__setup("vsdebug=", vs_debug_setup);
++
++
++
+EXPORT_SYMBOL_GPL(vx_debug_switch);
+EXPORT_SYMBOL_GPL(vx_debug_xid);
+EXPORT_SYMBOL_GPL(vx_debug_nid);
@@ -20216,27 +25625,39 @@
+EXPORT_SYMBOL_GPL(vx_debug_limit);
+EXPORT_SYMBOL_GPL(vx_debug_cres);
+EXPORT_SYMBOL_GPL(vx_debug_dlim);
++EXPORT_SYMBOL_GPL(vx_debug_quota);
+EXPORT_SYMBOL_GPL(vx_debug_cvirt);
+EXPORT_SYMBOL_GPL(vx_debug_misc);
+
---- linux-2.6.18.5/kernel/vserver/vci_config.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/kernel/vserver/vci_config.h 2006-09-20 17:01:45 +0200
-@@ -0,0 +1,70 @@
+--- linux-2.6.20/kernel/vserver/vci_config.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/kernel/vserver/vci_config.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,92 @@
++
++/* interface version */
++
++#define VCI_VERSION 0x00020200
++#define VCI_LEGACY_VERSION 0x000100FF
++
+
+enum {
++ VCI_KCBIT_NO_DYNAMIC = 0,
+ VCI_KCBIT_LEGACY = 1,
-+ VCI_KCBIT_LEGACYNET,
-+ VCI_KCBIT_NGNET,
++ VCI_KCBIT_LEGACYNET = 2,
++ VCI_KCBIT_NGNET = 3,
+
-+ VCI_KCBIT_PROC_SECURE,
-+ VCI_KCBIT_HARDCPU,
-+ VCI_KCBIT_HARDCPU_IDLE,
++ VCI_KCBIT_PROC_SECURE = 4,
++ VCI_KCBIT_HARDCPU = 5,
++ VCI_KCBIT_IDLELIMIT = 6,
++ VCI_KCBIT_IDLETIME = 7,
++
++ VCI_KCBIT_COWBL = 8,
++ VCI_KCBIT_FULLCOWBL = 9,
++ VCI_KCBIT_SPACES = 10,
+
+ VCI_KCBIT_LEGACY_VERSION = 15,
-+
+ VCI_KCBIT_DEBUG = 16,
+ VCI_KCBIT_HISTORY = 20,
-+ VCI_KCBIT_TAGXID = 24,
++ VCI_KCBIT_TAGGED = 24,
+};
+
+
@@ -20244,6 +25665,9 @@
+{
+ return
+ /* various legacy options */
++#ifndef CONFIG_VSERVER_DYNAMIC_IDS
++ (1 << VCI_KCBIT_NO_DYNAMIC) |
++#endif
+#ifdef CONFIG_VSERVER_LEGACY
+ (1 << VCI_KCBIT_LEGACY) |
+#endif
@@ -20261,9 +25685,17 @@
+#ifdef CONFIG_VSERVER_HARDCPU
+ (1 << VCI_KCBIT_HARDCPU) |
+#endif
-+#ifdef CONFIG_VSERVER_HARDCPU_IDLE
-+ (1 << VCI_KCBIT_HARDCPU_IDLE) |
++#ifdef CONFIG_VSERVER_IDLELIMIT
++ (1 << VCI_KCBIT_IDLELIMIT) |
++#endif
++#ifdef CONFIG_VSERVER_IDLETIME
++ (1 << VCI_KCBIT_IDLETIME) |
++#endif
++#ifdef CONFIG_VSERVER_COWBL
++ (1 << VCI_KCBIT_COWBL) |
++ (1 << VCI_KCBIT_FULLCOWBL) |
+#endif
++ (1 << VCI_KCBIT_SPACES) |
+
+ /* debug options */
+#ifdef CONFIG_VSERVER_DEBUG
@@ -20273,27 +25705,294 @@
+ (1 << VCI_KCBIT_HISTORY) |
+#endif
+
-+ /* inode xid tagging */
-+#if defined(CONFIG_INOXID_NONE)
-+ (0 << VCI_KCBIT_TAGXID) |
-+#elif defined(CONFIG_INOXID_UID16)
-+ (1 << VCI_KCBIT_TAGXID) |
-+#elif defined(CONFIG_INOXID_GID16)
-+ (2 << VCI_KCBIT_TAGXID) |
-+#elif defined(CONFIG_INOXID_UGID24)
-+ (3 << VCI_KCBIT_TAGXID) |
-+#elif defined(CONFIG_INOXID_INTERN)
-+ (4 << VCI_KCBIT_TAGXID) |
-+#elif defined(CONFIG_INOXID_RUNTIME)
-+ (5 << VCI_KCBIT_TAGXID) |
++ /* inode context tagging */
++#if defined(CONFIG_TAGGING_NONE)
++ (0 << VCI_KCBIT_TAGGED) |
++#elif defined(CONFIG_TAGGING_UID16)
++ (1 << VCI_KCBIT_TAGGED) |
++#elif defined(CONFIG_TAGGING_GID16)
++ (2 << VCI_KCBIT_TAGGED) |
++#elif defined(CONFIG_TAGGING_ID24)
++ (3 << VCI_KCBIT_TAGGED) |
++#elif defined(CONFIG_TAGGING_INTERN)
++ (4 << VCI_KCBIT_TAGGED) |
++#elif defined(CONFIG_TAGGING_RUNTIME)
++ (5 << VCI_KCBIT_TAGGED) |
+#else
-+ (7 << VCI_KCBIT_TAGXID) |
++ (7 << VCI_KCBIT_TAGGED) |
+#endif
+ 0;
+}
+
---- linux-2.6.18.5/mm/filemap_xip.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/mm/filemap_xip.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/mm/filemap.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/mm/filemap.c 2007-02-06 03:05:22 +0100
+@@ -1234,6 +1234,31 @@ int file_send_actor(read_descriptor_t *
+ return written;
+ }
+
++/* FIXME: It would be as simple as this, if we had a (void __user*) to write.
++ * We already have a kernel buffer, so it should be even simpler, right? ;)
++ *
++ * Yes, sorta. After duplicating the complete path of generic_file_write(),
++ * at least some special cases could be removed, so the copy is simpler than
++ * the original. But it remains a copy, so overall complexity increases.
++ */
++static ssize_t
++generic_kernel_file_write(struct file *, const char *, size_t, loff_t *);
++
++ssize_t generic_file_sendpage(struct file *file, struct page *page,
++ int offset, size_t size, loff_t *ppos, int more)
++{
++ ssize_t ret;
++ char *kaddr;
++
++ kaddr = kmap(page);
++ ret = generic_kernel_file_write(file, kaddr + offset, size, ppos);
++ kunmap(page);
++
++ return ret;
++}
++
++EXPORT_SYMBOL(generic_file_sendpage);
++
+ ssize_t generic_file_sendfile(struct file *in_file, loff_t *ppos,
+ size_t count, read_actor_t actor, void *target)
+ {
+@@ -1911,6 +1936,19 @@ int remove_suid(struct dentry *dentry)
+ }
+ EXPORT_SYMBOL(remove_suid);
+
++static inline size_t
++filemap_copy_from_kernel(struct page *page, unsigned long offset,
++ const char *buf, unsigned bytes)
++{
++ char *kaddr;
++
++ kaddr = kmap(page);
++ memcpy(kaddr + offset, buf, bytes);
++ kunmap(page);
++
++ return bytes;
++}
++
+ size_t
+ __filemap_copy_from_user_iovec_inatomic(char *vaddr,
+ const struct iovec *iov, size_t base, size_t bytes)
+@@ -2216,6 +2254,175 @@ zero_length_segment:
+ }
+ EXPORT_SYMBOL(generic_file_buffered_write);
+
++static inline void
++filemap_set_next_kvec(const struct kvec **iovp, size_t *basep, size_t bytes)
++{
++ const struct kvec *iov = *iovp;
++ size_t base = *basep;
++
++ while (bytes) {
++ int copy = min(bytes, iov->iov_len - base);
++
++ bytes -= copy;
++ base += copy;
++ if (iov->iov_len == base) {
++ iov++;
++ base = 0;
++ }
++ }
++ *iovp = iov;
++ *basep = base;
++}
++
++/*
++ * TODO:
++ * This largely tries to copy generic_file_aio_write_nolock(), although it
++ * doesn't have to be nearly as generic. A real cleanup should either
++ * merge this into generic_file_aio_write_nolock() as well or keep it special
++ * and remove as much code as possible.
++ */
++static ssize_t
++generic_kernel_file_aio_write_nolock(struct kiocb *iocb, const struct kvec*iov,
++ unsigned long nr_segs, loff_t *ppos)
++{
++ struct file *file = iocb->ki_filp;
++ struct address_space * mapping = file->f_mapping;
++ const struct address_space_operations *a_ops = mapping->a_ops;
++ size_t ocount; /* original count */
++ size_t count; /* after file limit checks */
++ struct inode *inode = mapping->host;
++ long status = 0;
++ loff_t pos;
++ struct page *page;
++ struct page *cached_page = NULL;
++ const int isblk = S_ISBLK(inode->i_mode);
++ ssize_t written;
++ ssize_t err;
++ size_t bytes;
++ struct pagevec lru_pvec;
++ const struct kvec *cur_iov = iov; /* current kvec */
++ size_t iov_base = 0; /* offset in the current kvec */
++ unsigned long seg;
++ char *buf;
++
++ ocount = 0;
++ for (seg = 0; seg < nr_segs; seg++) {
++ const struct kvec *iv = &iov[seg];
++
++ /*
++ * If any segment has a negative length, or the cumulative
++ * length ever wraps negative then return -EINVAL.
++ */
++ ocount += iv->iov_len;
++ if (unlikely((ssize_t)(ocount|iv->iov_len) < 0))
++ return -EINVAL;
++ }
++
++ count = ocount;
++ pos = *ppos;
++ pagevec_init(&lru_pvec, 0);
++
++ /* We can write back this queue in page reclaim */
++ current->backing_dev_info = mapping->backing_dev_info;
++ written = 0;
++
++ err = generic_write_checks(file, &pos, &count, isblk);
++ if (err)
++ goto out;
++
++
++ if (count == 0)
++ goto out;
++
++ remove_suid(file->f_dentry);
++ file_update_time(file);
++
++ /* There is no sane reason to use O_DIRECT */
++ BUG_ON(file->f_flags & O_DIRECT);
++
++ buf = iov->iov_base;
++ do {
++ unsigned long index;
++ unsigned long offset;
++ size_t copied;
++
++ offset = (pos & (PAGE_CACHE_SIZE -1)); /* Within page */
++ index = pos >> PAGE_CACHE_SHIFT;
++ bytes = PAGE_CACHE_SIZE - offset;
++ if (bytes > count)
++ bytes = count;
++
++ page = __grab_cache_page(mapping,index,&cached_page,&lru_pvec);
++ if (!page) {
++ status = -ENOMEM;
++ break;
++ }
++
++ status = a_ops->prepare_write(file, page, offset, offset+bytes);
++ if (unlikely(status)) {
++ loff_t isize = i_size_read(inode);
++ /*
++ * prepare_write() may have instantiated a few blocks
++ * outside i_size. Trim these off again.
++ */
++ unlock_page(page);
++ page_cache_release(page);
++ if (pos + bytes > isize)
++ vmtruncate(inode, isize);
++ break;
++ }
++
++ BUG_ON(nr_segs != 1);
++ copied = filemap_copy_from_kernel(page, offset, buf, bytes);
++
++ flush_dcache_page(page);
++ status = a_ops->commit_write(file, page, offset, offset+bytes);
++ if (likely(copied > 0)) {
++ if (!status)
++ status = copied;
++
++ if (status >= 0) {
++ written += status;
++ count -= status;
++ pos += status;
++ buf += status;
++ if (unlikely(nr_segs > 1))
++ filemap_set_next_kvec(&cur_iov,
++ &iov_base, status);
++ }
++ }
++ if (unlikely(copied != bytes))
++ if (status >= 0)
++ status = -EFAULT;
++ unlock_page(page);
++ mark_page_accessed(page);
++ page_cache_release(page);
++ if (status < 0)
++ break;
++ balance_dirty_pages_ratelimited(mapping);
++ cond_resched();
++ } while (count);
++ *ppos = pos;
++
++ if (cached_page)
++ page_cache_release(cached_page);
++
++ /*
++ * For now, when the user asks for O_SYNC, we'll actually give O_DSYNC
++ */
++ if (status >= 0) {
++ if ((file->f_flags & O_SYNC) || IS_SYNC(inode))
++ status = generic_osync_inode(inode, mapping,
++ OSYNC_METADATA|OSYNC_DATA);
++ }
++
++ err = written ? written : status;
++out:
++ pagevec_lru_add(&lru_pvec);
++ current->backing_dev_info = 0;
++ return err;
++}
++
+ static ssize_t
+ __generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,
+ unsigned long nr_segs, loff_t *ppos)
+@@ -2332,6 +2539,36 @@ out:
+ return written ? written : err;
+ }
+
++static ssize_t
++generic_kernel_file_write_nolock(struct file *file, const struct kvec *iov,
++ unsigned long nr_segs, loff_t *ppos)
++{
++ struct kiocb kiocb;
++ ssize_t ret;
++
++ init_sync_kiocb(&kiocb, file);
++ ret = generic_kernel_file_aio_write_nolock(&kiocb, iov, nr_segs, ppos);
++ if (ret == -EIOCBQUEUED)
++ ret = wait_on_sync_kiocb(&kiocb);
++ return ret;
++}
++
++static ssize_t generic_kernel_file_write(struct file *file, const char *buf,
++ size_t count, loff_t *ppos)
++{
++ struct inode *inode = file->f_mapping->host;
++ ssize_t err;
++ struct kvec local_iov = { .iov_base = (char *) buf,
++ .iov_len = count };
++
++ mutex_lock(&inode->i_mutex);
++ err = generic_kernel_file_write_nolock(file, &local_iov, 1, ppos);
++ mutex_unlock(&inode->i_mutex);
++
++ return err;
++}
++
++
+ ssize_t generic_file_aio_write_nolock(struct kiocb *iocb,
+ const struct iovec *iov, unsigned long nr_segs, loff_t pos)
+ {
+--- linux-2.6.20/mm/filemap_xip.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/mm/filemap_xip.c 2007-02-06 03:05:22 +0100
@@ -13,6 +13,7 @@
#include <linux/module.h>
#include <linux/uio.h>
@@ -20302,8 +26001,8 @@
#include <asm/tlbflush.h>
#include "filemap.h"
---- linux-2.6.18.5/mm/fremap.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/mm/fremap.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/mm/fremap.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/mm/fremap.c 2007-02-06 03:05:22 +0100
@@ -15,6 +15,7 @@
#include <linux/rmap.h>
#include <linux/module.h>
@@ -20316,13 +26015,13 @@
err = -ENOMEM;
if (page_mapcount(page) > INT_MAX/2)
goto unlock;
-+ if (!vx_rsspages_avail(mm, 1))
++ if (!vx_rss_avail(mm, 1))
+ goto unlock;
if (pte_none(*pte) || !zap_pte(mm, vma, addr, pte))
inc_mm_counter(mm, file_rss);
---- linux-2.6.18.5/mm/hugetlb.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/mm/hugetlb.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/mm/hugetlb.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/mm/hugetlb.c 2007-02-06 03:05:22 +0100
@@ -19,6 +19,7 @@
#include <asm/pgtable.h>
@@ -20331,13 +26030,23 @@
#include "internal.h"
const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
---- linux-2.6.18.5/mm/memory.c 2006-12-04 06:13:53 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/mm/memory.c 2006-11-06 04:47:17 +0100
-@@ -1965,6 +1965,11 @@ static int do_swap_page(struct mm_struct
- grab_swap_token();
+--- linux-2.6.20/mm/memory.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/mm/memory.c 2007-02-06 03:05:22 +0100
+@@ -498,6 +498,9 @@ static int copy_pte_range(struct mm_stru
+ int progress = 0;
+ int rss[2];
+
++ if (!vx_rss_avail(dst_mm, ((end - addr)/PAGE_SIZE + 1)))
++ return -ENOMEM;
++
+ again:
+ rss[1] = rss[0] = 0;
+ dst_pte = pte_alloc_map_lock(dst_mm, dst_pmd, addr, &dst_ptl);
+@@ -2020,6 +2023,11 @@ static int do_swap_page(struct mm_struct
+ count_vm_event(PGMAJFAULT);
}
-+ if (!vx_rsspages_avail(mm, 1)) {
++ if (!vx_rss_avail(mm, 1)) {
+ ret = VM_FAULT_OOM;
+ goto out;
+ }
@@ -20345,27 +26054,62 @@
delayacct_clear_flag(DELAYACCT_PF_SWAPIN);
mark_page_accessed(page);
lock_page(page);
-@@ -2037,6 +2042,8 @@ static int do_anonymous_page(struct mm_s
+@@ -2092,6 +2100,8 @@ static int do_anonymous_page(struct mm_s
/* Allocate our own private page. */
pte_unmap(page_table);
-+ if (!vx_rsspages_avail(mm, 1))
++ if (!vx_rss_avail(mm, 1))
+ goto oom;
if (unlikely(anon_vma_prepare(vma)))
goto oom;
page = alloc_zeroed_user_highpage(vma, address);
-@@ -2115,6 +2122,9 @@ static int do_no_page(struct mm_struct *
- smp_rmb(); /* serializes i_size against truncate_count */
- }
- retry:
-+ /* FIXME: is that check useful here? */
-+ if (!vx_rsspages_avail(mm, 1))
+@@ -2165,6 +2175,9 @@ static int do_no_page(struct mm_struct *
+ pte_unmap(page_table);
+ BUG_ON(vma->vm_flags & VM_PFNMAP);
+
++ if (!vx_rss_avail(mm, 1))
+ return VM_FAULT_OOM;
- new_page = vma->vm_ops->nopage(vma, address & PAGE_MASK, &ret);
- /*
- * No smp_rmb is needed here as long as there's a full
---- linux-2.6.18.5/mm/mlock.c 2006-04-09 13:49:58 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/mm/mlock.c 2006-09-20 17:01:45 +0200
++
+ if (vma->vm_file) {
+ mapping = vma->vm_file->f_mapping;
+ sequence = mapping->truncate_count;
+@@ -2389,6 +2402,7 @@ static inline int handle_pte_fault(struc
+ pte_t entry;
+ pte_t old_entry;
+ spinlock_t *ptl;
++ int ret, type = VXPT_UNKNOWN;
+
+ old_entry = entry = *pte;
+ if (!pte_present(entry)) {
+@@ -2417,9 +2431,12 @@ static inline int handle_pte_fault(struc
+ if (unlikely(!pte_same(*pte, entry)))
+ goto unlock;
+ if (write_access) {
+- if (!pte_write(entry))
+- return do_wp_page(mm, vma, address,
++ if (!pte_write(entry)) {
++ ret = do_wp_page(mm, vma, address,
+ pte, pmd, ptl, entry);
++ type = VXPT_WRITE;
++ goto out;
++ }
+ entry = pte_mkdirty(entry);
+ }
+ entry = pte_mkyoung(entry);
+@@ -2439,7 +2456,10 @@ static inline int handle_pte_fault(struc
+ }
+ unlock:
+ pte_unmap_unlock(pte, ptl);
+- return VM_FAULT_MINOR;
++ ret = VM_FAULT_MINOR;
++out:
++ vx_page_fault(mm, vma, type, ret);
++ return ret;
+ }
+
+ /*
+--- linux-2.6.20/mm/mlock.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/mm/mlock.c 2007-02-06 03:59:47 +0100
@@ -10,6 +10,7 @@
#include <linux/mm.h>
#include <linux/mempolicy.h>
@@ -20378,8 +26122,8 @@
ret = make_pages_present(start, end);
}
-- vma->vm_mm->locked_vm -= pages;
-+ vx_vmlocked_sub(vma->vm_mm, pages);
+- mm->locked_vm -= pages;
++ vx_vmlocked_sub(mm, pages);
out:
if (ret == -ENOMEM)
ret = -EAGAIN;
@@ -20422,9 +26166,9 @@
if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
capable(CAP_IPC_LOCK))
ret = do_mlockall(flags);
---- linux-2.6.18.5/mm/mmap.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/mm/mmap.c 2006-09-20 17:01:45 +0200
-@@ -1137,10 +1137,10 @@ munmap_back:
+--- linux-2.6.20/mm/mmap.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/mm/mmap.c 2007-02-06 03:05:22 +0100
+@@ -1141,10 +1141,10 @@ munmap_back:
kmem_cache_free(vm_area_cachep, vma);
}
out:
@@ -20437,7 +26181,7 @@
make_pages_present(addr, addr + len);
}
if (flags & MAP_POPULATE) {
-@@ -1500,9 +1500,9 @@ static int acct_stack_growth(struct vm_a
+@@ -1511,9 +1511,9 @@ static int acct_stack_growth(struct vm_a
return -ENOMEM;
/* Ok, everything looks good - let it rip */
@@ -20449,7 +26193,7 @@
vm_stat_account(mm, vma->vm_flags, vma->vm_file, grow);
return 0;
}
-@@ -1655,9 +1655,9 @@ static void remove_vma_list(struct mm_st
+@@ -1666,9 +1666,9 @@ static void remove_vma_list(struct mm_st
do {
long nrpages = vma_pages(vma);
@@ -20461,7 +26205,7 @@
vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
vma = remove_vma(vma);
} while (vma);
-@@ -1893,6 +1893,8 @@ unsigned long do_brk(unsigned long addr,
+@@ -1907,6 +1907,8 @@ unsigned long do_brk(unsigned long addr,
lock_limit >>= PAGE_SHIFT;
if (locked > lock_limit && !capable(CAP_IPC_LOCK))
return -EAGAIN;
@@ -20470,7 +26214,7 @@
}
/*
-@@ -1919,7 +1921,8 @@ unsigned long do_brk(unsigned long addr,
+@@ -1933,7 +1935,8 @@ unsigned long do_brk(unsigned long addr,
if (mm->map_count > sysctl_max_map_count)
return -ENOMEM;
@@ -20480,7 +26224,7 @@
return -ENOMEM;
/* Can we just expand an old private anonymous mapping? */
-@@ -1945,9 +1948,9 @@ unsigned long do_brk(unsigned long addr,
+@@ -1959,9 +1962,9 @@ unsigned long do_brk(unsigned long addr,
(VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)];
vma_link(mm, vma, prev, rb_link, rb_parent);
out:
@@ -20492,7 +26236,7 @@
make_pages_present(addr, addr + len);
}
return addr;
-@@ -1973,6 +1976,11 @@ void exit_mmap(struct mm_struct *mm)
+@@ -1987,6 +1990,11 @@ void exit_mmap(struct mm_struct *mm)
free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, 0);
tlb_finish_mmu(tlb, 0, end);
@@ -20504,7 +26248,7 @@
/*
* Walk the list again, actually closing and freeing it,
* with preemption enabled, without holding any MM locks.
-@@ -2012,7 +2020,8 @@ int insert_vm_struct(struct mm_struct *
+@@ -2026,7 +2034,8 @@ int insert_vm_struct(struct mm_struct *
if (__vma && __vma->vm_start < vma->vm_end)
return -ENOMEM;
if ((vma->vm_flags & VM_ACCOUNT) &&
@@ -20514,7 +26258,7 @@
return -ENOMEM;
vma_link(mm, vma, prev, rb_link, rb_parent);
return 0;
-@@ -2085,5 +2094,7 @@ int may_expand_vm(struct mm_struct *mm,
+@@ -2099,5 +2108,7 @@ int may_expand_vm(struct mm_struct *mm,
if (cur + npages > lim)
return 0;
@@ -20522,8 +26266,8 @@
+ return 0;
return 1;
}
---- linux-2.6.18.5/mm/mremap.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/mm/mremap.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/mm/mremap.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/mm/mremap.c 2007-02-06 03:05:22 +0100
@@ -18,6 +18,7 @@
#include <linux/highmem.h>
#include <linux/security.h>
@@ -20532,7 +26276,7 @@
#include <asm/uaccess.h>
#include <asm/cacheflush.h>
-@@ -211,7 +212,7 @@ static unsigned long move_vma(struct vm_
+@@ -212,7 +213,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;
@@ -20541,7 +26285,7 @@
vm_stat_account(mm, vma->vm_flags, vma->vm_file, new_len>>PAGE_SHIFT);
if (do_munmap(mm, old_addr, old_len) < 0) {
-@@ -229,7 +230,7 @@ static unsigned long move_vma(struct vm_
+@@ -230,7 +231,7 @@ static unsigned long move_vma(struct vm_
}
if (vm_flags & VM_LOCKED) {
@@ -20550,7 +26294,7 @@
if (new_len > old_len)
make_pages_present(new_addr + old_len,
new_addr + new_len);
-@@ -336,6 +337,9 @@ unsigned long do_mremap(unsigned long ad
+@@ -337,6 +338,9 @@ unsigned long do_mremap(unsigned long ad
ret = -EAGAIN;
if (locked > lock_limit && !capable(CAP_IPC_LOCK))
goto out;
@@ -20560,7 +26304,7 @@
}
if (!may_expand_vm(mm, (new_len - old_len) >> PAGE_SHIFT)) {
ret = -ENOMEM;
-@@ -364,10 +368,10 @@ unsigned long do_mremap(unsigned long ad
+@@ -365,10 +369,10 @@ unsigned long do_mremap(unsigned long ad
vma_adjust(vma, vma->vm_start,
addr + new_len, vma->vm_pgoff, NULL);
@@ -20573,9 +26317,9 @@
make_pages_present(addr + old_len,
addr + new_len);
}
---- linux-2.6.18.5/mm/nommu.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/mm/nommu.c 2006-09-20 17:01:45 +0200
-@@ -820,7 +820,7 @@ unsigned long do_mmap_pgoff(struct file
+--- linux-2.6.20/mm/nommu.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/mm/nommu.c 2007-02-06 03:05:22 +0100
+@@ -921,7 +921,7 @@ unsigned long do_mmap_pgoff(struct file
realalloc += kobjsize(vma);
askedalloc += sizeof(*vma);
@@ -20584,7 +26328,7 @@
add_nommu_vma(vma);
-@@ -937,7 +937,7 @@ int do_munmap(struct mm_struct *mm, unsi
+@@ -1046,7 +1046,7 @@ int do_munmap(struct mm_struct *mm, unsi
kfree(vml);
update_hiwater_vm(mm);
@@ -20593,7 +26337,7 @@
#ifdef DEBUG
show_process_blocks();
-@@ -956,7 +956,7 @@ void exit_mmap(struct mm_struct * mm)
+@@ -1078,7 +1078,7 @@ void exit_mmap(struct mm_struct * mm)
printk("Exit_mmap:\n");
#endif
@@ -20602,58 +26346,105 @@
while ((tmp = mm->context.vmlist)) {
mm->context.vmlist = tmp->next;
---- linux-2.6.18.5/mm/oom_kill.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/mm/oom_kill.c 2006-09-20 17:01:45 +0200
-@@ -67,6 +67,8 @@ unsigned long badness(struct task_struct
+--- linux-2.6.20/mm/oom_kill.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/mm/oom_kill.c 2007-02-06 04:02:11 +0100
+@@ -24,6 +24,7 @@
+ #include <linux/cpuset.h>
+ #include <linux/module.h>
+ #include <linux/notifier.h>
++#include <linux/vs_memory.h>
+
+ int sysctl_panic_on_oom;
+ /* #define DEBUG */
+@@ -66,6 +67,12 @@ unsigned long badness(struct task_struct
+ points = mm->total_vm;
+
+ /*
++ * add points for context badness
++ */
++
++ points += vx_badness(p, mm);
++
++ /*
+ * After this unlock we can no longer dereference local variable `mm'
*/
task_unlock(p);
+@@ -154,8 +161,8 @@ unsigned long badness(struct task_struct
+ }
+
+ #ifdef DEBUG
+- printk(KERN_DEBUG "OOMkill: task %d (%s) got %d points\n",
+- p->pid, p->comm, points);
++ printk(KERN_DEBUG "OOMkill: task %d:#%u (%s) got %d points\n",
++ p->pid, p->xid, p->comm, points);
+ #endif
+ return points;
+ }
+@@ -284,7 +291,8 @@ static void __oom_kill_task(struct task_
+ }
+
+ if (verbose)
+- printk(KERN_ERR "Killed process %d (%s)\n", p->pid, p->comm);
++ printk(KERN_ERR "Killed process %d:#%u (%s)\n",
++ p->pid, p->xid, p->comm);
-+ /* FIXME: add vserver badness ;) */
-+
/*
- * Processes which fork a lot of child processes are likely
- * a good choice. We add half the vmsize of the children if they
---- linux-2.6.18.5/mm/page_alloc.c 2006-12-04 06:13:53 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/mm/page_alloc.c 2006-11-06 04:47:17 +0100
-@@ -37,6 +37,7 @@
- #include <linux/vmalloc.h>
- #include <linux/mempolicy.h>
- #include <linux/stop_machine.h>
+ * We give our sacrificial lamb high priority and access to
+@@ -354,8 +362,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, p->pid, p->comm, points);
++ printk(KERN_ERR "%s: kill process %d:#%u (%s) score %li or a child\n",
++ message, p->pid, p->xid, p->comm, points);
+
+ /* Try to kill a child first */
+ list_for_each(tsk, &p->children) {
+--- linux-2.6.20/mm/page_alloc.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/mm/page_alloc.c 2007-02-06 04:02:34 +0100
+@@ -41,6 +41,8 @@
+ #include <linux/pfn.h>
+ #include <linux/backing-dev.h>
+ #include <linux/fault-inject.h>
++#include <linux/vs_base.h>
+#include <linux/vs_limit.h>
#include <asm/tlbflush.h>
#include <asm/div64.h>
-@@ -1223,6 +1224,8 @@ void si_meminfo(struct sysinfo *val)
- val->freehigh = 0;
- #endif
+@@ -1519,6 +1521,9 @@ void si_meminfo(struct sysinfo *val)
+ val->totalhigh = totalhigh_pages;
+ val->freehigh = nr_free_highpages();
val->mem_unit = PAGE_SIZE;
++
+ if (vx_flags(VXF_VIRT_MEM, 0))
+ vx_vsi_meminfo(val);
}
EXPORT_SYMBOL(si_meminfo);
-@@ -1237,6 +1240,8 @@ void si_meminfo_node(struct sysinfo *val
- val->totalhigh = pgdat->node_zones[ZONE_HIGHMEM].present_pages;
- val->freehigh = pgdat->node_zones[ZONE_HIGHMEM].free_pages;
+@@ -1538,6 +1543,9 @@ void si_meminfo_node(struct sysinfo *val
+ val->freehigh = 0;
+ #endif
val->mem_unit = PAGE_SIZE;
++
+ if (vx_flags(VXF_VIRT_MEM, 0))
+ vx_vsi_meminfo(val);
}
#endif
---- linux-2.6.18.5/mm/rmap.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/mm/rmap.c 2006-09-20 17:01:45 +0200
-@@ -53,6 +53,7 @@
- #include <linux/rmap.h>
+--- linux-2.6.20/mm/rmap.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/mm/rmap.c 2007-02-06 04:02:52 +0100
+@@ -48,6 +48,7 @@
#include <linux/rcupdate.h>
#include <linux/module.h>
+ #include <linux/kallsyms.h>
+#include <linux/vs_memory.h>
#include <asm/tlbflush.h>
---- linux-2.6.18.5/mm/shmem.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/mm/shmem.c 2006-09-20 17:01:45 +0200
-@@ -51,7 +51,6 @@
+--- linux-2.6.20/mm/shmem.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/mm/shmem.c 2007-02-06 03:05:22 +0100
+@@ -55,7 +55,6 @@
#include <asm/pgtable.h>
/* This magic number is used in glibc for posix shared memory */
@@ -20661,7 +26452,7 @@
#define ENTRIES_PER_PAGE (PAGE_CACHE_SIZE/sizeof(unsigned long))
#define ENTRIES_PER_PAGEPAGE (ENTRIES_PER_PAGE*ENTRIES_PER_PAGE)
-@@ -1648,7 +1647,7 @@ static int shmem_statfs(struct dentry *d
+@@ -1663,7 +1662,7 @@ static int shmem_statfs(struct dentry *d
{
struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
@@ -20670,7 +26461,7 @@
buf->f_bsize = PAGE_CACHE_SIZE;
buf->f_namelen = NAME_MAX;
spin_lock(&sbinfo->stat_lock);
-@@ -2091,7 +2090,7 @@ static int shmem_fill_super(struct super
+@@ -2237,7 +2236,7 @@ static int shmem_fill_super(struct super
sb->s_maxbytes = SHMEM_MAX_BYTES;
sb->s_blocksize = PAGE_CACHE_SIZE;
sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
@@ -20678,18 +26469,85 @@
+ sb->s_magic = TMPFS_SUPER_MAGIC;
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
+ #ifdef CONFIG_TMPFS_POSIX_ACL
+--- linux-2.6.20/mm/slab.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/mm/slab.c 2007-02-06 04:04:40 +0100
+@@ -502,6 +502,8 @@ struct kmem_cache {
+ #define STATS_INC_FREEMISS(x) do { } while (0)
+ #endif
---- linux-2.6.18.5/mm/swapfile.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/mm/swapfile.c 2006-09-20 17:01:45 +0200
-@@ -31,6 +31,7 @@
++#include "slab_vs.h"
++
+ #if DEBUG
+
+ /*
+@@ -3219,6 +3221,8 @@ static __always_inline void *__cache_all
+ */
+ if (NUMA_BUILD && !objp)
+ objp = ____cache_alloc_node(cachep, flags, numa_node_id());
++
++ vx_slab_alloc(cachep, flags);
+ local_irq_restore(save_flags);
+ objp = cache_alloc_debugcheck_after(cachep, flags, objp,
+ caller);
+@@ -3356,6 +3360,7 @@ retry:
+
+ obj = slab_get_obj(cachep, slabp, nodeid);
+ check_slabp(cachep, slabp);
++ vx_slab_alloc(cachep, flags);
+ l3->free_objects--;
+ /* move slabp to correct slabp list: */
+ list_del(&slabp->list);
+@@ -3493,6 +3498,7 @@ static inline void __cache_free(struct k
+
+ check_irq_off();
+ objp = cache_free_debugcheck(cachep, objp, __builtin_return_address(0));
++ vx_slab_free(cachep);
+
+ if (cache_free_alien(cachep, objp))
+ return;
+--- linux-2.6.20/mm/slab_vs.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/mm/slab_vs.h 2007-02-06 03:05:22 +0100
+@@ -0,0 +1,27 @@
++
++#include <linux/vserver/context.h>
++
++#include <linux/vs_context.h>
++
++static inline
++void vx_slab_alloc(struct kmem_cache *cachep, gfp_t flags)
++{
++ int what = gfp_zone(cachep->gfpflags);
++
++ if (!current->vx_info)
++ return;
++
++ atomic_add(cachep->buffer_size, ¤t->vx_info->cacct.slab[what]);
++}
++
++static inline
++void vx_slab_free(struct kmem_cache *cachep)
++{
++ int what = gfp_zone(cachep->gfpflags);
++
++ if (!current->vx_info)
++ return;
++
++ atomic_sub(cachep->buffer_size, ¤t->vx_info->cacct.slab[what]);
++}
++
+--- linux-2.6.20/mm/swapfile.c 2007-02-06 03:01:56 +0100
++++ linux-2.6.20-vs2.2.0-pre1/mm/swapfile.c 2007-02-06 03:05:22 +0100
+@@ -31,6 +31,8 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
#include <linux/swapops.h>
++#include <linux/vs_base.h>
+#include <linux/vs_memory.h>
DEFINE_SPINLOCK(swap_lock);
unsigned int nr_swapfiles;
-@@ -1667,6 +1668,8 @@ void si_swapinfo(struct sysinfo *val)
+@@ -1715,6 +1717,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);
@@ -20698,17 +26556,18 @@
}
/*
---- linux-2.6.18.5/net/core/dev.c 2006-12-04 06:13:53 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/core/dev.c 2006-10-16 18:56:11 +0200
-@@ -117,6 +117,7 @@
+--- linux-2.6.20/net/core/dev.c 2007-02-06 03:01:57 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/core/dev.c 2007-02-06 03:05:22 +0100
+@@ -116,6 +116,8 @@
#include <linux/dmaengine.h>
#include <linux/err.h>
#include <linux/ctype.h>
++#include <linux/vs_context.h> /* remove with NXF_HIDE_NETIF */
+#include <linux/vs_network.h>
/*
* The list of packet types we will receive (as opposed to discard)
-@@ -2049,6 +2050,9 @@ static int dev_ifconf(char __user *arg)
+@@ -2048,6 +2050,9 @@ static int dev_ifconf(char __user *arg)
total = 0;
for (dev = dev_base; dev; dev = dev->next) {
@@ -20718,7 +26577,7 @@
for (i = 0; i < NPROTO; i++) {
if (gifconf_list[i]) {
int done;
-@@ -2109,6 +2113,10 @@ void dev_seq_stop(struct seq_file *seq,
+@@ -2108,6 +2113,10 @@ void dev_seq_stop(struct seq_file *seq,
static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
{
@@ -20729,31 +26588,29 @@
if (dev->get_stats) {
struct net_device_stats *stats = dev->get_stats(dev);
---- linux-2.6.18.5/net/core/rtnetlink.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/core/rtnetlink.c 2006-09-20 17:01:45 +0200
-@@ -322,6 +322,9 @@ static int rtnetlink_dump_ifinfo(struct
+--- linux-2.6.20/net/core/rtnetlink.c 2007-02-06 03:01:57 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/core/rtnetlink.c 2007-02-06 03:05:22 +0100
+@@ -36,6 +36,7 @@
+ #include <linux/security.h>
+ #include <linux/mutex.h>
+ #include <linux/if_addr.h>
++#include <linux/vs_context.h> /* remove with NXF_HIDE_NETIF */
+
+ #include <asm/uaccess.h>
+ #include <asm/system.h>
+@@ -397,6 +398,9 @@ static int rtnl_dump_ifinfo(struct sk_bu
for (dev=dev_base, idx=0; dev; dev = dev->next, idx++) {
if (idx < s_idx)
continue;
+ if (vx_info_flags(skb->sk->sk_vx_info, VXF_HIDE_NETIF, 0) &&
+ !dev_in_nx_info(dev, skb->sk->sk_nx_info))
+ continue;
- if (rtnetlink_fill_ifinfo(skb, dev, RTM_NEWLINK,
- NETLINK_CB(cb->skb).pid,
- cb->nlh->nlmsg_seq, 0,
-@@ -612,6 +615,9 @@ void rtmsg_ifinfo(int type, struct net_d
- sizeof(struct rtnl_link_ifmap) +
- sizeof(struct rtnl_link_stats) + 128);
-
-+ if (vx_flags(VXF_HIDE_NETIF, 0) &&
-+ !dev_in_nx_info(dev, current->nx_info))
-+ return;
- skb = alloc_skb(size, GFP_KERNEL);
- if (!skb)
- return;
---- linux-2.6.18.5/net/core/sock.c 2006-12-04 06:13:53 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/core/sock.c 2006-11-19 17:04:57 +0100
-@@ -124,6 +124,9 @@
+ if (rtnl_fill_ifinfo(skb, dev, NULL, 0, RTM_NEWLINK,
+ NETLINK_CB(cb->skb).pid,
+ cb->nlh->nlmsg_seq, 0, NLM_F_MULTI) <= 0)
+--- linux-2.6.20/net/core/sock.c 2007-02-06 03:01:57 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/core/sock.c 2007-02-06 03:05:22 +0100
+@@ -125,6 +125,9 @@
#include <linux/ipsec.h>
#include <linux/filter.h>
@@ -20763,7 +26620,7 @@
#ifdef CONFIG_INET
#include <net/tcp.h>
-@@ -859,6 +862,8 @@ struct sock *sk_alloc(int family, gfp_t
+@@ -846,6 +849,8 @@ struct sock *sk_alloc(int family, gfp_t
sk->sk_prot = sk->sk_prot_creator = prot;
sock_lock_init(sk);
}
@@ -20772,7 +26629,7 @@
if (security_sk_alloc(sk, family, priority))
goto out_free;
-@@ -897,6 +902,11 @@ void sk_free(struct sock *sk)
+@@ -884,6 +889,11 @@ void sk_free(struct sock *sk)
__FUNCTION__, atomic_read(&sk->sk_omem_alloc));
security_sk_free(sk);
@@ -20784,8 +26641,8 @@
if (sk->sk_prot_creator->slab != NULL)
kmem_cache_free(sk->sk_prot_creator->slab, sk);
else
-@@ -914,6 +924,8 @@ struct sock *sk_clone(const struct sock
- memcpy(newsk, sk, sk->sk_prot->obj_size);
+@@ -901,6 +911,8 @@ struct sock *sk_clone(const struct sock
+ sock_copy(newsk, sk);
/* SANITY */
+ sock_vx_init(newsk);
@@ -20793,7 +26650,7 @@
sk_node_init(&newsk->sk_node);
sock_lock_init(newsk);
bh_lock_sock(newsk);
-@@ -959,6 +971,12 @@ struct sock *sk_clone(const struct sock
+@@ -946,6 +958,12 @@ struct sock *sk_clone(const struct sock
newsk->sk_priority = 0;
atomic_set(&newsk->sk_refcnt, 2);
@@ -20806,7 +26663,7 @@
/*
* Increment the counter in the same struct proto as the master
* sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
-@@ -1528,6 +1546,11 @@ void sock_init_data(struct socket *sock,
+@@ -1515,6 +1533,11 @@ void sock_init_data(struct socket *sock,
sk->sk_stamp.tv_sec = -1L;
sk->sk_stamp.tv_usec = -1L;
@@ -20818,8 +26675,8 @@
atomic_set(&sk->sk_refcnt, 1);
}
---- linux-2.6.18.5/net/ipv4/af_inet.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/ipv4/af_inet.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/net/ipv4/af_inet.c 2007-02-06 03:01:57 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/ipv4/af_inet.c 2007-02-06 03:05:22 +0100
@@ -115,6 +115,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
@@ -20913,9 +26770,17 @@
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->saddr = 0; /* Use device */
---- linux-2.6.18.5/net/ipv4/devinet.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/ipv4/devinet.c 2006-09-20 17:01:45 +0200
-@@ -606,6 +606,9 @@ int devinet_ioctl(unsigned int cmd, void
+--- linux-2.6.20/net/ipv4/devinet.c 2007-02-06 03:01:57 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/ipv4/devinet.c 2007-02-06 03:05:22 +0100
+@@ -58,6 +58,7 @@
+ #include <linux/sysctl.h>
+ #endif
+ #include <linux/kmod.h>
++#include <linux/vs_context.h>
+
+ #include <net/arp.h>
+ #include <net/ip.h>
+@@ -677,6 +678,9 @@ int devinet_ioctl(unsigned int cmd, void
*colon = ':';
if ((in_dev = __in_dev_get_rtnl(dev)) != NULL) {
@@ -20925,7 +26790,7 @@
if (tryaddrmatch) {
/* Matthias Andree */
/* compare label and address (4.4BSD style) */
-@@ -614,6 +617,8 @@ int devinet_ioctl(unsigned int cmd, void
+@@ -685,6 +689,8 @@ int devinet_ioctl(unsigned int cmd, void
This is checked above. */
for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
ifap = &ifa->ifa_next) {
@@ -20934,7 +26799,7 @@
if (!strcmp(ifr.ifr_name, ifa->ifa_label) &&
sin_orig.sin_addr.s_addr ==
ifa->ifa_address) {
-@@ -626,9 +631,12 @@ int devinet_ioctl(unsigned int cmd, void
+@@ -697,9 +703,12 @@ int devinet_ioctl(unsigned int cmd, void
comparing just the label */
if (!ifa) {
for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
@@ -20948,7 +26813,7 @@
}
}
-@@ -779,6 +787,9 @@ static int inet_gifconf(struct net_devic
+@@ -850,6 +859,9 @@ static int inet_gifconf(struct net_devic
goto out;
for (; ifa; ifa = ifa->ifa_next) {
@@ -20958,7 +26823,7 @@
if (!buf) {
done += sizeof(ifr);
continue;
-@@ -1090,6 +1101,7 @@ static int inet_dump_ifaddr(struct sk_bu
+@@ -1176,6 +1188,7 @@ static int inet_dump_ifaddr(struct sk_bu
struct net_device *dev;
struct in_device *in_dev;
struct in_ifaddr *ifa;
@@ -20966,7 +26831,7 @@
int s_ip_idx, s_idx = cb->args[0];
s_ip_idx = ip_idx = cb->args[1];
-@@ -1107,6 +1119,9 @@ static int inet_dump_ifaddr(struct sk_bu
+@@ -1193,6 +1206,9 @@ static int inet_dump_ifaddr(struct sk_bu
for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
ifa = ifa->ifa_next, ip_idx++) {
@@ -20976,9 +26841,17 @@
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid,
---- linux-2.6.18.5/net/ipv4/fib_hash.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/ipv4/fib_hash.c 2006-09-20 17:01:45 +0200
-@@ -987,6 +987,8 @@ static unsigned fib_flag_trans(int type,
+--- linux-2.6.20/net/ipv4/fib_hash.c 2007-02-06 03:01:57 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/ipv4/fib_hash.c 2007-02-06 03:05:22 +0100
+@@ -35,6 +35,7 @@
+ #include <linux/skbuff.h>
+ #include <linux/netlink.h>
+ #include <linux/init.h>
++#include <linux/vs_context.h>
+
+ #include <net/ip.h>
+ #include <net/protocol.h>
+@@ -981,6 +982,8 @@ static unsigned fib_flag_trans(int type,
return flags;
}
@@ -20987,7 +26860,7 @@
/*
* This outputs /proc/net/route.
*
-@@ -1017,7 +1019,8 @@ static int fib_seq_show(struct seq_file
+@@ -1011,7 +1014,8 @@ static int fib_seq_show(struct seq_file
prefix = f->fn_key;
mask = FZ_MASK(iter->zone);
flags = fib_flag_trans(fa->fa_type, mask, fi);
@@ -20997,13 +26870,13 @@
snprintf(bf, sizeof(bf),
"%s\t%08X\t%08X\t%04X\t%d\t%u\t%d\t%08X\t%d\t%u\t%u",
fi->fib_dev ? fi->fib_dev->name : "*", prefix,
---- linux-2.6.18.5/net/ipv4/inet_connection_sock.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/ipv4/inet_connection_sock.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/net/ipv4/inet_connection_sock.c 2007-02-06 03:01:57 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/ipv4/inet_connection_sock.c 2007-02-06 03:05:22 +0100
@@ -39,7 +39,6 @@ int sysctl_local_port_range[2] = { 1024,
int inet_csk_bind_conflict(const struct sock *sk,
const struct inet_bind_bucket *tb)
{
-- const u32 sk_rcv_saddr = inet_rcv_saddr(sk);
+- const __be32 sk_rcv_saddr = inet_rcv_saddr(sk);
struct sock *sk2;
struct hlist_node *node;
int reuse = sk->sk_reuse;
@@ -21011,7 +26884,7 @@
sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) {
if (!reuse || !sk2->sk_reuse ||
sk2->sk_state == TCP_LISTEN) {
-- const u32 sk2_rcv_saddr = inet_rcv_saddr(sk2);
+- const __be32 sk2_rcv_saddr = inet_rcv_saddr(sk2);
- if (!sk2_rcv_saddr || !sk_rcv_saddr ||
- sk2_rcv_saddr == sk_rcv_saddr)
+ if (nx_addr_conflict(sk->sk_nx_info,
@@ -21019,13 +26892,13 @@
break;
}
}
---- linux-2.6.18.5/net/ipv4/inet_diag.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/ipv4/inet_diag.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/net/ipv4/inet_diag.c 2006-11-30 21:19:45 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/ipv4/inet_diag.c 2007-02-06 03:05:22 +0100
@@ -693,6 +693,8 @@ static int inet_diag_dump(struct sk_buff
sk_for_each(sk, node, &hashinfo->listening_hash[i]) {
struct inet_sock *inet = inet_sk(sk);
-+ if (!vx_check(sk->sk_xid, VX_IDENT|VX_WATCH))
++ if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
+ continue;
if (num < s_num) {
num++;
@@ -21034,7 +26907,7 @@
sk_for_each(sk, node, &head->chain) {
struct inet_sock *inet = inet_sk(sk);
-+ if (!vx_check(sk->sk_xid, VX_IDENT|VX_WATCH))
++ if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
+ continue;
if (num < s_num)
goto next_normal;
@@ -21043,15 +26916,15 @@
inet_twsk_for_each(tw, node,
&hashinfo->ehash[i + hashinfo->ehash_size].chain) {
-+ if (!vx_check(tw->tw_xid, VX_IDENT|VX_WATCH))
++ if (!nx_check(tw->tw_nid, VS_WATCH_P|VS_IDENT))
+ continue;
if (num < s_num)
goto next_dying;
if (r->id.idiag_sport != tw->tw_sport &&
---- linux-2.6.18.5/net/ipv4/inet_hashtables.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/ipv4/inet_hashtables.c 2006-09-20 17:01:45 +0200
-@@ -138,11 +138,10 @@ struct sock *__inet_lookup_listener(cons
- const __u32 rcv_saddr = inet->rcv_saddr;
+--- linux-2.6.20/net/ipv4/inet_hashtables.c 2007-02-06 03:01:57 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/ipv4/inet_hashtables.c 2007-02-06 03:05:22 +0100
+@@ -140,11 +140,10 @@ static struct sock *inet_lookup_listener
+ const __be32 rcv_saddr = inet->rcv_saddr;
int score = sk->sk_family == PF_INET ? 1 : 0;
- if (rcv_saddr) {
@@ -21065,9 +26938,26 @@
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
continue;
---- linux-2.6.18.5/net/ipv4/raw.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/ipv4/raw.c 2006-09-20 17:01:45 +0200
-@@ -102,6 +102,27 @@ static void raw_v4_unhash(struct sock *s
+@@ -175,7 +174,7 @@ struct sock *__inet_lookup_listener(stru
+ const struct inet_sock *inet = inet_sk((sk = __sk_head(head)));
+
+ if (inet->num == hnum && !sk->sk_node.next &&
+- (!inet->rcv_saddr || inet->rcv_saddr == daddr) &&
++ inet_addr_match(sk->sk_nx_info, daddr, inet->rcv_saddr) &&
+ (sk->sk_family == PF_INET || !ipv6_only_sock(sk)) &&
+ !sk->sk_bound_dev_if)
+ goto sherry_cache;
+--- linux-2.6.20/net/ipv4/raw.c 2007-02-06 03:01:59 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/ipv4/raw.c 2007-02-06 03:05:22 +0100
+@@ -78,6 +78,7 @@
+ #include <linux/seq_file.h>
+ #include <linux/netfilter.h>
+ #include <linux/netfilter_ipv4.h>
++// #include <linux/vs_base.h>
+
+ struct hlist_head raw_v4_htable[RAWV4_HTABLE_SIZE];
+ DEFINE_RWLOCK(raw_v4_lock);
+@@ -101,6 +102,27 @@ static void raw_v4_unhash(struct sock *s
write_unlock_bh(&raw_v4_lock);
}
@@ -21095,7 +26985,7 @@
struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
__be32 raddr, __be32 laddr,
int dif)
-@@ -113,7 +134,8 @@ struct sock *__raw_v4_lookup(struct sock
+@@ -112,7 +134,8 @@ struct sock *__raw_v4_lookup(struct sock
if (inet->num == num &&
!(inet->daddr && inet->daddr != raddr) &&
@@ -21105,19 +26995,19 @@
!(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
goto found; /* gotcha */
}
-@@ -313,6 +335,11 @@ static int raw_send_hdrinc(struct sock *
+@@ -312,6 +335,11 @@ static int raw_send_hdrinc(struct sock *
iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
}
+ err = -EPERM;
-+ if (!vx_check(0, VX_ADMIN) && !capable(CAP_NET_RAW)
++ if (!nx_check(0, VS_ADMIN) && !capable(CAP_NET_RAW)
+ && (!addr_in_nx_info(sk->sk_nx_info, iph->saddr)))
+ goto error_free;
+
err = NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, rt->u.dst.dev,
dst_output);
if (err > 0)
-@@ -324,6 +351,7 @@ out:
+@@ -323,6 +351,7 @@ out:
error_fault:
err = -EFAULT;
@@ -21125,10 +27015,10 @@
kfree_skb(skb);
error:
IP_INC_STATS(IPSTATS_MIB_OUTDISCARDS);
-@@ -484,6 +512,12 @@ static int raw_sendmsg(struct kiocb *ioc
- if (!inet->hdrincl)
- raw_probe_proto_opt(&fl, msg);
+@@ -489,6 +518,12 @@ static int raw_sendmsg(struct kiocb *ioc
+ }
+ security_sk_classify_flow(sk, &fl);
+ if (sk->sk_nx_info) {
+ err = ip_find_src(sk->sk_nx_info, &rt, &fl);
+
@@ -21138,79 +27028,79 @@
err = ip_route_output_flow(&rt, &fl, sk, !(msg->msg_flags&MSG_DONTWAIT));
}
if (err)
-@@ -788,7 +822,8 @@ static struct sock *raw_get_first(struct
+@@ -793,7 +828,8 @@ static struct sock *raw_get_first(struct
struct hlist_node *node;
sk_for_each(sk, node, &raw_v4_htable[state->bucket])
- if (sk->sk_family == PF_INET)
+ if (sk->sk_family == PF_INET &&
-+ vx_check(sk->sk_xid, VX_IDENT|VX_WATCH))
++ nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
goto found;
}
sk = NULL;
-@@ -804,7 +839,8 @@ static struct sock *raw_get_next(struct
+@@ -809,7 +845,8 @@ static struct sock *raw_get_next(struct
sk = sk_next(sk);
try_again:
;
- } while (sk && sk->sk_family != PF_INET);
+ } while (sk && (sk->sk_family != PF_INET ||
-+ !vx_check(sk->sk_xid, VX_IDENT|VX_WATCH)));
++ !nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT)));
if (!sk && ++state->bucket < RAWV4_HTABLE_SIZE) {
sk = sk_head(&raw_v4_htable[state->bucket]);
---- linux-2.6.18.5/net/ipv4/tcp.c 2006-12-04 06:13:53 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/ipv4/tcp.c 2006-11-19 17:04:57 +0100
-@@ -258,6 +258,7 @@
- #include <linux/bootmem.h>
+--- linux-2.6.20/net/ipv4/tcp.c 2007-02-06 03:01:59 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/ipv4/tcp.c 2007-02-06 04:05:16 +0100
+@@ -259,6 +259,7 @@
#include <linux/cache.h>
#include <linux/err.h>
+ #include <linux/crypto.h>
+#include <linux/in.h>
#include <net/icmp.h>
#include <net/tcp.h>
---- linux-2.6.18.5/net/ipv4/tcp_ipv4.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/ipv4/tcp_ipv4.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/net/ipv4/tcp_ipv4.c 2007-02-06 03:01:59 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/ipv4/tcp_ipv4.c 2007-02-06 03:05:22 +0100
@@ -77,6 +77,7 @@
#include <linux/stddef.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-+#include <linux/vserver/debug.h>
++// #include <linux/vs_base.h>
- int sysctl_tcp_tw_reuse;
- int sysctl_tcp_low_latency;
-@@ -1388,6 +1389,12 @@ static void *listening_get_next(struct s
+ #include <linux/crypto.h>
+ #include <linux/scatterlist.h>
+@@ -1968,6 +1969,12 @@ static void *listening_get_next(struct s
req = req->dl_next;
while (1) {
while (req) {
+ vxdprintk(VXD_CBIT(net, 6),
+ "sk,req: %p [#%d] (from %d)", req->sk,
-+ (req->sk)?req->sk->sk_xid:0, vx_current_xid());
++ (req->sk)?req->sk->sk_nid:0, nx_current_nid());
+ if (req->sk &&
-+ !vx_check(req->sk->sk_xid, VX_IDENT|VX_WATCH))
++ !nx_check(req->sk->sk_nid, VS_WATCH_P|VS_IDENT))
+ continue;
if (req->rsk_ops->family == st->family) {
cur = req;
goto out;
-@@ -1412,6 +1419,10 @@ get_req:
+@@ -1992,6 +1999,10 @@ get_req:
}
get_sk:
sk_for_each_from(sk, node) {
+ vxdprintk(VXD_CBIT(net, 6), "sk: %p [#%d] (from %d)",
-+ sk, sk->sk_xid, vx_current_xid());
-+ if (!vx_check(sk->sk_xid, VX_IDENT|VX_WATCH))
++ sk, sk->sk_nid, nx_current_nid());
++ if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
+ continue;
if (sk->sk_family == st->family) {
cur = sk;
goto out;
-@@ -1463,18 +1474,26 @@ static void *established_get_first(struc
+@@ -2043,18 +2054,26 @@ static void *established_get_first(struc
read_lock(&tcp_hashinfo.ehash[st->bucket].lock);
sk_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
- if (sk->sk_family != st->family) {
+ vxdprintk(VXD_CBIT(net, 6),
+ "sk,egf: %p [#%d] (from %d)",
-+ sk, sk->sk_xid, vx_current_xid());
-+ if (!vx_check(sk->sk_xid, VX_IDENT|VX_WATCH))
++ sk, sk->sk_nid, nx_current_nid());
++ if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
+ continue;
+ if (sk->sk_family != st->family)
continue;
@@ -21224,8 +27114,8 @@
- if (tw->tw_family != st->family) {
+ vxdprintk(VXD_CBIT(net, 6),
+ "tw: %p [#%d] (from %d)",
-+ tw, tw->tw_xid, vx_current_xid());
-+ if (!vx_check(tw->tw_xid, VX_IDENT|VX_WATCH))
++ tw, tw->tw_nid, nx_current_nid());
++ if (!nx_check(tw->tw_nid, VS_WATCH_P|VS_IDENT))
+ continue;
+ if (tw->tw_family != st->family)
continue;
@@ -21233,30 +27123,30 @@
rc = tw;
goto out;
}
-@@ -1498,7 +1517,8 @@ static void *established_get_next(struct
+@@ -2078,7 +2097,8 @@ static void *established_get_next(struct
tw = cur;
tw = tw_next(tw);
get_tw:
- while (tw && tw->tw_family != st->family) {
+ while (tw && (tw->tw_family != st->family ||
-+ !vx_check(tw->tw_xid, VX_IDENT|VX_WATCH))) {
++ !nx_check(tw->tw_nid, VS_WATCH_P|VS_IDENT))) {
tw = tw_next(tw);
}
if (tw) {
-@@ -1522,6 +1542,11 @@ get_tw:
+@@ -2102,6 +2122,11 @@ get_tw:
sk = sk_next(sk);
sk_for_each_from(sk, node) {
+ vxdprintk(VXD_CBIT(net, 6),
+ "sk,egn: %p [#%d] (from %d)",
-+ sk, sk->sk_xid, vx_current_xid());
-+ if (!vx_check(sk->sk_xid, VX_IDENT|VX_WATCH))
++ sk, sk->sk_nid, nx_current_nid());
++ if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
+ continue;
if (sk->sk_family == st->family)
goto found;
}
---- linux-2.6.18.5/net/ipv4/tcp_minisocks.c 2006-09-20 16:58:51 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/ipv4/tcp_minisocks.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/net/ipv4/tcp_minisocks.c 2007-02-06 03:01:59 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/ipv4/tcp_minisocks.c 2007-02-06 03:05:22 +0100
@@ -28,6 +28,10 @@
#include <net/inet_common.h>
#include <net/xfrm.h>
@@ -21268,7 +27158,7 @@
#ifdef CONFIG_SYSCTL
#define SYNC_INIT 0 /* let the user enable it */
#else
-@@ -294,6 +298,11 @@ void tcp_time_wait(struct sock *sk, int
+@@ -293,6 +297,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;
@@ -21280,27 +27170,18 @@
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
if (tw->tw_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk);
---- linux-2.6.18.5/net/ipv4/udp.c 2006-12-04 06:13:53 +0100
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/ipv4/udp.c 2006-12-10 19:44:56 +0100
-@@ -175,14 +175,12 @@ gotit:
- struct inet_sock *inet2 = inet_sk(sk2);
-
- if (inet2->num == snum &&
-- sk2 != sk &&
-- !ipv6_only_sock(sk2) &&
-+ sk2 != sk && !ipv6_only_sock(sk2) &&
- (!sk2->sk_bound_dev_if ||
- !sk->sk_bound_dev_if ||
- sk2->sk_bound_dev_if == sk->sk_bound_dev_if) &&
-- (!inet2->rcv_saddr ||
-- !inet->rcv_saddr ||
-- inet2->rcv_saddr == inet->rcv_saddr) &&
-+ nx_addr_conflict(sk->sk_nx_info,
-+ inet_rcv_saddr(sk), sk2) &&
- (!sk2->sk_reuse || !sk->sk_reuse))
+--- linux-2.6.20/net/ipv4/udp.c 2007-02-06 03:01:59 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/ipv4/udp.c 2007-02-06 04:07:41 +0100
+@@ -196,6 +196,8 @@ gotit:
+ (!sk2->sk_reuse || !sk->sk_reuse) &&
+ (!sk2->sk_bound_dev_if || !sk->sk_bound_dev_if
+ || sk2->sk_bound_dev_if == sk->sk_bound_dev_if) &&
++ /* FIXME: nx_addr_conflict(sk->sk_nx_info,
++ inet_rcv_saddr(sk), sk2) && */
+ (*saddr_comp)(sk, sk2) )
goto fail;
- }
-@@ -237,6 +235,11 @@ static struct sock *udp_v4_lookup_longwa
+ }
+@@ -253,6 +255,11 @@ static struct sock *__udp4_lib_lookup(__
if (inet->rcv_saddr != daddr)
continue;
score+=2;
@@ -21312,7 +27193,7 @@
}
if (inet->daddr) {
if (inet->daddr != saddr)
-@@ -293,7 +296,8 @@ static inline struct sock *udp_v4_mcast_
+@@ -299,7 +306,8 @@ static inline struct sock *udp_v4_mcast_
if (inet->num != hnum ||
(inet->daddr && inet->daddr != rmt_addr) ||
(inet->dport != rmt_port && inet->dport) ||
@@ -21322,63 +27203,62 @@
ipv6_only_sock(s) ||
(s->sk_bound_dev_if && s->sk_bound_dev_if != dif))
continue;
-@@ -603,6 +607,19 @@ int udp_sendmsg(struct kiocb *iocb, stru
+@@ -628,7 +636,20 @@ int udp_sendmsg(struct kiocb *iocb, stru
.uli_u = { .ports =
{ .sport = inet->sport,
.dport = dport } } };
+ struct nx_info *nxi = sk->sk_nx_info;
+
+ security_sk_classify_flow(sk, &fl);
+ if (nxi) {
+ err = ip_find_src(nxi, &rt, &fl);
+ if (err)
+ goto out;
-+ if (daddr == IPI_LOOPBACK && !vx_check(0, VX_ADMIN))
++ if (daddr == IPI_LOOPBACK && !nx_check(0, VS_ADMIN))
+ daddr = fl.fl4_dst = nxi->ipv4[0];
+#ifdef CONFIG_VSERVER_REMAP_SADDR
-+ if (saddr == IPI_LOOPBACK && !vx_check(0, VX_ADMIN))
++ if (saddr == IPI_LOOPBACK && !nx_check(0, VS_ADMIN))
+ saddr = fl.fl4_src = nxi->ipv4[0];
+#endif
+ }
err = ip_route_output_flow(&rt, &fl, sk, !(msg->msg_flags&MSG_DONTWAIT));
if (err)
goto out;
-@@ -1411,8 +1428,10 @@ static struct sock *udp_get_first(struct
-
+@@ -1540,7 +1561,8 @@ static struct sock *udp_get_first(struct
for (state->bucket = 0; state->bucket < UDP_HTABLE_SIZE; ++state->bucket) {
struct hlist_node *node;
-+
- sk_for_each(sk, node, &udp_hash[state->bucket]) {
+ sk_for_each(sk, node, state->hashtable + state->bucket) {
- if (sk->sk_family == state->family)
+ if (sk->sk_family == state->family &&
-+ vx_check(sk->sk_xid, VX_IDENT|VX_WATCH))
++ nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
goto found;
}
}
-@@ -1429,7 +1448,8 @@ static struct sock *udp_get_next(struct
+@@ -1557,7 +1579,8 @@ static struct sock *udp_get_next(struct
sk = sk_next(sk);
try_again:
;
- } while (sk && sk->sk_family != state->family);
+ } while (sk && (sk->sk_family != state->family ||
-+ !vx_check(sk->sk_xid, VX_IDENT|VX_WATCH)));
++ !nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT)));
if (!sk && ++state->bucket < UDP_HTABLE_SIZE) {
- sk = sk_head(&udp_hash[state->bucket]);
---- linux-2.6.18.5/net/ipv6/addrconf.c 2006-09-20 16:58:51 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/ipv6/addrconf.c 2006-09-20 17:01:45 +0200
-@@ -2698,7 +2698,10 @@ static void if6_seq_stop(struct seq_file
+ sk = sk_head(state->hashtable + state->bucket);
+--- linux-2.6.20/net/ipv6/addrconf.c 2007-02-06 03:01:59 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/ipv6/addrconf.c 2007-02-06 03:05:22 +0100
+@@ -2736,7 +2736,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;
- seq_printf(seq,
+
+ /* no ipv6 inside a vserver for now */
-+ if (vx_check(0, VX_ADMIN|VX_WATCH))
++ if (nx_check(0, VS_ADMIN|VS_WATCH))
+ seq_printf(seq,
NIP6_SEQFMT " %02x %02x %02x %02x %8s\n",
NIP6(ifp->addr),
ifp->idev->dev->ifindex,
-@@ -3133,6 +3136,10 @@ static int inet6_dump_addr(struct sk_buf
+@@ -3208,6 +3211,10 @@ static int inet6_dump_addr(struct sk_buf
struct ifmcaddr6 *ifmca;
struct ifacaddr6 *ifaca;
@@ -21389,7 +27269,7 @@
s_idx = cb->args[0];
s_ip_idx = ip_idx = cb->args[1];
read_lock(&dev_base_lock);
-@@ -3414,6 +3421,10 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -3479,6 +3486,10 @@ static int inet6_dump_ifinfo(struct sk_b
struct net_device *dev;
struct inet6_dev *idev;
@@ -21400,8 +27280,8 @@
read_lock(&dev_base_lock);
for (dev=dev_base, idx=0; dev; dev = dev->next, idx++) {
if (idx < s_idx)
---- linux-2.6.18.5/net/netlink/af_netlink.c 2006-09-20 16:58:51 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/netlink/af_netlink.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/net/netlink/af_netlink.c 2007-02-06 03:02:00 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/netlink/af_netlink.c 2007-02-06 03:05:22 +0100
@@ -56,6 +56,9 @@
#include <linux/types.h>
#include <linux/audit.h>
@@ -21412,17 +27292,18 @@
#include <net/sock.h>
#include <net/scm.h>
---- linux-2.6.18.5/net/socket.c 2006-09-20 16:58:54 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/socket.c 2006-11-21 04:55:15 +0100
-@@ -93,6 +93,7 @@
+--- linux-2.6.20/net/socket.c 2007-02-06 03:02:01 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/socket.c 2007-02-06 03:05:22 +0100
+@@ -92,6 +92,8 @@
#include <net/sock.h>
#include <linux/netfilter.h>
++#include <linux/vs_base.h>
+#include <linux/vs_socket.h>
static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
- static ssize_t sock_aio_read(struct kiocb *iocb, char __user *buf,
-@@ -582,7 +583,7 @@ static inline int __sock_sendmsg(struct
+ static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
+@@ -552,7 +554,7 @@ static inline int __sock_sendmsg(struct
struct msghdr *msg, size_t size)
{
struct sock_iocb *si = kiocb_to_siocb(iocb);
@@ -21431,7 +27312,7 @@
si->sock = sock;
si->scm = NULL;
-@@ -593,7 +594,21 @@ static inline int __sock_sendmsg(struct
+@@ -563,7 +565,22 @@ static inline int __sock_sendmsg(struct
if (err)
return err;
@@ -21444,18 +27325,19 @@
+ vx_sock_fail(sock->sk, size);
+ }
+ vxdprintk(VXD_CBIT(net, 7),
-+ "__sock_sendmsg: %p[%p,%p,%p;%d]:%d/%d",
++ "__sock_sendmsg: %p[%p,%p,%p;%d/%d]:%d/%d",
+ sock, sock->sk,
+ (sock->sk)?sock->sk->sk_nx_info:0,
+ (sock->sk)?sock->sk->sk_vx_info:0,
+ (sock->sk)?sock->sk->sk_xid:0,
++ (sock->sk)?sock->sk->sk_nid:0,
+ (unsigned int)size, len);
+ return len;
}
int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
-@@ -631,7 +646,7 @@ int kernel_sendmsg(struct socket *sock,
- static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
+@@ -601,7 +618,7 @@ int kernel_sendmsg(struct socket *sock,
+ static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
struct msghdr *msg, size_t size, int flags)
{
- int err;
@@ -21463,7 +27345,7 @@
struct sock_iocb *si = kiocb_to_siocb(iocb);
si->sock = sock;
-@@ -644,7 +659,17 @@ static inline int __sock_recvmsg(struct
+@@ -614,7 +631,18 @@ static inline int __sock_recvmsg(struct
if (err)
return err;
@@ -21472,28 +27354,29 @@
+ if ((len >= 0) && sock->sk)
+ vx_sock_recv(sock->sk, len);
+ vxdprintk(VXD_CBIT(net, 7),
-+ "__sock_recvmsg: %p[%p,%p,%p;%d]:%d/%d",
++ "__sock_recvmsg: %p[%p,%p,%p;%d/%d]:%d/%d",
+ sock, sock->sk,
+ (sock->sk)?sock->sk->sk_nx_info:0,
+ (sock->sk)?sock->sk->sk_vx_info:0,
+ (sock->sk)?sock->sk->sk_xid:0,
++ (sock->sk)?sock->sk->sk_nid:0,
+ (unsigned int)size, len);
+ return len;
}
- int sock_recvmsg(struct socket *sock, struct msghdr *msg,
-@@ -1134,6 +1159,10 @@ static int __sock_create(int family, int
+ int sock_recvmsg(struct socket *sock, struct msghdr *msg,
+@@ -1068,6 +1096,10 @@ static int __sock_create(int family, int
if (type < 0 || type >= SOCK_MAX)
return -EINVAL;
+ /* disable IPv6 inside vservers for now */
-+ if (family == PF_INET6 && !vx_check(0, VX_ADMIN))
++ if (family == PF_INET6 && !nx_check(0, VS_ADMIN))
+ return -EAFNOSUPPORT;
+
/* Compatibility.
This uglymoron is moved from INET layer to here to avoid
-@@ -1245,6 +1274,7 @@ asmlinkage long sys_socket(int family, i
+@@ -1185,6 +1217,7 @@ asmlinkage long sys_socket(int family, i
if (retval < 0)
goto out;
@@ -21501,7 +27384,7 @@
retval = sock_map_fd(sock);
if (retval < 0)
goto out_release;
-@@ -1275,10 +1305,12 @@ asmlinkage long sys_socketpair(int famil
+@@ -1216,10 +1249,12 @@ asmlinkage long sys_socketpair(int famil
err = sock_create(family, type, protocol, &sock1);
if (err < 0)
goto out;
@@ -21513,14 +27396,14 @@
+ set_bit(SOCK_USER_SOCKET, &sock2->flags);
err = sock1->ops->socketpair(sock1, sock2);
- if (err < 0)
---- linux-2.6.18.5/net/sunrpc/auth.c 2006-06-18 04:55:52 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/sunrpc/auth.c 2006-09-20 17:01:45 +0200
+ if (err < 0)
+--- linux-2.6.20/net/sunrpc/auth.c 2006-11-30 21:19:46 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/sunrpc/auth.c 2007-02-06 03:05:22 +0100
@@ -13,6 +13,7 @@
#include <linux/errno.h>
#include <linux/sunrpc/clnt.h>
#include <linux/spinlock.h>
-+#include <linux/vserver/xid.h>
++#include <linux/vs_tag.h>
#ifdef RPC_DEBUG
# define RPCDBG_FACILITY RPCDBG_AUTH
@@ -21528,7 +27411,7 @@
struct auth_cred acred = {
.uid = current->fsuid,
.gid = current->fsgid,
-+ .xid = vx_current_xid(),
++ .tag = dx_current_tag(),
.group_info = current->group_info,
};
struct rpc_cred *ret;
@@ -21536,24 +27419,24 @@
struct auth_cred acred = {
.uid = current->fsuid,
.gid = current->fsgid,
-+ .xid = vx_current_xid(),
++ .tag = dx_current_tag(),
.group_info = current->group_info,
};
struct rpc_cred *ret;
---- linux-2.6.18.5/net/sunrpc/auth_unix.c 2006-09-20 16:58:54 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/sunrpc/auth_unix.c 2006-09-20 17:01:45 +0200
+--- linux-2.6.20/net/sunrpc/auth_unix.c 2006-11-30 21:19:46 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/sunrpc/auth_unix.c 2007-02-06 03:05:22 +0100
@@ -11,12 +11,14 @@
#include <linux/module.h>
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/auth.h>
-+#include <linux/vserver/xid.h>
++#include <linux/vs_tag.h>
#define NFS_NGROUPS 16
struct unx_cred {
struct rpc_cred uc_base;
gid_t uc_gid;
-+ xid_t uc_xid;
++ tag_t uc_tag;
gid_t uc_gids[NFS_NGROUPS];
};
#define uc_uid uc_base.cr_uid
@@ -21561,7 +27444,7 @@
if (flags & RPCAUTH_LOOKUP_ROOTCREDS) {
cred->uc_uid = 0;
cred->uc_gid = 0;
-+ cred->uc_xid = vx_current_xid();
++ cred->uc_tag = dx_current_tag();
cred->uc_gids[0] = NOGROUP;
} else {
int groups = acred->group_info->ngroups;
@@ -21569,7 +27452,7 @@
cred->uc_uid = acred->uid;
cred->uc_gid = acred->gid;
-+ cred->uc_xid = acred->xid;
++ cred->uc_tag = acred->tag;
for (i = 0; i < groups; i++)
cred->uc_gids[i] = GROUP_AT(acred->group_info, i);
if (i < NFS_NGROUPS)
@@ -21579,56 +27462,76 @@
if (cred->uc_uid != acred->uid
- || cred->uc_gid != acred->gid)
+ || cred->uc_gid != acred->gid
-+ || cred->uc_xid != acred->xid)
++ || cred->uc_tag != acred->tag)
return 0;
groups = acred->group_info->ngroups;
-@@ -143,7 +148,7 @@ unx_marshal(struct rpc_task *task, u32 *
+@@ -143,7 +148,7 @@ unx_marshal(struct rpc_task *task, __be3
struct rpc_clnt *clnt = task->tk_client;
struct unx_cred *cred = (struct unx_cred *) task->tk_msg.rpc_cred;
- u32 *base, *hold;
+ __be32 *base, *hold;
- int i;
-+ int i, tagxid;
++ int i, tag;
*p++ = htonl(RPC_AUTH_UNIX);
base = p++;
-@@ -153,9 +158,12 @@ unx_marshal(struct rpc_task *task, u32 *
+@@ -153,9 +158,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);
-+ tagxid = task->tk_client->cl_tagxid;
++ tag = task->tk_client->cl_tag;
- *p++ = htonl((u32) cred->uc_uid);
- *p++ = htonl((u32) cred->uc_gid);
-+ *p++ = htonl((u32) XIDINO_UID(tagxid,
-+ cred->uc_uid, cred->uc_xid));
-+ *p++ = htonl((u32) XIDINO_GID(tagxid,
-+ cred->uc_gid, cred->uc_xid));
++ *p++ = htonl((u32) TAGINO_UID(tag,
++ cred->uc_uid, cred->uc_tag));
++ *p++ = htonl((u32) TAGINO_GID(tag,
++ cred->uc_gid, cred->uc_tag));
hold = p++;
for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
*p++ = htonl((u32) cred->uc_gids[i]);
---- linux-2.6.18.5/net/unix/af_unix.c 2006-09-20 16:58:54 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/unix/af_unix.c 2006-09-20 17:01:45 +0200
-@@ -116,6 +116,9 @@
+--- linux-2.6.20/net/sunrpc/clnt.c 2007-02-06 03:02:01 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/sunrpc/clnt.c 2007-02-06 03:05:22 +0100
+@@ -30,6 +30,7 @@
+ #include <linux/smp_lock.h>
+ #include <linux/utsname.h>
+ #include <linux/workqueue.h>
++#include <linux/vs_cvirt.h>
+
+ #include <linux/sunrpc/clnt.h>
+ #include <linux/sunrpc/rpc_pipe_fs.h>
+@@ -245,7 +246,9 @@ struct rpc_clnt *rpc_create(struct rpc_c
+ clnt->cl_autobind = 1;
+ if (args->flags & RPC_CLNT_CREATE_ONESHOT)
+ clnt->cl_oneshot = 1;
+-
++ /* FIXME: handle RPC_CLNT_CREATE_TAGGED
++ if (args->flags & RPC_CLNT_CREATE_TAGGED)
++ clnt->cl_tag = 1; */
+ return clnt;
+ }
+ EXPORT_SYMBOL_GPL(rpc_create);
+--- linux-2.6.20/net/unix/af_unix.c 2007-02-06 03:02:01 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/unix/af_unix.c 2007-02-06 03:05:22 +0100
+@@ -116,6 +116,8 @@
#include <linux/mount.h>
#include <net/checksum.h>
#include <linux/security.h>
+#include <linux/vs_context.h>
-+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
- int sysctl_unix_max_dgram_qlen = 10;
+ int sysctl_unix_max_dgram_qlen __read_mostly = 10;
-@@ -252,6 +255,8 @@ static struct sock *__unix_find_socket_b
+@@ -253,6 +255,8 @@ static struct sock *__unix_find_socket_b
sk_for_each(s, node, &unix_socket_table[hash ^ type]) {
struct unix_sock *u = unix_sk(s);
-+ if (!vx_check(s->sk_xid, VX_IDENT|VX_WATCH))
++ if (!nx_check(s->sk_nid, VS_WATCH_P|VS_IDENT))
+ continue;
if (u->addr->len == len &&
!memcmp(u->addr->name, sunname, len))
goto found;
-@@ -807,7 +812,7 @@ static int unix_bind(struct socket *sock
+@@ -808,7 +812,7 @@ static int unix_bind(struct socket *sock
*/
mode = S_IFSOCK |
(SOCK_INODE(sock)->i_mode & ~current->fs->umask);
@@ -21637,9 +27540,9 @@
if (err)
goto out_mknod_dput;
mutex_unlock(&nd.dentry->d_inode->i_mutex);
---- linux-2.6.18.5/net/x25/af_x25.c 2006-09-20 16:58:54 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/net/x25/af_x25.c 2006-09-20 17:01:45 +0200
-@@ -501,7 +501,10 @@ static int x25_create(struct socket *soc
+--- linux-2.6.20/net/x25/af_x25.c 2007-02-06 03:02:01 +0100
++++ linux-2.6.20-vs2.2.0-pre1/net/x25/af_x25.c 2007-02-06 03:05:22 +0100
+@@ -499,7 +499,10 @@ static int x25_create(struct socket *soc
x25 = x25_sk(sk);
@@ -21651,18 +27554,41 @@
x25_init_timers(sk);
---- linux-2.6.18.5/security/commoncap.c 2006-09-20 16:58:54 +0200
-+++ linux-2.6.18.5-vs2.0.2.2-rc9/security/commoncap.c 2006-09-20 17:01:45 +0200
-@@ -142,7 +142,7 @@ void cap_bprm_apply_creds (struct linux_
+--- linux-2.6.20/security/commoncap.c 2006-11-30 21:19:47 +0100
++++ linux-2.6.20-vs2.2.0-pre1/security/commoncap.c 2007-02-06 03:05:22 +0100
+@@ -23,10 +23,11 @@
+ #include <linux/ptrace.h>
+ #include <linux/xattr.h>
+ #include <linux/hugetlb.h>
++#include <linux/vs_context.h>
+
+ int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
+ {
+- NETLINK_CB(skb).eff_cap = current->cap_effective;
++ cap_t(NETLINK_CB(skb).eff_cap) = vx_mbcap(cap_effective);
+ return 0;
+ }
+
+@@ -44,7 +45,7 @@ EXPORT_SYMBOL(cap_netlink_recv);
+ int cap_capable (struct task_struct *tsk, int cap)
+ {
+ /* Derived from include/linux/sched.h:capable. */
+- if (cap_raised(tsk->cap_effective, cap))
++ if (vx_cap_raised(tsk->vx_info, tsk->cap_effective, cap))
+ return 0;
+ return -EPERM;
+ }
+@@ -142,7 +143,8 @@ void cap_bprm_apply_creds (struct linux_
/* Derived from fs/exec.c:compute_creds. */
kernel_cap_t new_permitted, working;
- new_permitted = cap_intersect (bprm->cap_permitted, cap_bset);
-+ new_permitted = cap_intersect (bprm->cap_permitted, vx_current_bcaps());
++ new_permitted = cap_intersect (bprm->cap_permitted,
++ vx_current_cap_bset());
working = cap_intersect (bprm->cap_inheritable,
current->cap_inheritable);
new_permitted = cap_combine (new_permitted, working);
-@@ -311,7 +311,8 @@ void cap_task_reparent_to_init (struct t
+@@ -311,7 +313,8 @@ void cap_task_reparent_to_init (struct t
int cap_syslog (int type)
{
@@ -21672,3 +27598,22 @@
return -EPERM;
return 0;
}
+--- linux-2.6.20/security/dummy.c 2007-02-06 03:02:01 +0100
++++ linux-2.6.20-vs2.2.0-pre1/security/dummy.c 2007-02-06 03:05:22 +0100
+@@ -28,6 +28,7 @@
+ #include <linux/hugetlb.h>
+ #include <linux/ptrace.h>
+ #include <linux/file.h>
++#include <linux/vs_context.h>
+
+ static int dummy_ptrace (struct task_struct *parent, struct task_struct *child)
+ {
+@@ -678,7 +679,7 @@ static int dummy_sem_semop (struct sem_a
+
+ static int dummy_netlink_send (struct sock *sk, struct sk_buff *skb)
+ {
+- NETLINK_CB(skb).eff_cap = current->cap_effective;
++ cap_t(NETLINK_CB(skb).eff_cap) = vx_mbcap(cap_effective);
+ return 0;
+ }
+
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra (original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra Tue Feb 6 14:27:47 2007
@@ -1,6 +1,5 @@
-+ debian/vserver-version.patch *_vserver *_xen-vserver
-#+ features/all/vserver/vs2.0.2.2-rc6.patch *_vserver *_xen-vserver
-+ features/all/vserver/bindmount-dev.patch *_vserver *_xen-vserver
++ features/all/vserver/vs2.2.0-pre1.patch *_vserver *_xen-vserver
+#+ features/all/vserver/bindmount-dev.patch *_vserver *_xen-vserver
+ features/all/xen/vserver-clash.patch *_xen-vserver
#+ features/all/xen/fedora-36252.patch *_xen *_xen-vserver
+ features/all/xen/vserver-update.patch *_xen-vserver
More information about the Kernel-svn-changes
mailing list