Patchset for 2.3.0.11.

svn path=/; revision=541

1 files changed, 32093 insertions, 0 deletions

diff --git a/vserver-sources/2.3.0.11/4410_vs2.3.0.11.patch b/vserver-sources/2.3.0.11/4410_vs2.3.0.11.patch
new file mode 100644
index 0000000..9895121
--- /dev/null
+++ b/vserver-sources/2.3.0.11/4410_vs2.3.0.11.patch
@@ -0,0 +1,32093 @@
+Index: linux-2.6.20/Documentation/vserver/debug.txt
+===================================================================
+--- /dev/null
++++ linux-2.6.20/Documentation/vserver/debug.txt
+@@ -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"
+Index: linux-2.6.20/Makefile
+===================================================================
+--- linux-2.6.20.orig/Makefile
++++ linux-2.6.20/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 20
+-EXTRAVERSION =
++EXTRAVERSION = -vs2.3.0.11-gentoo
+ NAME = Homicidal Dwarf Hamster
+ 
+ # *DOCUMENTATION*
+Index: linux-2.6.20/arch/alpha/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/alpha/Kconfig
++++ linux-2.6.20/arch/alpha/Kconfig
+@@ -666,6 +666,8 @@ source "arch/alpha/oprofile/Kconfig"
+ 
+ source "arch/alpha/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/alpha/kernel/asm-offsets.c
+===================================================================
+--- linux-2.6.20.orig/arch/alpha/kernel/asm-offsets.c
++++ linux-2.6.20/arch/alpha/kernel/asm-offsets.c
+@@ -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();
+ 
+Index: linux-2.6.20/arch/alpha/kernel/entry.S
+===================================================================
+--- linux-2.6.20.orig/arch/alpha/kernel/entry.S
++++ linux-2.6.20/arch/alpha/kernel/entry.S
+@@ -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
+ sys_getxpid:
++	lda	$sp, -16($sp)
++	stq	$26, 0($sp)
+ 	.prologue 0
+-	ldq	$2, TI_TASK($8)
+ 
+-	/* See linux/kernel/timer.c sys_getppid for discussion
+-	   about this loop.  */
+-	ldq	$3, TASK_GROUP_LEADER($2)
+-	ldq	$4, TASK_REAL_PARENT($3)
+-	ldl	$0, TASK_TGID($2)
+-1:	ldl	$1, TASK_TGID($4)
+-#ifdef CONFIG_SMP
+-	mov	$4, $5
+-	mb
+-	ldq	$3, TASK_GROUP_LEADER($2)
+-	ldq	$4, TASK_REAL_PARENT($3)
+-	cmpeq	$4, $5, $5
+-	beq	$5, 1b
+-#endif
+-	stq	$1, 80($sp)
++	lda	$16, 96($sp)
++	jsr	$26, do_getxpid
++	ldq	$26, 0($sp)
++
++	lda	$sp, 16($sp)
+ 	ret
+ .end sys_getxpid
+ 
+Index: linux-2.6.20/arch/alpha/kernel/osf_sys.c
+===================================================================
+--- linux-2.6.20.orig/arch/alpha/kernel/osf_sys.c
++++ linux-2.6.20/arch/alpha/kernel/osf_sys.c
+@@ -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;
+ 	}
+Index: linux-2.6.20/arch/alpha/kernel/ptrace.c
+===================================================================
+--- linux-2.6.20.orig/arch/alpha/kernel/ptrace.c
++++ linux-2.6.20/arch/alpha/kernel/ptrace.c
+@@ -15,6 +15,7 @@
+ #include <linux/slab.h>
+ #include <linux/security.h>
+ #include <linux/signal.h>
++#include <linux/vs_base.h>
+ 
+ #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), VS_WATCH_P|VS_IDENT)) {
++		ret = -EPERM;
++		goto out;
++	}
++
+ 	if (request == PTRACE_ATTACH) {
+ 		ret = ptrace_attach(child);
+ 		goto out;
+Index: linux-2.6.20/arch/alpha/kernel/semaphore.c
+===================================================================
+--- linux-2.6.20.orig/arch/alpha/kernel/semaphore.c
++++ linux-2.6.20/arch/alpha/kernel/semaphore.c
+@@ -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;
+Index: linux-2.6.20/arch/alpha/kernel/systbls.S
+===================================================================
+--- linux-2.6.20.orig/arch/alpha/kernel/systbls.S
++++ linux-2.6.20/arch/alpha/kernel/systbls.S
+@@ -446,7 +446,7 @@ sys_call_table:
+ 	.quad sys_stat64			/* 425 */
+ 	.quad sys_lstat64
+ 	.quad sys_fstat64
+-	.quad sys_ni_syscall			/* sys_vserver */
++	.quad sys_vserver			/* sys_vserver */
+ 	.quad sys_ni_syscall			/* sys_mbind */
+ 	.quad sys_ni_syscall			/* sys_get_mempolicy */
+ 	.quad sys_ni_syscall			/* sys_set_mempolicy */
+Index: linux-2.6.20/arch/alpha/kernel/traps.c
+===================================================================
+--- linux-2.6.20.orig/arch/alpha/kernel/traps.c
++++ linux-2.6.20/arch/alpha/kernel/traps.c
+@@ -215,7 +215,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);
+Index: linux-2.6.20/arch/alpha/mm/init.c
+===================================================================
+--- linux-2.6.20.orig/arch/alpha/mm/init.c
++++ linux-2.6.20/arch/alpha/mm/init.c
+@@ -20,6 +20,7 @@
+ #include <linux/init.h>
+ #include <linux/bootmem.h> /* max_low_pfn */
+ #include <linux/vmalloc.h>
++#include <linux/pagemap.h>
+ 
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+Index: linux-2.6.20/arch/arm/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/arm/Kconfig
++++ linux-2.6.20/arch/arm/Kconfig
+@@ -971,6 +971,8 @@ source "arch/arm/oprofile/Kconfig"
+ 
+ source "arch/arm/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/arm/kernel/calls.S
+===================================================================
+--- linux-2.6.20.orig/arch/arm/kernel/calls.S
++++ linux-2.6.20/arch/arm/kernel/calls.S
+@@ -322,7 +322,7 @@
+ /* 310 */	CALL(sys_request_key)
+ 		CALL(sys_keyctl)
+ 		CALL(ABI(sys_semtimedop, sys_oabi_semtimedop))
+-/* vserver */	CALL(sys_ni_syscall)
++		CALL(sys_vserver)
+ 		CALL(sys_ioprio_set)
+ /* 315 */	CALL(sys_ioprio_get)
+ 		CALL(sys_inotify_init)
+Index: linux-2.6.20/arch/arm/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/arm/kernel/process.c
++++ linux-2.6.20/arch/arm/kernel/process.c
+@@ -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, &regs, 0, NULL, NULL);
++	return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++		0, &regs, 0, NULL, NULL);
+ }
+ EXPORT_SYMBOL(kernel_thread);
+ 
+Index: linux-2.6.20/arch/arm/kernel/traps.c
+===================================================================
+--- linux-2.6.20.orig/arch/arm/kernel/traps.c
++++ linux-2.6.20/arch/arm/kernel/traps.c
+@@ -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);
+ 
+ 	if (!user_mode(regs) || in_interrupt()) {
+ 		dump_mem("Stack: ", regs->ARM_sp,
+Index: linux-2.6.20/arch/arm26/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/arm26/Kconfig
++++ linux-2.6.20/arch/arm26/Kconfig
+@@ -242,6 +242,8 @@ source "drivers/usb/Kconfig"
+ 
+ source "arch/arm26/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/arm26/kernel/calls.S
+===================================================================
+--- linux-2.6.20.orig/arch/arm26/kernel/calls.S
++++ linux-2.6.20/arch/arm26/kernel/calls.S
+@@ -257,6 +257,11 @@ __syscall_start:
+ 		.long	sys_lremovexattr
+ 		.long	sys_fremovexattr
+ 		.long	sys_tkill
++
++		.rept	313 - (. - __syscall_start) / 4
++			.long	sys_ni_syscall
++		.endr
++		.long	sys_vserver	/* 313 */
+ __syscall_end:
+ 
+ 		.rept	NR_syscalls - (__syscall_end - __syscall_start) / 4
+Index: linux-2.6.20/arch/arm26/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/arm26/kernel/process.c
++++ linux-2.6.20/arch/arm26/kernel/process.c
+@@ -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, &regs, 0, NULL, NULL);
++	return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++		0, &regs, 0, NULL, NULL);
+ }
+ EXPORT_SYMBOL(kernel_thread);
+ 
+Index: linux-2.6.20/arch/arm26/kernel/traps.c
+===================================================================
+--- linux-2.6.20.orig/arch/arm26/kernel/traps.c
++++ linux-2.6.20/arch/arm26/kernel/traps.c
+@@ -185,8 +185,9 @@ NORET_TYPE void die(const char *str, str
+ 	printk("Internal error: %s: %x\n", str, err);
+ 	printk("CPU: %d\n", smp_processor_id());
+ 	show_regs(regs);
+-	printk("Process %s (pid: %d, stack limit = 0x%p)\n",
+-		current->comm, current->pid, end_of_stack(tsk));
++	printk("Process %s (pid: %d[#%u], stack limit = 0x%p)\n",
++		current->comm, current->pid,
++		current->xid, end_of_stack(tsk));
+ 
+ 	if (!user_mode(regs) || in_interrupt()) {
+ 		__dump_stack(tsk, (unsigned long)(regs + 1));
+Index: linux-2.6.20/arch/cris/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/cris/Kconfig
++++ linux-2.6.20/arch/cris/Kconfig
+@@ -193,6 +193,8 @@ source "drivers/usb/Kconfig"
+ 
+ source "arch/cris/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/cris/arch-v10/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/cris/arch-v10/kernel/process.c
++++ linux-2.6.20/arch/cris/arch-v10/kernel/process.c
+@@ -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, &regs, 0, NULL, NULL);
++	return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++		0, &regs, 0, NULL, NULL);
+ }
+ 
+ /* setup the child's kernel stack with a pt_regs and switch_stack on it.
+Index: linux-2.6.20/arch/cris/arch-v32/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/cris/arch-v32/kernel/process.c
++++ linux-2.6.20/arch/cris/arch-v32/kernel/process.c
+@@ -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, &regs, 0, NULL, NULL);
++	return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++		0, &regs, 0, NULL, NULL);
+ }
+ 
+ /*
+Index: linux-2.6.20/arch/cris/kernel/irq.c
+===================================================================
+--- linux-2.6.20.orig/arch/cris/kernel/irq.c
++++ linux-2.6.20/arch/cris/kernel/irq.c
+@@ -92,6 +92,7 @@ skip:
+ asmlinkage void do_IRQ(int irq, struct pt_regs * regs)
+ {
+ 	unsigned long sp;
++
+ 	irq_enter();
+ 	sp = rdsp();
+ 	if (unlikely((sp & (PAGE_SIZE - 1)) < (PAGE_SIZE/8))) {
+Index: linux-2.6.20/arch/frv/kernel/kernel_thread.S
+===================================================================
+--- linux-2.6.20.orig/arch/frv/kernel/kernel_thread.S
++++ linux-2.6.20/arch/frv/kernel/kernel_thread.S
+@@ -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]
+Index: linux-2.6.20/arch/h8300/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/h8300/Kconfig
++++ linux-2.6.20/arch/h8300/Kconfig
+@@ -207,6 +207,8 @@ source "fs/Kconfig"
+ 
+ source "arch/h8300/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/h8300/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/h8300/kernel/process.c
++++ linux-2.6.20/arch/h8300/kernel/process.c
+@@ -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"
+Index: linux-2.6.20/arch/i386/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/i386/Kconfig
++++ linux-2.6.20/arch/i386/Kconfig
+@@ -1214,6 +1214,8 @@ endmenu
+ 
+ source "arch/i386/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/i386/kernel/irq.c
+===================================================================
+--- linux-2.6.20.orig/arch/i386/kernel/irq.c
++++ linux-2.6.20/arch/i386/kernel/irq.c
+@@ -84,7 +84,6 @@ fastcall unsigned int do_IRQ(struct pt_r
+ 		}
+ 	}
+ #endif
+-
+ #ifdef CONFIG_4KSTACKS
+ 
+ 	curctx = (union irq_ctx *) current_thread_info();
+@@ -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;
+Index: linux-2.6.20/arch/i386/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/i386/kernel/process.c
++++ linux-2.6.20/arch/i386/kernel/process.c
+@@ -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, &regs, 0, NULL, NULL);
++	return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++		0, &regs, 0, NULL, NULL);
+ }
+ EXPORT_SYMBOL(kernel_thread);
+ 
+Index: linux-2.6.20/arch/i386/kernel/syscall_table.S
+===================================================================
+--- linux-2.6.20.orig/arch/i386/kernel/syscall_table.S
++++ linux-2.6.20/arch/i386/kernel/syscall_table.S
+@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
+ 	.long sys_tgkill	/* 270 */
+ 	.long sys_utimes
+  	.long sys_fadvise64_64
+-	.long sys_ni_syscall	/* sys_vserver */
++	.long sys_vserver
+ 	.long sys_mbind
+ 	.long sys_get_mempolicy
+ 	.long sys_set_mempolicy
+Index: linux-2.6.20/arch/i386/kernel/sysenter.c
+===================================================================
+--- linux-2.6.20.orig/arch/i386/kernel/sysenter.c
++++ linux-2.6.20/arch/i386/kernel/sysenter.c
+@@ -17,6 +17,7 @@
+ #include <linux/elf.h>
+ #include <linux/mm.h>
+ #include <linux/module.h>
++#include <linux/vs_memory.h>
+ 
+ #include <asm/cpufeature.h>
+ #include <asm/msr.h>
+@@ -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);
+-	mm->total_vm++;
++	vx_vmpages_inc(mm);
+ up_fail:
+ 	up_write(&mm->mmap_sem);
+ 	return ret;
+Index: linux-2.6.20/arch/i386/kernel/traps.c
+===================================================================
+--- linux-2.6.20.orig/arch/i386/kernel/traps.c
++++ linux-2.6.20/arch/i386/kernel/traps.c
+@@ -56,6 +56,8 @@
+ #include <asm/stacktrace.h>
+ 
+ #include <linux/module.h>
++#include <linux/vs_context.h>
++#include <linux/vserver/history.h>
+ 
+ #include "mach_traps.h"
+ 
+@@ -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);
+-	printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)",
+-		TASK_COMM_LEN, current->comm, current->pid,
++	printk(KERN_EMERG "Process %.*s (pid: %d[#%u], ti=%p task=%p task.ti=%p)",
++		TASK_COMM_LEN, current->comm, current->pid, current->xid,
+ 		current_thread_info(), current, current->thread_info);
+ 	/*
+ 	 * When in-kernel, we also print out the stack and code at the
+@@ -386,6 +388,8 @@ void die(const char * str, struct pt_reg
+ 
+ 	oops_enter();
+ 
++	vxh_throw_oops();
++
+ 	if (die.lock_owner != raw_smp_processor_id()) {
+ 		console_verbose();
+ 		spin_lock_irqsave(&die.lock, flags);
+@@ -423,9 +427,9 @@ void die(const char * str, struct pt_reg
+ 		if (nl)
+ 			printk("\n");
+ 		if (notify_die(DIE_OOPS, str, regs, err,
+-					current->thread.trap_no, SIGSEGV) !=
+-				NOTIFY_STOP) {
++			current->thread.trap_no, SIGSEGV) != NOTIFY_STOP) {
+ 			show_registers(regs);
++			vxh_dump_history();
+ 			/* Executive summary in case the oops scrolled away */
+ 			esp = (unsigned long) (&regs->esp);
+ 			savesegment(ss, ss);
+Index: linux-2.6.20/arch/ia64/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/ia64/Kconfig
++++ linux-2.6.20/arch/ia64/Kconfig
+@@ -568,6 +568,8 @@ endmenu
+ 
+ source "arch/ia64/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/ia64/ia32/binfmt_elf32.c
+===================================================================
+--- linux-2.6.20.orig/arch/ia64/ia32/binfmt_elf32.c
++++ linux-2.6.20/arch/ia64/ia32/binfmt_elf32.c
+@@ -238,7 +238,8 @@ ia32_setup_arg_pages (struct linux_binpr
+ 			kmem_cache_free(vm_area_cachep, mpnt);
+ 			return ret;
+ 		}
+-		current->mm->stack_vm = current->mm->total_vm = vma_pages(mpnt);
++		vx_vmpages_sub(current->mm, current->mm->total_vm - vma_pages(mpnt));
++		current->mm->stack_vm = current->mm->total_vm;
+ 	}
+ 
+ 	for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
+Index: linux-2.6.20/arch/ia64/ia32/ia32_entry.S
+===================================================================
+--- linux-2.6.20.orig/arch/ia64/ia32/ia32_entry.S
++++ linux-2.6.20/arch/ia64/ia32/ia32_entry.S
+@@ -483,7 +483,7 @@ ia32_syscall_table:
+  	data8 sys_tgkill	/* 270 */
+  	data8 compat_sys_utimes
+  	data8 sys32_fadvise64_64
+- 	data8 sys_ni_syscall
++	data8 sys32_vserver
+   	data8 sys_ni_syscall
+  	data8 sys_ni_syscall	/* 275 */
+   	data8 sys_ni_syscall
+Index: linux-2.6.20/arch/ia64/ia32/sys_ia32.c
+===================================================================
+--- linux-2.6.20.orig/arch/ia64/ia32/sys_ia32.c
++++ linux-2.6.20/arch/ia64/ia32/sys_ia32.c
+@@ -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;
+ 	}
+Index: linux-2.6.20/arch/ia64/kernel/asm-offsets.c
+===================================================================
+--- linux-2.6.20.orig/arch/ia64/kernel/asm-offsets.c
++++ linux-2.6.20/arch/ia64/kernel/asm-offsets.c
+@@ -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,
+Index: linux-2.6.20/arch/ia64/kernel/entry.S
+===================================================================
+--- linux-2.6.20.orig/arch/ia64/kernel/entry.S
++++ linux-2.6.20/arch/ia64/kernel/entry.S
+@@ -1576,7 +1576,7 @@ sys_call_table:
+ 	data8 sys_mq_notify
+ 	data8 sys_mq_getsetattr
+ 	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
+Index: linux-2.6.20/arch/ia64/kernel/perfmon.c
+===================================================================
+--- linux-2.6.20.orig/arch/ia64/kernel/perfmon.c
++++ linux-2.6.20/arch/ia64/kernel/perfmon.c
+@@ -41,6 +41,7 @@
+ #include <linux/capability.h>
+ #include <linux/rcupdate.h>
+ #include <linux/completion.h>
++#include <linux/vs_memory.h>
+ 
+ #include <asm/errno.h>
+ #include <asm/intrinsics.h>
+@@ -2356,7 +2357,7 @@ pfm_smpl_buffer_alloc(struct task_struct
+ 	 */
+ 	insert_vm_struct(mm, vma);
+ 
+-	mm->total_vm  += size >> PAGE_SHIFT;
++	vx_vmpages_add(mm, size >> PAGE_SHIFT);
+ 	vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
+ 							vma_pages(vma));
+ 	up_write(&task->mm->mmap_sem);
+Index: linux-2.6.20/arch/ia64/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/ia64/kernel/process.c
++++ linux-2.6.20/arch/ia64/kernel/process.c
+@@ -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, &regs.pt, 0, NULL, NULL);
++	return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++		0, &regs.pt, 0, NULL, NULL);
+ }
+ EXPORT_SYMBOL(kernel_thread);
+ 
+Index: linux-2.6.20/arch/ia64/kernel/ptrace.c
+===================================================================
+--- linux-2.6.20.orig/arch/ia64/kernel/ptrace.c
++++ linux-2.6.20/arch/ia64/kernel/ptrace.c
+@@ -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), VS_WATCH_P|VS_IDENT))
++		goto out_tsk;
++
+ 	ret = -EPERM;
+ 	if (pid == 1)		/* no messing around with init! */
+ 		goto out_tsk;
+Index: linux-2.6.20/arch/ia64/kernel/traps.c
+===================================================================
+--- linux-2.6.20.orig/arch/ia64/kernel/traps.c
++++ linux-2.6.20/arch/ia64/kernel/traps.c
+@@ -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);
+ 			}
+ 		}
+ 	}
+Index: linux-2.6.20/arch/ia64/mm/fault.c
+===================================================================
+--- linux-2.6.20.orig/arch/ia64/mm/fault.c
++++ linux-2.6.20/arch/ia64/mm/fault.c
+@@ -10,6 +10,7 @@
+ #include <linux/smp_lock.h>
+ #include <linux/interrupt.h>
+ #include <linux/kprobes.h>
++#include <linux/vs_memory.h>
+ 
+ #include <asm/pgtable.h>
+ #include <asm/processor.h>
+Index: linux-2.6.20/arch/ia64/sn/kernel/xpc_main.c
+===================================================================
+--- linux-2.6.20.orig/arch/ia64/sn/kernel/xpc_main.c
++++ linux-2.6.20/arch/ia64/sn/kernel/xpc_main.c
+@@ -108,6 +108,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = 
+ 		0644,
+ 		NULL,
+ 		&proc_dointvec_minmax,
++		NULL,
+ 		&sysctl_intvec,
+ 		NULL,
+ 		&xpc_hb_min_interval,
+@@ -121,6 +122,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = 
+ 		0644,
+ 		NULL,
+ 		&proc_dointvec_minmax,
++		NULL,
+ 		&sysctl_intvec,
+ 		NULL,
+ 		&xpc_hb_check_min_interval,
+@@ -145,6 +147,7 @@ static ctl_table xpc_sys_xpc_dir[] = {
+ 		0644,
+ 		NULL,
+ 		&proc_dointvec_minmax,
++		NULL,
+ 		&sysctl_intvec,
+ 		NULL,
+ 		&xpc_disengage_request_min_timelimit,
+Index: linux-2.6.20/arch/m32r/kernel/irq.c
+===================================================================
+--- linux-2.6.20.orig/arch/m32r/kernel/irq.c
++++ linux-2.6.20/arch/m32r/kernel/irq.c
+@@ -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();
+ 
+Index: linux-2.6.20/arch/m32r/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/m32r/kernel/process.c
++++ linux-2.6.20/arch/m32r/kernel/process.c
+@@ -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, &regs, 0, NULL,
+-		NULL);
++	return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++		0, &regs, 0, NULL, NULL);
+ }
+ 
+ /*
+Index: linux-2.6.20/arch/m32r/kernel/traps.c
+===================================================================
+--- linux-2.6.20.orig/arch/m32r/kernel/traps.c
++++ linux-2.6.20/arch/m32r/kernel/traps.c
+@@ -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
+Index: linux-2.6.20/arch/m68k/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/m68k/Kconfig
++++ linux-2.6.20/arch/m68k/Kconfig
+@@ -662,6 +662,8 @@ source "fs/Kconfig"
+ 
+ source "arch/m68k/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/m68k/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/m68k/kernel/process.c
++++ linux-2.6.20/arch/m68k/kernel/process.c
+@@ -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__
+Index: linux-2.6.20/arch/m68k/kernel/ptrace.c
+===================================================================
+--- linux-2.6.20.orig/arch/m68k/kernel/ptrace.c
++++ linux-2.6.20/arch/m68k/kernel/ptrace.c
+@@ -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), VS_WATCH_P|VS_IDENT))
++		goto out_tsk;
+ 
+ 	return ret;
+ out_eio:
+Index: linux-2.6.20/arch/m68k/kernel/traps.c
+===================================================================
+--- linux-2.6.20.orig/arch/m68k/kernel/traps.c
++++ linux-2.6.20/arch/m68k/kernel/traps.c
+@@ -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) {
+Index: linux-2.6.20/arch/m68knommu/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/m68knommu/Kconfig
++++ linux-2.6.20/arch/m68knommu/Kconfig
+@@ -671,6 +671,8 @@ source "fs/Kconfig"
+ 
+ source "arch/m68knommu/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/m68knommu/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/m68knommu/kernel/process.c
++++ linux-2.6.20/arch/m68knommu/kernel/process.c
+@@ -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();
+Index: linux-2.6.20/arch/m68knommu/kernel/traps.c
+===================================================================
+--- linux-2.6.20.orig/arch/m68knommu/kernel/traps.c
++++ linux-2.6.20/arch/m68knommu/kernel/traps.c
+@@ -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);
+ }
+Index: linux-2.6.20/arch/mips/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/mips/Kconfig
++++ linux-2.6.20/arch/mips/Kconfig
+@@ -2084,6 +2084,8 @@ source "arch/mips/oprofile/Kconfig"
+ 
+ source "arch/mips/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/mips/kernel/linux32.c
+===================================================================
+--- linux-2.6.20.orig/arch/mips/kernel/linux32.c
++++ linux-2.6.20/arch/mips/kernel/linux32.c
+@@ -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;
+ 	}
+Index: linux-2.6.20/arch/mips/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/mips/kernel/process.c
++++ linux-2.6.20/arch/mips/kernel/process.c
+@@ -271,7 +271,8 @@ long kernel_thread(int (*fn)(void *), vo
+ #endif
+ 
+ 	/* Ok, create the new process.. */
+-	return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, &regs, 0, NULL, NULL);
++	return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++		0, &regs, 0, NULL, NULL);
+ }
+ 
+ /*
+Index: linux-2.6.20/arch/mips/kernel/ptrace.c
+===================================================================
+--- linux-2.6.20.orig/arch/mips/kernel/ptrace.c
++++ linux-2.6.20/arch/mips/kernel/ptrace.c
+@@ -26,6 +26,7 @@
+ #include <linux/user.h>
+ #include <linux/security.h>
+ #include <linux/signal.h>
++#include <linux/vs_base.h>
+ 
+ #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), 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. */
+Index: linux-2.6.20/arch/mips/kernel/scall32-o32.S
+===================================================================
+--- linux-2.6.20.orig/arch/mips/kernel/scall32-o32.S
++++ linux-2.6.20/arch/mips/kernel/scall32-o32.S
+@@ -619,7 +619,7 @@ einval:	li	v0, -EINVAL
+ 	sys	sys_mq_timedreceive	5
+ 	sys	sys_mq_notify		2	/* 4275 */
+ 	sys	sys_mq_getsetattr	3
+-	sys	sys_ni_syscall		0	/* sys_vserver */
++	sys	sys_vserver		3
+ 	sys	sys_waitid		5
+ 	sys	sys_ni_syscall		0	/* available, was setaltroot */
+ 	sys	sys_add_key		5	/* 4280 */
+Index: linux-2.6.20/arch/mips/kernel/scall64-64.S
+===================================================================
+--- linux-2.6.20.orig/arch/mips/kernel/scall64-64.S
++++ linux-2.6.20/arch/mips/kernel/scall64-64.S
+@@ -434,7 +434,7 @@ sys_call_table:
+ 	PTR	sys_mq_timedreceive
+ 	PTR	sys_mq_notify
+ 	PTR	sys_mq_getsetattr		/* 5235 */
+-	PTR	sys_ni_syscall			/* sys_vserver */
++	PTR	sys_vserver
+ 	PTR	sys_waitid
+ 	PTR	sys_ni_syscall			/* available, was setaltroot */
+ 	PTR	sys_add_key
+Index: linux-2.6.20/arch/mips/kernel/scall64-n32.S
+===================================================================
+--- linux-2.6.20.orig/arch/mips/kernel/scall64-n32.S
++++ linux-2.6.20/arch/mips/kernel/scall64-n32.S
+@@ -360,7 +360,7 @@ EXPORT(sysn32_call_table)
+ 	PTR	compat_sys_mq_timedreceive
+ 	PTR	compat_sys_mq_notify
+ 	PTR	compat_sys_mq_getsetattr
+-	PTR	sys_ni_syscall			/* 6240, sys_vserver */
++	PTR	sys32_vserver			/* 6240 */
+ 	PTR	sysn32_waitid
+ 	PTR	sys_ni_syscall			/* available, was setaltroot */
+ 	PTR	sys_add_key
+Index: linux-2.6.20/arch/mips/kernel/scall64-o32.S
+===================================================================
+--- linux-2.6.20.orig/arch/mips/kernel/scall64-o32.S
++++ linux-2.6.20/arch/mips/kernel/scall64-o32.S
+@@ -482,7 +482,7 @@ sys_call_table:
+ 	PTR	compat_sys_mq_timedreceive
+ 	PTR	compat_sys_mq_notify		/* 4275 */
+ 	PTR	compat_sys_mq_getsetattr
+-	PTR	sys_ni_syscall			/* sys_vserver */
++	PTR	sys32_vserver
+ 	PTR	sys32_waitid
+ 	PTR	sys_ni_syscall			/* available, was setaltroot */
+ 	PTR	sys_add_key			/* 4280 */
+Index: linux-2.6.20/arch/mips/kernel/traps.c
+===================================================================
+--- linux-2.6.20.orig/arch/mips/kernel/traps.c
++++ linux-2.6.20/arch/mips/kernel/traps.c
+@@ -299,8 +299,9 @@ void show_registers(struct pt_regs *regs
+ {
+ 	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");
+Index: linux-2.6.20/arch/parisc/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/parisc/Kconfig
++++ linux-2.6.20/arch/parisc/Kconfig
+@@ -265,6 +265,8 @@ source "arch/parisc/oprofile/Kconfig"
+ 
+ source "arch/parisc/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/parisc/kernel/entry.S
+===================================================================
+--- linux-2.6.20.orig/arch/parisc/kernel/entry.S
++++ linux-2.6.20/arch/parisc/kernel/entry.S
+@@ -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
+Index: linux-2.6.20/arch/parisc/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/parisc/kernel/process.c
++++ linux-2.6.20/arch/parisc/kernel/process.c
+@@ -173,7 +173,7 @@ pid_t kernel_thread(int (*fn)(void *), v
+ 	 *	  kernel_thread can become a #define.
+ 	 */
+ 
+-	return __kernel_thread(fn, arg, flags);
++	return __kernel_thread(fn, arg, flags | CLONE_KTHREAD);
+ }
+ EXPORT_SYMBOL(kernel_thread);
+ 
+Index: linux-2.6.20/arch/parisc/kernel/sys_parisc32.c
+===================================================================
+--- linux-2.6.20.orig/arch/parisc/kernel/sys_parisc32.c
++++ linux-2.6.20/arch/parisc/kernel/sys_parisc32.c
+@@ -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);
++		/* TODO: requires vx virtualization */
+ 		val.uptime = jiffies / HZ;
+ 
+ 		val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
+Index: linux-2.6.20/arch/parisc/kernel/syscall_table.S
+===================================================================
+--- linux-2.6.20.orig/arch/parisc/kernel/syscall_table.S
++++ linux-2.6.20/arch/parisc/kernel/syscall_table.S
+@@ -368,7 +368,7 @@
+ 	ENTRY_COMP(mbind)		/* 260 */
+ 	ENTRY_COMP(get_mempolicy)
+ 	ENTRY_COMP(set_mempolicy)
+-	ENTRY_SAME(ni_syscall)	/* 263: reserved for vserver */
++	ENTRY_DIFF(vserver)
+ 	ENTRY_SAME(add_key)
+ 	ENTRY_SAME(request_key)		/* 265 */
+ 	ENTRY_SAME(keyctl)
+Index: linux-2.6.20/arch/parisc/kernel/traps.c
+===================================================================
+--- linux-2.6.20.orig/arch/parisc/kernel/traps.c
++++ linux-2.6.20/arch/parisc/kernel/traps.c
+@@ -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())
+Index: linux-2.6.20/arch/parisc/mm/fault.c
+===================================================================
+--- linux-2.6.20.orig/arch/parisc/mm/fault.c
++++ linux-2.6.20/arch/parisc/mm/fault.c
+@@ -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);
+Index: linux-2.6.20/arch/powerpc/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/powerpc/Kconfig
++++ linux-2.6.20/arch/powerpc/Kconfig
+@@ -1193,6 +1193,8 @@ endmenu
+ 
+ source "arch/powerpc/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ config KEYS_COMPAT
+Index: linux-2.6.20/arch/powerpc/kernel/asm-offsets.c
+===================================================================
+--- linux-2.6.20.orig/arch/powerpc/kernel/asm-offsets.c
++++ linux-2.6.20/arch/powerpc/kernel/asm-offsets.c
+@@ -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));
+Index: linux-2.6.20/arch/powerpc/kernel/irq.c
+===================================================================
+--- linux-2.6.20.orig/arch/powerpc/kernel/irq.c
++++ linux-2.6.20/arch/powerpc/kernel/irq.c
+@@ -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>
+Index: linux-2.6.20/arch/powerpc/kernel/misc_32.S
+===================================================================
+--- linux-2.6.20.orig/arch/powerpc/kernel/misc_32.S
++++ linux-2.6.20/arch/powerpc/kernel/misc_32.S
+@@ -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
+Index: linux-2.6.20/arch/powerpc/kernel/misc_64.S
+===================================================================
+--- linux-2.6.20.orig/arch/powerpc/kernel/misc_64.S
++++ linux-2.6.20/arch/powerpc/kernel/misc_64.S
+@@ -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
+Index: linux-2.6.20/arch/powerpc/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/powerpc/kernel/process.c
++++ linux-2.6.20/arch/powerpc/kernel/process.c
+@@ -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);
+-	printk("TASK = %p[%d] '%s' THREAD: %p",
+-	       current, current->pid, current->comm, task_thread_info(current));
++	printk("TASK = %p[%d,#%u] '%s' THREAD: %p",
++	       current, current->pid, current->xid,
++	       current->comm, task_thread_info(current));
+ 
+ #ifdef CONFIG_SMP
+ 	printk(" CPU: %d", smp_processor_id());
+Index: linux-2.6.20/arch/powerpc/kernel/sys_ppc32.c
+===================================================================
+--- linux-2.6.20.orig/arch/powerpc/kernel/sys_ppc32.c
++++ linux-2.6.20/arch/powerpc/kernel/sys_ppc32.c
+@@ -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;
+ 	}
+Index: linux-2.6.20/arch/powerpc/kernel/traps.c
+===================================================================
+--- linux-2.6.20.orig/arch/powerpc/kernel/traps.c
++++ linux-2.6.20/arch/powerpc/kernel/traps.c
+@@ -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());
+ }
+ 
+Index: linux-2.6.20/arch/powerpc/kernel/vdso.c
+===================================================================
+--- linux-2.6.20.orig/arch/powerpc/kernel/vdso.c
++++ linux-2.6.20/arch/powerpc/kernel/vdso.c
+@@ -22,6 +22,7 @@
+ #include <linux/elf.h>
+ #include <linux/security.h>
+ #include <linux/bootmem.h>
++#include <linux/vs_memory.h>
+ 
+ #include <asm/pgtable.h>
+ #include <asm/system.h>
+@@ -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;
+-	mm->total_vm += (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
++	vx_vmpages_add(mm, (vma->vm_end - vma->vm_start) >> PAGE_SHIFT);
+ 	up_write(&mm->mmap_sem);
+ 	return 0;
+ 
+Index: linux-2.6.20/arch/ppc/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/ppc/Kconfig
++++ linux-2.6.20/arch/ppc/Kconfig
+@@ -1445,6 +1445,8 @@ source "arch/powerpc/oprofile/Kconfig"
+ 
+ source "arch/ppc/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/ppc/kernel/asm-offsets.c
+===================================================================
+--- linux-2.6.20.orig/arch/ppc/kernel/asm-offsets.c
++++ linux-2.6.20/arch/ppc/kernel/asm-offsets.c
+@@ -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 */
+Index: linux-2.6.20/arch/ppc/kernel/misc.S
+===================================================================
+--- linux-2.6.20.orig/arch/ppc/kernel/misc.S
++++ linux-2.6.20/arch/ppc/kernel/misc.S
+@@ -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
+Index: linux-2.6.20/arch/ppc/kernel/traps.c
+===================================================================
+--- linux-2.6.20.orig/arch/ppc/kernel/traps.c
++++ linux-2.6.20/arch/ppc/kernel/traps.c
+@@ -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());
+ }
+ 
+Index: linux-2.6.20/arch/s390/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/s390/Kconfig
++++ linux-2.6.20/arch/s390/Kconfig
+@@ -522,6 +522,8 @@ endmenu
+ 
+ source "arch/s390/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/s390/kernel/compat_linux.c
+===================================================================
+--- linux-2.6.20.orig/arch/s390/kernel/compat_linux.c
++++ linux-2.6.20/arch/s390/kernel/compat_linux.c
+@@ -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;
+ 	}
+Index: linux-2.6.20/arch/s390/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/s390/kernel/process.c
++++ linux-2.6.20/arch/s390/kernel/process.c
+@@ -165,9 +165,9 @@ void show_regs(struct pt_regs *regs)
+ 	struct task_struct *tsk = current;
+ 
+         printk("CPU:    %d    %s\n", task_thread_info(tsk)->cpu, print_tainted());
+-        printk("Process %s (pid: %d, task: %p, ksp: %p)\n",
+-	       current->comm, current->pid, (void *) tsk,
+-	       (void *) tsk->thread.ksp);
++	printk("Process %s (pid: %d[#%u], task: %p, ksp: %p)\n",
++	       current->comm, current->pid, current->xid,
++	       (void *) tsk, (void *) tsk->thread.ksp);
+ 
+ 	show_registers(regs);
+ 	/* Show stack backtrace if pt_regs is from kernel mode */
+@@ -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, &regs, 0, NULL, NULL);
+ }
+ 
+Index: linux-2.6.20/arch/s390/kernel/ptrace.c
+===================================================================
+--- linux-2.6.20.orig/arch/s390/kernel/ptrace.c
++++ linux-2.6.20/arch/s390/kernel/ptrace.c
+@@ -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), VS_WATCH_P|VS_IDENT)) {
++		ret = -EPERM;
++		goto out_tsk;
++	}
++
+ 	ret = do_ptrace(child, request, addr, data);
++out_tsk:
+ 	put_task_struct(child);
+ out:
+ 	unlock_kernel();
+Index: linux-2.6.20/arch/s390/kernel/syscalls.S
+===================================================================
+--- linux-2.6.20.orig/arch/s390/kernel/syscalls.S
++++ linux-2.6.20/arch/s390/kernel/syscalls.S
+@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
+ SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper)	/* 260 */
+ SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
+ SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,sys32_clock_nanosleep_wrapper)
+-NI_SYSCALL							/* reserved for vserver */
++SYSCALL(sys_vserver,sys_vserver,sys32_vserver)
+ 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)
+Index: linux-2.6.20/arch/sh/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/sh/Kconfig
++++ linux-2.6.20/arch/sh/Kconfig
+@@ -709,6 +709,8 @@ source "arch/sh/oprofile/Kconfig"
+ 
+ source "arch/sh/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/sh/kernel/irq.c
+===================================================================
+--- linux-2.6.20.orig/arch/sh/kernel/irq.c
++++ linux-2.6.20/arch/sh/kernel/irq.c
+@@ -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>
+Index: linux-2.6.20/arch/sh/kernel/kgdb_stub.c
+===================================================================
+--- linux-2.6.20.orig/arch/sh/kernel/kgdb_stub.c
++++ linux-2.6.20/arch/sh/kernel/kgdb_stub.c
+@@ -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;
+Index: linux-2.6.20/arch/sh/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/sh/kernel/process.c
++++ linux-2.6.20/arch/sh/kernel/process.c
+@@ -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, &regs, 0, NULL, NULL);
++	return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++		0, &regs, 0, NULL, NULL);
+ }
+ 
+ /*
+Index: linux-2.6.20/arch/sh/kernel/vsyscall/vsyscall.c
+===================================================================
+--- linux-2.6.20.orig/arch/sh/kernel/vsyscall/vsyscall.c
++++ linux-2.6.20/arch/sh/kernel/vsyscall/vsyscall.c
+@@ -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;
+Index: linux-2.6.20/arch/sh64/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/sh64/kernel/process.c
++++ linux-2.6.20/arch/sh64/kernel/process.c
+@@ -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,
+-		       &regs, 0, NULL, NULL);
++	return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
++		0, &regs, 0, NULL, NULL);
+ }
+ 
+ /*
+Index: linux-2.6.20/arch/sh64/mm/fault.c
+===================================================================
+--- linux-2.6.20.orig/arch/sh64/mm/fault.c
++++ linux-2.6.20/arch/sh64/mm/fault.c
+@@ -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);
+ }
+ 
+ static pte_t *lookup_pte(struct mm_struct *mm, unsigned long address)
+Index: linux-2.6.20/arch/sparc/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/sparc/Kconfig
++++ linux-2.6.20/arch/sparc/Kconfig
+@@ -306,6 +306,8 @@ endmenu
+ 
+ source "arch/sparc/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/sparc/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/sparc/kernel/process.c
++++ linux-2.6.20/arch/sparc/kernel/process.c
+@@ -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;
+Index: linux-2.6.20/arch/sparc/kernel/ptrace.c
+===================================================================
+--- linux-2.6.20.orig/arch/sparc/kernel/ptrace.c
++++ linux-2.6.20/arch/sparc/kernel/ptrace.c
+@@ -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), 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)) {
+Index: linux-2.6.20/arch/sparc/kernel/systbls.S
+===================================================================
+--- linux-2.6.20.orig/arch/sparc/kernel/systbls.S
++++ linux-2.6.20/arch/sparc/kernel/systbls.S
+@@ -71,7 +71,7 @@ sys_call_table:
+ /*250*/	.long sparc_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
+ /*255*/	.long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
+ /*260*/	.long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
+-/*265*/	.long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_io_setup, sys_io_destroy
++/*265*/	.long sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy
+ /*270*/	.long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
+ /*275*/	.long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
+ /*280*/	.long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
+Index: linux-2.6.20/arch/sparc/kernel/traps.c
+===================================================================
+--- linux-2.6.20.orig/arch/sparc/kernel/traps.c
++++ linux-2.6.20/arch/sparc/kernel/traps.c
+@@ -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;
+Index: linux-2.6.20/arch/sparc64/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/sparc64/Kconfig
++++ linux-2.6.20/arch/sparc64/Kconfig
+@@ -447,6 +447,8 @@ endmenu
+ 
+ source "arch/sparc64/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/sparc64/kernel/binfmt_aout32.c
+===================================================================
+--- linux-2.6.20.orig/arch/sparc64/kernel/binfmt_aout32.c
++++ linux-2.6.20/arch/sparc64/kernel/binfmt_aout32.c
+@@ -27,6 +27,7 @@
+ #include <linux/binfmts.h>
+ #include <linux/personality.h>
+ #include <linux/init.h>
++#include <linux/vs_memory.h>
+ 
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+Index: linux-2.6.20/arch/sparc64/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/sparc64/kernel/process.c
++++ linux-2.6.20/arch/sparc64/kernel/process.c
+@@ -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;
+Index: linux-2.6.20/arch/sparc64/kernel/ptrace.c
+===================================================================
+--- linux-2.6.20.orig/arch/sparc64/kernel/ptrace.c
++++ linux-2.6.20/arch/sparc64/kernel/ptrace.c
+@@ -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), 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)) {
+Index: linux-2.6.20/arch/sparc64/kernel/sys_sparc32.c
+===================================================================
+--- linux-2.6.20.orig/arch/sparc64/kernel/sys_sparc32.c
++++ linux-2.6.20/arch/sparc64/kernel/sys_sparc32.c
+@@ -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;
+ 	}
+Index: linux-2.6.20/arch/sparc64/kernel/systbls.S
+===================================================================
+--- linux-2.6.20.orig/arch/sparc64/kernel/systbls.S
++++ linux-2.6.20/arch/sparc64/kernel/systbls.S
+@@ -72,7 +72,7 @@ sys_call_table32:
+ /*250*/	.word sys32_mremap, sys32_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
+ 	.word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
+ /*260*/	.word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun
+-	.word sys_timer_delete, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
++	.word sys_timer_delete, compat_sys_timer_create, sys32_vserver, compat_sys_io_setup, sys_io_destroy
+ /*270*/	.word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink
+ 	.word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
+ /*280*/	.word sys32_tee, sys_add_key, sys_request_key, sys_keyctl, compat_sys_openat
+@@ -142,7 +142,7 @@ sys_call_table:
+ /*250*/	.word sys64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
+ 	.word sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
+ /*260*/	.word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
+-	.word sys_timer_delete, sys_timer_create, sys_ni_syscall, sys_io_setup, sys_io_destroy
++	.word sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy
+ /*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
+Index: linux-2.6.20/arch/sparc64/kernel/traps.c
+===================================================================
+--- linux-2.6.20.orig/arch/sparc64/kernel/traps.c
++++ linux-2.6.20/arch/sparc64/kernel/traps.c
+@@ -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);
+Index: linux-2.6.20/arch/sparc64/solaris/fs.c
+===================================================================
+--- linux-2.6.20.orig/arch/sparc64/solaris/fs.c
++++ linux-2.6.20/arch/sparc64/solaris/fs.c
+@@ -368,7 +368,7 @@ static int report_statvfs(struct vfsmoun
+ 		int j = strlen (p);
+ 		
+ 		if (j > 15) j = 15;
+-		if (IS_RDONLY(inode)) i = 1;
++		if (IS_RDONLY(inode) || MNT_IS_RDONLY(mnt)) i = 1;
+ 		if (mnt->mnt_flags & MNT_NOSUID) i |= 2;
+ 		if (!sysv_valid_dev(inode->i_sb->s_dev))
+ 			return -EOVERFLOW;
+@@ -404,7 +404,7 @@ static int report_statvfs64(struct vfsmo
+ 		int j = strlen (p);
+ 		
+ 		if (j > 15) j = 15;
+-		if (IS_RDONLY(inode)) i = 1;
++		if (IS_RDONLY(inode) || MNT_IS_RDONLY(mnt)) i = 1;
+ 		if (mnt->mnt_flags & MNT_NOSUID) i |= 2;
+ 		if (!sysv_valid_dev(inode->i_sb->s_dev))
+ 			return -EOVERFLOW;
+Index: linux-2.6.20/arch/um/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/um/Kconfig
++++ linux-2.6.20/arch/um/Kconfig
+@@ -311,6 +311,8 @@ source "drivers/connector/Kconfig"
+ 
+ source "fs/Kconfig"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/um/kernel/irq.c
+===================================================================
+--- linux-2.6.20.orig/arch/um/kernel/irq.c
++++ linux-2.6.20/arch/um/kernel/irq.c
+@@ -357,6 +357,7 @@ void forward_interrupts(int pid)
+ unsigned int do_IRQ(int irq, union uml_pt_regs *regs)
+ {
+ 	struct pt_regs *old_regs = set_irq_regs((struct pt_regs *)regs);
++
+ 	irq_enter();
+ 	__do_IRQ(irq);
+ 	irq_exit();
+Index: linux-2.6.20/arch/um/kernel/syscall.c
+===================================================================
+--- linux-2.6.20.orig/arch/um/kernel/syscall.c
++++ linux-2.6.20/arch/um/kernel/syscall.c
+@@ -15,6 +15,7 @@
+ #include "linux/unistd.h"
+ #include "linux/slab.h"
+ #include "linux/utime.h"
++
+ #include "asm/mman.h"
+ #include "asm/uaccess.h"
+ #include "kern_util.h"
+@@ -118,6 +119,7 @@ long sys_uname(struct old_utsname __user
+ long sys_olduname(struct oldold_utsname __user * name)
+ {
+ 	long error;
++	struct new_utsname *ptr;
+ 
+ 	if (!name)
+ 		return -EFAULT;
+Index: linux-2.6.20/arch/v850/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/v850/Kconfig
++++ linux-2.6.20/arch/v850/Kconfig
+@@ -334,6 +334,8 @@ source "drivers/usb/Kconfig"
+ 
+ source "arch/v850/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/v850/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/v850/kernel/process.c
++++ linux-2.6.20/arch/v850/kernel/process.c
+@@ -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)
+Index: linux-2.6.20/arch/v850/kernel/ptrace.c
+===================================================================
+--- linux-2.6.20.orig/arch/v850/kernel/ptrace.c
++++ linux-2.6.20/arch/v850/kernel/ptrace.c
+@@ -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), VS_WATCH_P|VS_IDENT))
++		goto out;
++
+ 	switch (request) {
+ 		unsigned long val, copied;
+ 
+Index: linux-2.6.20/arch/x86_64/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/x86_64/Kconfig
++++ linux-2.6.20/arch/x86_64/Kconfig
+@@ -735,6 +735,8 @@ endmenu
+ 
+ source "arch/x86_64/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+Index: linux-2.6.20/arch/x86_64/ia32/ia32_aout.c
+===================================================================
+--- linux-2.6.20.orig/arch/x86_64/ia32/ia32_aout.c
++++ linux-2.6.20/arch/x86_64/ia32/ia32_aout.c
+@@ -25,6 +25,7 @@
+ #include <linux/binfmts.h>
+ #include <linux/personality.h>
+ #include <linux/init.h>
++#include <linux/vs_memory.h>
+ 
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+Index: linux-2.6.20/arch/x86_64/ia32/ia32_binfmt.c
+===================================================================
+--- linux-2.6.20.orig/arch/x86_64/ia32/ia32_binfmt.c
++++ linux-2.6.20/arch/x86_64/ia32/ia32_binfmt.c
+@@ -324,7 +324,8 @@ int ia32_setup_arg_pages(struct linux_bi
+ 			kmem_cache_free(vm_area_cachep, mpnt);
+ 			return ret;
+ 		}
+-		mm->stack_vm = mm->total_vm = vma_pages(mpnt);
++		vx_vmpages_sub(mm, mm->total_vm - vma_pages(mpnt));
++		mm->stack_vm = mm->total_vm;
+ 	} 
+ 
+ 	for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
+Index: linux-2.6.20/arch/x86_64/ia32/ia32entry.S
+===================================================================
+--- linux-2.6.20.orig/arch/x86_64/ia32/ia32entry.S
++++ linux-2.6.20/arch/x86_64/ia32/ia32entry.S
+@@ -672,7 +672,7 @@ ia32_sys_call_table:
+ 	.quad sys_tgkill		/* 270 */
+ 	.quad compat_sys_utimes
+ 	.quad sys32_fadvise64_64
+-	.quad quiet_ni_syscall	/* sys_vserver */
++	.quad sys32_vserver
+ 	.quad sys_mbind
+ 	.quad compat_sys_get_mempolicy	/* 275 */
+ 	.quad sys_set_mempolicy
+Index: linux-2.6.20/arch/x86_64/ia32/sys_ia32.c
+===================================================================
+--- linux-2.6.20.orig/arch/x86_64/ia32/sys_ia32.c
++++ linux-2.6.20/arch/x86_64/ia32/sys_ia32.c
+@@ -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;
+ 	}
+Index: linux-2.6.20/arch/x86_64/ia32/syscall32.c
+===================================================================
+--- linux-2.6.20.orig/arch/x86_64/ia32/syscall32.c
++++ linux-2.6.20/arch/x86_64/ia32/syscall32.c
+@@ -10,6 +10,7 @@
+ #include <linux/init.h>
+ #include <linux/stringify.h>
+ #include <linux/security.h>
++#include <linux/vs_memory.h>
+ #include <asm/proto.h>
+ #include <asm/tlbflush.h>
+ #include <asm/ia32_unistd.h>
+@@ -77,7 +78,7 @@ int syscall32_setup_pages(struct linux_b
+ 		kmem_cache_free(vm_area_cachep, vma);
+ 		return ret;
+ 	}
+-	mm->total_vm += npages;
++	vx_vmpages_add(mm, npages);
+ 	up_write(&mm->mmap_sem);
+ 	return 0;
+ }
+Index: linux-2.6.20/arch/x86_64/kernel/irq.c
+===================================================================
+--- linux-2.6.20.orig/arch/x86_64/kernel/irq.c
++++ linux-2.6.20/arch/x86_64/kernel/irq.c
+@@ -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();
+ 
+ 	set_irq_regs(old_regs);
+Index: linux-2.6.20/arch/x86_64/kernel/process.c
+===================================================================
+--- linux-2.6.20.orig/arch/x86_64/kernel/process.c
++++ linux-2.6.20/arch/x86_64/kernel/process.c
+@@ -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);
+Index: linux-2.6.20/arch/x86_64/kernel/traps.c
+===================================================================
+--- linux-2.6.20.orig/arch/x86_64/kernel/traps.c
++++ linux-2.6.20/arch/x86_64/kernel/traps.c
+@@ -430,8 +430,9 @@ void show_registers(struct pt_regs *regs
+ 
+ 	printk("CPU %d ", cpu);
+ 	__show_regs(regs);
+-	printk("Process %s (pid: %d, threadinfo %p, task %p)\n",
+-		cur->comm, cur->pid, task_thread_info(cur), cur);
++	printk("Process %s (pid: %d[#%u], threadinfo %p, task %p)\n",
++		cur->comm, cur->pid, cur->xid,
++		task_thread_info(cur), cur);
+ 
+ 	/*
+ 	 * When in-kernel, we also print out the stack and code at the
+@@ -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);
+Index: linux-2.6.20/arch/x86_64/mm/fault.c
+===================================================================
+--- linux-2.6.20.orig/arch/x86_64/mm/fault.c
++++ linux-2.6.20/arch/x86_64/mm/fault.c
+@@ -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;
+Index: linux-2.6.20/block/cfq-iosched.c
+===================================================================
+--- linux-2.6.20.orig/block/cfq-iosched.c
++++ linux-2.6.20/block/cfq-iosched.c
+@@ -221,6 +221,8 @@ static int cfq_queue_empty(request_queue
+ 
+ static inline pid_t cfq_queue_pid(struct task_struct *task, int rw, int is_sync)
+ {
++	if (task->xid)
++		return task->xid + (1 << 16);
+ 	/*
+ 	 * Use the per-process queue, for read requests and syncronous writes
+ 	 */
+Index: linux-2.6.20/drivers/block/Kconfig
+===================================================================
+--- linux-2.6.20.orig/drivers/block/Kconfig
++++ linux-2.6.20/drivers/block/Kconfig
+@@ -311,6 +311,13 @@ config BLK_DEV_CRYPTOLOOP
+ 	  instead, which can be configured to be on-disk compatible with the
+ 	  cryptoloop device.
+ 
++config BLK_DEV_VROOT
++	tristate "Virtual Root device support"
++	depends on QUOTACTL
++	---help---
++	  Saying Y here will allow you to use quota/fs ioctls on a shared
++	  partition within a virtual server without compromising security.
++
+ config BLK_DEV_NBD
+ 	tristate "Network block device support"
+ 	depends on NET
+Index: linux-2.6.20/drivers/block/Makefile
+===================================================================
+--- linux-2.6.20.orig/drivers/block/Makefile
++++ linux-2.6.20/drivers/block/Makefile
+@@ -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
+ 
+Index: linux-2.6.20/drivers/block/loop.c
+===================================================================
+--- linux-2.6.20.orig/drivers/block/loop.c
++++ linux-2.6.20/drivers/block/loop.c
+@@ -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>
+ 
+@@ -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_IDENT|VS_HOSTID))
++		return -EACCES;
++
+ 	mutex_lock(&lo->lo_ctl_mutex);
+ 	lo->lo_refcnt++;
+ 	mutex_unlock(&lo->lo_ctl_mutex);
+Index: linux-2.6.20/drivers/block/vroot.c
+===================================================================
+--- /dev/null
++++ linux-2.6.20/drivers/block/vroot.c
+@@ -0,0 +1,281 @@
++/*
++ *  linux/drivers/block/vroot.c
++ *
++ *  written by Herbert Pötzl, 9/11/2002
++ *  ported to 2.6.10 by Herbert Pötzl, 30/12/2004
++ *
++ *  based on the loop.c code by Theodore Ts'o.
++ *
++ * Copyright (C) 2002-2006 by Herbert Pötzl.
++ * Redistribution of this file is permitted under the
++ * GNU General Public License.
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/file.h>
++#include <linux/major.h>
++#include <linux/blkdev.h>
++
++#include <linux/vroot.h>
++#include <linux/vs_context.h>
++
++
++static int max_vroot = 8;
++
++static struct vroot_device *vroot_dev;
++static struct gendisk **disks;
++
++
++static int vroot_set_dev(
++	struct vroot_device *vr,
++	struct file *vr_file,
++	struct block_device *bdev,
++	unsigned int arg)
++{
++	struct block_device *real_bdev;
++	struct file *file;
++	struct inode *inode;
++	int error;
++
++	error = -EBUSY;
++	if (vr->vr_state != Vr_unbound)
++		goto out;
++
++	error = -EBADF;
++	file = fget(arg);
++	if (!file)
++		goto out;
++
++	error = -EINVAL;
++	inode = file->f_dentry->d_inode;
++
++
++	if (S_ISBLK(inode->i_mode)) {
++		real_bdev = inode->i_bdev;
++		vr->vr_device = real_bdev;
++		__iget(real_bdev->bd_inode);
++	} else
++		goto out_fput;
++
++	vxdprintk(VXD_CBIT(misc, 0),
++		"vroot[%d]_set_dev: dev=" VXF_DEV,
++		vr->vr_number, VXD_DEV(real_bdev));
++
++	vr->vr_state = Vr_bound;
++	error = 0;
++
++ out_fput:
++	fput(file);
++ out:
++	return error;
++}
++
++static int vroot_clr_dev(
++	struct vroot_device *vr,
++	struct file *vr_file,
++	struct block_device *bdev)
++{
++	struct block_device *real_bdev;
++
++	if (vr->vr_state != Vr_bound)
++		return -ENXIO;
++	if (vr->vr_refcnt > 1)	/* we needed one fd for the ioctl */
++		return -EBUSY;
++
++	real_bdev = vr->vr_device;
++
++	vxdprintk(VXD_CBIT(misc, 0),
++		"vroot[%d]_clr_dev: dev=" VXF_DEV,
++		vr->vr_number, VXD_DEV(real_bdev));
++
++	bdput(real_bdev);
++	vr->vr_state = Vr_unbound;
++	vr->vr_device = NULL;
++	return 0;
++}
++
++
++static int vr_ioctl(struct inode * inode, struct file * file,
++	unsigned int cmd, unsigned long arg)
++{
++	struct vroot_device *vr = inode->i_bdev->bd_disk->private_data;
++	int err;
++
++	down(&vr->vr_ctl_mutex);
++	switch (cmd) {
++	case VROOT_SET_DEV:
++		err = vroot_set_dev(vr, file, inode->i_bdev, arg);
++		break;
++	case VROOT_CLR_DEV:
++		err = vroot_clr_dev(vr, file, inode->i_bdev);
++		break;
++	default:
++		err = -EINVAL;
++		break;
++	}
++	up(&vr->vr_ctl_mutex);
++	return err;
++}
++
++static int vr_open(struct inode *inode, struct file *file)
++{
++	struct vroot_device *vr = inode->i_bdev->bd_disk->private_data;
++
++	down(&vr->vr_ctl_mutex);
++	vr->vr_refcnt++;
++	up(&vr->vr_ctl_mutex);
++	return 0;
++}
++
++static int vr_release(struct inode *inode, struct file *file)
++{
++	struct vroot_device *vr = inode->i_bdev->bd_disk->private_data;
++
++	down(&vr->vr_ctl_mutex);
++	--vr->vr_refcnt;
++	up(&vr->vr_ctl_mutex);
++	return 0;
++}
++
++static struct block_device_operations vr_fops = {
++	.owner =	THIS_MODULE,
++	.open =		vr_open,
++	.release =	vr_release,
++	.ioctl =	vr_ioctl,
++};
++
++struct block_device *__vroot_get_real_bdev(struct block_device *bdev)
++{
++	struct inode *inode = bdev->bd_inode;
++	struct vroot_device *vr;
++	struct block_device *real_bdev;
++	int minor = iminor(inode);
++
++	vr = &vroot_dev[minor];
++	real_bdev = vr->vr_device;
++
++	vxdprintk(VXD_CBIT(misc, 0),
++		"vroot[%d]_get_real_bdev: dev=" VXF_DEV,
++		vr->vr_number, VXD_DEV(real_bdev));
++
++	if (vr->vr_state != Vr_bound)
++		return ERR_PTR(-ENXIO);
++
++	__iget(real_bdev->bd_inode);
++	return real_bdev;
++}
++
++/*
++ * And now the modules code and kernel interface.
++ */
++
++module_param(max_vroot, int, 0);
++
++MODULE_PARM_DESC(max_vroot, "Maximum number of vroot devices (1-256)");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS_BLOCKDEV_MAJOR(VROOT_MAJOR);
++
++MODULE_AUTHOR ("Herbert Pötzl");
++MODULE_DESCRIPTION ("Virtual Root Device Mapper");
++
++
++int __init vroot_init(void)
++{
++	int err, i;
++
++	if (max_vroot < 1 || max_vroot > 256) {
++		max_vroot = MAX_VROOT_DEFAULT;
++		printk(KERN_WARNING "vroot: invalid max_vroot "
++			"(must be between 1 and 256), "
++			"using default (%d)\n", max_vroot);
++	}
++
++	if (register_blkdev(VROOT_MAJOR, "vroot"))
++		return -EIO;
++
++	err = -ENOMEM;
++	vroot_dev = kmalloc(max_vroot * sizeof(struct vroot_device), GFP_KERNEL);
++	if (!vroot_dev)
++		goto out_mem1;
++	memset(vroot_dev, 0, max_vroot * sizeof(struct vroot_device));
++
++	disks = kmalloc(max_vroot * sizeof(struct gendisk *), GFP_KERNEL);
++	if (!disks)
++		goto out_mem2;
++
++	for (i = 0; i < max_vroot; i++) {
++		disks[i] = alloc_disk(1);
++		if (!disks[i])
++			goto out_mem3;
++	}
++
++	for (i = 0; i < max_vroot; i++) {
++		struct vroot_device *vr = &vroot_dev[i];
++		struct gendisk *disk = disks[i];
++
++		memset(vr, 0, sizeof(*vr));
++		init_MUTEX(&vr->vr_ctl_mutex);
++		vr->vr_number = i;
++		disk->major = VROOT_MAJOR;
++		disk->first_minor = i;
++		disk->fops = &vr_fops;
++		sprintf(disk->disk_name, "vroot%d", i);
++		disk->private_data = vr;
++	}
++
++	err = register_vroot_grb(&__vroot_get_real_bdev);
++	if (err)
++		goto out_mem3;
++
++	for (i = 0; i < max_vroot; i++)
++		add_disk(disks[i]);
++	printk(KERN_INFO "vroot: loaded (max %d devices)\n", max_vroot);
++	return 0;
++
++out_mem3:
++	while (i--)
++		put_disk(disks[i]);
++	kfree(disks);
++out_mem2:
++	kfree(vroot_dev);
++out_mem1:
++	unregister_blkdev(VROOT_MAJOR, "vroot");
++	printk(KERN_ERR "vroot: ran out of memory\n");
++	return err;
++}
++
++void vroot_exit(void)
++{
++	int i;
++
++	if (unregister_vroot_grb(&__vroot_get_real_bdev))
++		printk(KERN_WARNING "vroot: cannot unregister grb\n");
++
++	for (i = 0; i < max_vroot; i++) {
++		del_gendisk(disks[i]);
++		put_disk(disks[i]);
++	}
++	if (unregister_blkdev(VROOT_MAJOR, "vroot"))
++		printk(KERN_WARNING "vroot: cannot unregister blkdev\n");
++
++	kfree(disks);
++	kfree(vroot_dev);
++}
++
++module_init(vroot_init);
++module_exit(vroot_exit);
++
++#ifndef MODULE
++
++static int __init max_vroot_setup(char *str)
++{
++	max_vroot = simple_strtol(str, NULL, 0);
++	return 1;
++}
++
++__setup("max_vroot=", max_vroot_setup);
++
++#endif
++
+Index: linux-2.6.20/drivers/char/random.c
+===================================================================
+--- linux-2.6.20.orig/drivers/char/random.c
++++ linux-2.6.20/drivers/char/random.c
+@@ -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)
+ {
+-	ctl_table fake_table;
++	ctl_table fake_table = {0};
+ 	unsigned char buf[64], tmp_uuid[16], *uuid;
+ 
+ 	uuid = table->data;
+Index: linux-2.6.20/drivers/char/sysrq.c
+===================================================================
+--- linux-2.6.20.orig/drivers/char/sysrq.c
++++ linux-2.6.20/drivers/char/sysrq.c
+@@ -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;
+Index: linux-2.6.20/drivers/char/tty_io.c
+===================================================================
+--- linux-2.6.20.orig/drivers/char/tty_io.c
++++ linux-2.6.20/drivers/char/tty_io.c
+@@ -103,6 +103,7 @@
+ #include <linux/selection.h>
+ 
+ #include <linux/kmod.h>
++#include <linux/vs_pid.h>
+ 
+ #undef TTY_DEBUG_HANGUP
+ 
+@@ -2964,13 +2965,16 @@ unlock:
+ 
+ static int tiocgpgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t __user *p)
+ {
++	pid_t pgrp;
+ 	/*
+ 	 * (tty == real_tty) is a cheap way of
+ 	 * testing if the tty is NOT a master pty.
+ 	 */
+ 	if (tty == real_tty && current->signal->tty != real_tty)
+ 		return -ENOTTY;
+-	return put_user(real_tty->pgrp, p);
++
++	pgrp = vx_map_pid(real_tty->pgrp);
++	return put_user(pgrp, p);
+ }
+ 
+ /**
+@@ -3000,6 +3004,8 @@ static int tiocspgrp(struct tty_struct *
+ 		return -ENOTTY;
+ 	if (get_user(pgrp, p))
+ 		return -EFAULT;
++
++	pgrp = vx_rmap_pid(pgrp);
+ 	if (pgrp < 0)
+ 		return -EINVAL;
+ 	if (session_of_pgrp(pgrp) != process_session(current))
+Index: linux-2.6.20/drivers/infiniband/core/uverbs_mem.c
+===================================================================
+--- linux-2.6.20.orig/drivers/infiniband/core/uverbs_mem.c
++++ linux-2.6.20/drivers/infiniband/core/uverbs_mem.c
+@@ -36,6 +36,7 @@
+ 
+ #include <linux/mm.h>
+ #include <linux/dma-mapping.h>
++#include <linux/vs_memory.h>
+ 
+ #include "uverbs.h"
+ 
+@@ -161,7 +162,7 @@ out:
+ 	if (ret < 0)
+ 		__ib_umem_release(dev, mem, 0);
+ 	else
+-		current->mm->locked_vm = locked;
++		vx_vmlocked_sub(current->mm, current->mm->locked_vm - locked);
+ 
+ 	up_write(&current->mm->mmap_sem);
+ 	free_page((unsigned long) page_list);
+@@ -174,8 +175,8 @@ void ib_umem_release(struct ib_device *d
+ 	__ib_umem_release(dev, umem, 1);
+ 
+ 	down_write(&current->mm->mmap_sem);
+-	current->mm->locked_vm -=
+-		PAGE_ALIGN(umem->length + umem->offset) >> PAGE_SHIFT;
++	vx_vmlocked_sub(current->mm,
++		PAGE_ALIGN(umem->length + umem->offset) >> PAGE_SHIFT);
+ 	up_write(&current->mm->mmap_sem);
+ }
+ 
+@@ -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;
++	vx_vmlocked_sub(work->mm, work->diff);
+ 	up_write(&work->mm->mmap_sem);
+ 	mmput(work->mm);
+ 	kfree(work);
+Index: linux-2.6.20/drivers/infiniband/hw/ipath/ipath_user_pages.c
+===================================================================
+--- linux-2.6.20.orig/drivers/infiniband/hw/ipath/ipath_user_pages.c
++++ linux-2.6.20/drivers/infiniband/hw/ipath/ipath_user_pages.c
+@@ -33,6 +33,7 @@
+ 
+ #include <linux/mm.h>
+ #include <linux/device.h>
++#include <linux/vs_memory.h>
+ 
+ #include "ipath_kernel.h"
+ 
+@@ -61,7 +62,8 @@ static int __get_user_pages(unsigned lon
+ 	lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >>
+ 		PAGE_SHIFT;
+ 
+-	if (num_pages > lock_limit) {
++	if (num_pages > lock_limit ||
++		!vx_vmlocked_avail(current->mm, num_pages)) {
+ 		ret = -ENOMEM;
+ 		goto bail;
+ 	}
+@@ -78,7 +80,7 @@ static int __get_user_pages(unsigned lon
+ 			goto bail_release;
+ 	}
+ 
+-	current->mm->locked_vm += num_pages;
++	vx_vmlocked_add(current->mm, num_pages);
+ 
+ 	ret = 0;
+ 	goto bail;
+@@ -203,7 +205,7 @@ void ipath_release_user_pages(struct pag
+ 
+ 	__ipath_release_user_pages(p, num_pages, 1);
+ 
+-	current->mm->locked_vm -= num_pages;
++	vx_vmlocked_sub(current->mm, num_pages);
+ 
+ 	up_write(&current->mm->mmap_sem);
+ }
+@@ -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;
++	vx_vmlocked_sub(work->mm, work->num_pages);
+ 	up_write(&work->mm->mmap_sem);
+ 	mmput(work->mm);
+ 	kfree(work);
+Index: linux-2.6.20/drivers/md/dm-ioctl.c
+===================================================================
+--- linux-2.6.20.orig/drivers/md/dm-ioctl.c
++++ linux-2.6.20/drivers/md/dm-ioctl.c
+@@ -15,6 +15,7 @@
+ #include <linux/slab.h>
+ #include <linux/dm-ioctl.h>
+ #include <linux/hdreg.h>
++#include <linux/vs_context.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -100,7 +101,8 @@ static struct hash_cell *__get_name_cell
+ 	unsigned int h = hash_str(str);
+ 
+ 	list_for_each_entry (hc, _name_buckets + h, name_list)
+-		if (!strcmp(hc->name, str)) {
++		if (vx_check(dm_get_xid(hc->md), VS_WATCH_P|VS_IDENT) &&
++			!strcmp(hc->name, str)) {
+ 			dm_get(hc->md);
+ 			return hc;
+ 		}
+@@ -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)
+Index: linux-2.6.20/drivers/md/dm.c
+===================================================================
+--- linux-2.6.20.orig/drivers/md/dm.c
++++ linux-2.6.20/drivers/md/dm.c
+@@ -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|VS_HOSTID))
+ 		goto out;
+-	}
+ 
+ 	dm_get(md);
+ 	atomic_inc(&md->open_count);
+-
++	ret = 0;
+ out:
+ 	spin_unlock(&_minor_lock);
+-
+-	return md ? 0 : -ENXIO;
++	return ret;
+ }
+ 
+ static int dm_blk_close(struct 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)
+Index: linux-2.6.20/drivers/md/dm.h
+===================================================================
+--- linux-2.6.20.orig/drivers/md/dm.h
++++ linux-2.6.20/drivers/md/dm.h
+@@ -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.
+  *---------------------------------------------------------------*/
+Index: linux-2.6.20/fs/attr.c
+===================================================================
+--- linux-2.6.20.orig/fs/attr.c
++++ linux-2.6.20/fs/attr.c
+@@ -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, VS_ADMIN))
++		goto fine;
++
++	if (IS_BARRIER(inode)) {
++		vxwprintk(1, "xid=%d messing with the barrier.",
++			vx_current_xid());
++		goto error;
++	}
++	switch (inode->i_sb->s_magic) {
++		case PROC_SUPER_MAGIC:
++			/* maybe allow that in the future? */
++			vxwprintk(1, "xid=%d messing with the procfs.",
++				vx_current_xid());
++			goto error;
++		case DEVPTS_SUPER_MAGIC:
++			/* devpts is xid tagged */
++			if (vx_check((xid_t)inode->i_tag, VS_IDENT))
++				goto fine;
++			vxwprintk(1, "xid=%d messing with the devpts.",
++				vx_current_xid());
++			goto error;
++	}
+ fine:
+ 	retval = 0;
+ error:
+@@ -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_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 +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_TAG && attr->ia_tag != inode->i_tag))
+ 				error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;
+ 			if (!error)
+ 				error = inode_setattr(inode, attr);
+Index: linux-2.6.20/fs/binfmt_aout.c
+===================================================================
+--- linux-2.6.20.orig/fs/binfmt_aout.c
++++ linux-2.6.20/fs/binfmt_aout.c
+@@ -24,6 +24,7 @@
+ #include <linux/binfmts.h>
+ #include <linux/personality.h>
+ #include <linux/init.h>
++#include <linux/vs_memory.h>
+ 
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+Index: linux-2.6.20/fs/binfmt_elf.c
+===================================================================
+--- linux-2.6.20.orig/fs/binfmt_elf.c
++++ linux-2.6.20/fs/binfmt_elf.c
+@@ -39,6 +39,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/random.h>
+ #include <linux/elf.h>
++#include <linux/vs_memory.h>
+ #include <asm/uaccess.h>
+ #include <asm/param.h>
+ #include <asm/page.h>
+Index: linux-2.6.20/fs/binfmt_flat.c
+===================================================================
+--- linux-2.6.20.orig/fs/binfmt_flat.c
++++ linux-2.6.20/fs/binfmt_flat.c
+@@ -36,6 +36,7 @@
+ #include <linux/init.h>
+ #include <linux/flat.h>
+ #include <linux/syscalls.h>
++#include <linux/vs_memory.h>
+ 
+ #include <asm/byteorder.h>
+ #include <asm/system.h>
+Index: linux-2.6.20/fs/binfmt_som.c
+===================================================================
+--- linux-2.6.20.orig/fs/binfmt_som.c
++++ linux-2.6.20/fs/binfmt_som.c
+@@ -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>
+Index: linux-2.6.20/fs/dcache.c
+===================================================================
+--- linux-2.6.20.orig/fs/dcache.c
++++ linux-2.6.20/fs/dcache.c
+@@ -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);
+Index: linux-2.6.20/fs/devpts/inode.c
+===================================================================
+--- linux-2.6.20.orig/fs/devpts/inode.c
++++ linux-2.6.20/fs/devpts/inode.c
+@@ -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
++
++static int devpts_permission(struct inode *inode, int mask, struct nameidata *nd)
++{
++	int ret = -EACCES;
++
++	/* 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;
++}
++
++static struct inode_operations devpts_file_inode_operations = {
++	.permission     = devpts_permission,
++};
+ 
+ static struct vfsmount *devpts_mnt;
+ static struct dentry *devpts_root;
+@@ -91,6 +105,25 @@ static int devpts_remount(struct super_b
+ 	return 0;
+ }
+ 
++static int devpts_filter(struct dentry *de)
++{
++	/* 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)
++{
++	return dcache_readdir_filter(filp, dirent, filldir, devpts_filter);
++}
++
++static struct file_operations devpts_dir_operations = {
++	.open		= dcache_dir_open,
++	.release	= dcache_dir_close,
++	.llseek		= dcache_dir_lseek,
++	.read		= generic_read_dir,
++	.readdir	= devpts_readdir,
++};
++
+ static struct super_operations devpts_sops = {
+ 	.statfs		= simple_statfs,
+ 	.remount_fs	= devpts_remount,
+@@ -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;
++	/* 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)
+@@ -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);
++	/* devpts is xid tagged */
++	inode->i_tag = (tag_t)vx_current_xid();
++	inode->i_op = &devpts_file_inode_operations;
+ 	inode->i_private = tty;
+ 
+ 	dentry = get_node(number);
+Index: linux-2.6.20/fs/dquot.c
+===================================================================
+--- linux-2.6.20.orig/fs/dquot.c
++++ linux-2.6.20/fs/dquot.c
+@@ -185,7 +185,7 @@ static void put_quota_format(struct quot
+ /*
+  * Dquot List Management:
+  * The quota code uses three lists for dquot management: the inuse_list,
+- * free_dquots, and dquot_hash[] array. A single dquot structure may be
++ * free_dquots, and hash->dqh_hash[] array. A single dquot structure may be
+  * on all three lists, depending on its current state.
+  *
+  * All dquots are placed to the end of inuse_list when first created, and this
+@@ -198,7 +198,7 @@ static void put_quota_format(struct quot
+  * dquot is invalidated it's completely released from memory.
+  *
+  * Dquots with a specific identity (device, type and id) are placed on
+- * one of the dquot_hash[] hash chains. The provides an efficient search
++ * one of the hash->dqh_hash[] hash chains. The provides an efficient search
+  * mechanism to locate a specific dquot.
+  */
+ 
+@@ -212,36 +212,44 @@ struct dqstats dqstats;
+ static void dqput(struct dquot *dquot);
+ 
+ static inline unsigned int
+-hashfn(const struct super_block *sb, unsigned int id, int type)
++hashfn(struct dqhash *hash, unsigned int id, int type)
+ {
+ 	unsigned long tmp;
+ 
+-	tmp = (((unsigned long)sb>>L1_CACHE_SHIFT) ^ id) * (MAXQUOTAS - type);
++	tmp = (((unsigned long)hash >> L1_CACHE_SHIFT) ^ id) * (MAXQUOTAS - type);
+ 	return (tmp + (tmp >> dq_hash_bits)) & dq_hash_mask;
+ }
+ 
+ /*
+  * Following list functions expect dq_list_lock to be held
+  */
+-static inline void insert_dquot_hash(struct dquot *dquot)
++static inline void insert_dquot_hash(struct dqhash *hash, struct dquot *dquot)
+ {
+-	struct hlist_head *head = dquot_hash + hashfn(dquot->dq_sb, dquot->dq_id, dquot->dq_type);
++	struct hlist_head *head = dquot_hash +
++		hashfn(hash, dquot->dq_id, dquot->dq_type);
++	/* struct hlist_head *head = hash->dqh_hash +
++		hashfn(dquot->dq_dqh, dquot->dq_id, dquot->dq_type); */
+ 	hlist_add_head(&dquot->dq_hash, head);
++	dquot->dq_dqh = dqhget(hash);
+ }
+ 
+ static inline void remove_dquot_hash(struct dquot *dquot)
+ {
+ 	hlist_del_init(&dquot->dq_hash);
++	dqhput(dquot->dq_dqh);
++	dquot->dq_dqh = NULL;
+ }
+ 
+-static inline struct dquot *find_dquot(unsigned int hashent, struct super_block *sb, unsigned int id, int type)
++static inline struct dquot *find_dquot(struct dqhash *hash,
++	unsigned int hashent, unsigned int id, int type)
+ {
+ 	struct hlist_node *node;
+ 	struct dquot *dquot;
+ 
+-	hlist_for_each (node, dquot_hash+hashent) {
++	/* hlist_for_each (node, hash->dqh_hash + hashent) { */
++	hlist_for_each (node, dquot_hash + hashent) {
+ 		dquot = hlist_entry(node, struct dquot, dq_hash);
+-		if (dquot->dq_sb == sb && dquot->dq_id == id && dquot->dq_type == type)
++		if (dquot->dq_dqh == hash && dquot->dq_id == id && dquot->dq_type == type)
+ 			return dquot;
+ 	}
+ 	return NODQUOT;
+@@ -285,13 +293,13 @@ static void wait_on_dquot(struct dquot *
+ 	mutex_unlock(&dquot->dq_lock);
+ }
+ 
+-#define mark_dquot_dirty(dquot) ((dquot)->dq_sb->dq_op->mark_dirty(dquot))
++#define mark_dquot_dirty(dquot) ((dquot)->dq_dqh->dqh_qop->mark_dirty(dquot))
+ 
+ int dquot_mark_dquot_dirty(struct dquot *dquot)
+ {
+ 	spin_lock(&dq_list_lock);
+ 	if (!test_and_set_bit(DQ_MOD_B, &dquot->dq_flags))
+-		list_add(&dquot->dq_dirty, &sb_dqopt(dquot->dq_sb)->
++		list_add(&dquot->dq_dirty, &dqh_dqopt(dquot->dq_dqh)->
+ 				info[dquot->dq_type].dqi_dirty_list);
+ 	spin_unlock(&dq_list_lock);
+ 	return 0;
+@@ -306,9 +314,9 @@ static inline int clear_dquot_dirty(stru
+ 	return 1;
+ }
+ 
+-void mark_info_dirty(struct super_block *sb, int type)
++void mark_info_dirty(struct dqhash *hash, int type)
+ {
+-	set_bit(DQF_INFO_DIRTY_B, &sb_dqopt(sb)->info[type].dqi_flags);
++	set_bit(DQF_INFO_DIRTY_B, &dqh_dqopt(hash)->info[type].dqi_flags);
+ }
+ EXPORT_SYMBOL(mark_info_dirty);
+ 
+@@ -319,7 +327,7 @@ EXPORT_SYMBOL(mark_info_dirty);
+ int dquot_acquire(struct dquot *dquot)
+ {
+ 	int ret = 0, ret2 = 0;
+-	struct quota_info *dqopt = sb_dqopt(dquot->dq_sb);
++	struct quota_info *dqopt = dqh_dqopt(dquot->dq_dqh);
+ 
+ 	mutex_lock(&dquot->dq_lock);
+ 	mutex_lock(&dqopt->dqio_mutex);
+@@ -333,7 +341,7 @@ int dquot_acquire(struct dquot *dquot)
+ 		ret = dqopt->ops[dquot->dq_type]->commit_dqblk(dquot);
+ 		/* Write the info if needed */
+ 		if (info_dirty(&dqopt->info[dquot->dq_type]))
+-			ret2 = dqopt->ops[dquot->dq_type]->write_file_info(dquot->dq_sb, dquot->dq_type);
++			ret2 = dqopt->ops[dquot->dq_type]->write_file_info(dquot->dq_dqh, dquot->dq_type);
+ 		if (ret < 0)
+ 			goto out_iolock;
+ 		if (ret2 < 0) {
+@@ -354,7 +362,7 @@ out_iolock:
+ int dquot_commit(struct dquot *dquot)
+ {
+ 	int ret = 0, ret2 = 0;
+-	struct quota_info *dqopt = sb_dqopt(dquot->dq_sb);
++	struct quota_info *dqopt = dqh_dqopt(dquot->dq_dqh);
+ 
+ 	mutex_lock(&dqopt->dqio_mutex);
+ 	spin_lock(&dq_list_lock);
+@@ -368,7 +376,7 @@ int dquot_commit(struct dquot *dquot)
+ 	if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) {
+ 		ret = dqopt->ops[dquot->dq_type]->commit_dqblk(dquot);
+ 		if (info_dirty(&dqopt->info[dquot->dq_type]))
+-			ret2 = dqopt->ops[dquot->dq_type]->write_file_info(dquot->dq_sb, dquot->dq_type);
++			ret2 = dqopt->ops[dquot->dq_type]->write_file_info(dquot->dq_dqh, dquot->dq_type);
+ 		if (ret >= 0)
+ 			ret = ret2;
+ 	}
+@@ -383,7 +391,7 @@ out_sem:
+ int dquot_release(struct dquot *dquot)
+ {
+ 	int ret = 0, ret2 = 0;
+-	struct quota_info *dqopt = sb_dqopt(dquot->dq_sb);
++	struct quota_info *dqopt = dqh_dqopt(dquot->dq_dqh);
+ 
+ 	mutex_lock(&dquot->dq_lock);
+ 	/* Check whether we are not racing with some other dqget() */
+@@ -394,7 +402,7 @@ int dquot_release(struct dquot *dquot)
+ 		ret = dqopt->ops[dquot->dq_type]->release_dqblk(dquot);
+ 		/* Write the info */
+ 		if (info_dirty(&dqopt->info[dquot->dq_type]))
+-			ret2 = dqopt->ops[dquot->dq_type]->write_file_info(dquot->dq_sb, dquot->dq_type);
++			ret2 = dqopt->ops[dquot->dq_type]->write_file_info(dquot->dq_dqh, dquot->dq_type);
+ 		if (ret >= 0)
+ 			ret = ret2;
+ 	}
+@@ -411,14 +419,14 @@ out_dqlock:
+  * just deleted or pruned by prune_icache() (those are not attached to any
+  * list). We have to wait for such users.
+  */
+-static void invalidate_dquots(struct super_block *sb, int type)
++static void invalidate_dquots(struct dqhash *hash, int type)
+ {
+ 	struct dquot *dquot, *tmp;
+ 
+ restart:
+ 	spin_lock(&dq_list_lock);
+ 	list_for_each_entry_safe(dquot, tmp, &inuse_list, dq_inuse) {
+-		if (dquot->dq_sb != sb)
++		if (dquot->dq_dqh != hash)
+ 			continue;
+ 		if (dquot->dq_type != type)
+ 			continue;
+@@ -458,18 +466,18 @@ restart:
+ 	spin_unlock(&dq_list_lock);
+ }
+ 
+-int vfs_quota_sync(struct super_block *sb, int type)
++int vfs_quota_sync(struct dqhash *hash, int type)
+ {
+ 	struct list_head *dirty;
+ 	struct dquot *dquot;
+-	struct quota_info *dqopt = sb_dqopt(sb);
++	struct quota_info *dqopt = dqh_dqopt(hash);
+ 	int cnt;
+ 
+ 	mutex_lock(&dqopt->dqonoff_mutex);
+ 	for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
+ 		if (type != -1 && cnt != type)
+ 			continue;
+-		if (!sb_has_quota_enabled(sb, cnt))
++		if (!dqh_has_quota_enabled(hash, cnt))
+ 			continue;
+ 		spin_lock(&dq_list_lock);
+ 		dirty = &dqopt->info[cnt].dqi_dirty_list;
+@@ -486,7 +494,7 @@ int vfs_quota_sync(struct super_block *s
+ 			atomic_inc(&dquot->dq_count);
+ 			dqstats.lookups++;
+ 			spin_unlock(&dq_list_lock);
+-			sb->dq_op->write_dquot(dquot);
++			hash->dqh_qop->write_dquot(dquot);
+ 			dqput(dquot);
+ 			spin_lock(&dq_list_lock);
+ 		}
+@@ -494,9 +502,10 @@ int vfs_quota_sync(struct super_block *s
+ 	}
+ 
+ 	for (cnt = 0; cnt < MAXQUOTAS; cnt++)
+-		if ((cnt == type || type == -1) && sb_has_quota_enabled(sb, cnt)
++		if ((cnt == type || type == -1)
++			&& dqh_has_quota_enabled(hash, cnt)
+ 			&& info_dirty(&dqopt->info[cnt]))
+-			sb->dq_op->write_info(sb, cnt);
++			hash->dqh_qop->write_info(hash, cnt);
+ 	spin_lock(&dq_list_lock);
+ 	dqstats.syncs++;
+ 	spin_unlock(&dq_list_lock);
+@@ -551,7 +560,7 @@ static void dqput(struct dquot *dquot)
+ 	if (!atomic_read(&dquot->dq_count)) {
+ 		printk("VFS: dqput: trying to free free dquot\n");
+ 		printk("VFS: device %s, dquot of %s %d\n",
+-			dquot->dq_sb->s_id,
++			dquot->dq_dqh->dqh_sb->s_id,
+ 			quotatypes[dquot->dq_type],
+ 			dquot->dq_id);
+ 		BUG();
+@@ -567,7 +576,7 @@ we_slept:
+ 		/* We have more than one user... nothing to do */
+ 		atomic_dec(&dquot->dq_count);
+ 		/* Releasing dquot during quotaoff phase? */
+-		if (!sb_has_quota_enabled(dquot->dq_sb, dquot->dq_type) &&
++		if (!dqh_has_quota_enabled(dquot->dq_dqh, dquot->dq_type) &&
+ 		    atomic_read(&dquot->dq_count) == 1)
+ 			wake_up(&dquot->dq_wait_unused);
+ 		spin_unlock(&dq_list_lock);
+@@ -577,14 +586,14 @@ we_slept:
+ 	if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags) && dquot_dirty(dquot)) {
+ 		spin_unlock(&dq_list_lock);
+ 		/* Commit dquot before releasing */
+-		dquot->dq_sb->dq_op->write_dquot(dquot);
++		dquot->dq_dqh->dqh_qop->write_dquot(dquot);
+ 		goto we_slept;
+ 	}
+ 	/* Clear flag in case dquot was inactive (something bad happened) */
+ 	clear_dquot_dirty(dquot);
+ 	if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) {
+ 		spin_unlock(&dq_list_lock);
+-		dquot->dq_sb->dq_op->release_dquot(dquot);
++		dquot->dq_dqh->dqh_qop->release_dquot(dquot);
+ 		goto we_slept;
+ 	}
+ 	atomic_dec(&dquot->dq_count);
+@@ -596,7 +605,7 @@ we_slept:
+ 	spin_unlock(&dq_list_lock);
+ }
+ 
+-static struct dquot *get_empty_dquot(struct super_block *sb, int type)
++static struct dquot *get_empty_dquot(int type)
+ {
+ 	struct dquot *dquot;
+ 
+@@ -611,7 +620,7 @@ static struct dquot *get_empty_dquot(str
+ 	INIT_HLIST_NODE(&dquot->dq_hash);
+ 	INIT_LIST_HEAD(&dquot->dq_dirty);
+ 	init_waitqueue_head(&dquot->dq_wait_unused);
+-	dquot->dq_sb = sb;
++	dquot->dq_dqh = NULL;
+ 	dquot->dq_type = type;
+ 	atomic_set(&dquot->dq_count, 1);
+ 
+@@ -622,19 +631,19 @@ static struct dquot *get_empty_dquot(str
+  * Get reference to dquot
+  * MUST be called with either dqptr_sem or dqonoff_mutex held
+  */
+-static struct dquot *dqget(struct super_block *sb, unsigned int id, int type)
++static struct dquot *dqget(struct dqhash *hash, unsigned int id, int type)
+ {
+-	unsigned int hashent = hashfn(sb, id, type);
++	unsigned int hashent = hashfn(hash, id, type);
+ 	struct dquot *dquot, *empty = NODQUOT;
+ 
+-        if (!sb_has_quota_enabled(sb, type))
++	if (!dqh_has_quota_enabled(hash, type))
+ 		return NODQUOT;
+ we_slept:
+ 	spin_lock(&dq_list_lock);
+-	if ((dquot = find_dquot(hashent, sb, id, type)) == NODQUOT) {
++	if ((dquot = find_dquot(hash, hashent, id, type)) == NODQUOT) {
+ 		if (empty == NODQUOT) {
+ 			spin_unlock(&dq_list_lock);
+-			if ((empty = get_empty_dquot(sb, type)) == NODQUOT)
++			if ((empty = get_empty_dquot(type)) == NODQUOT)
+ 				schedule();	/* Try to wait for a moment... */
+ 			goto we_slept;
+ 		}
+@@ -643,7 +652,7 @@ we_slept:
+ 		/* all dquots go on the inuse_list */
+ 		put_inuse(dquot);
+ 		/* hash it first so it can be found */
+-		insert_dquot_hash(dquot);
++		insert_dquot_hash(hash, dquot);
+ 		dqstats.lookups++;
+ 		spin_unlock(&dq_list_lock);
+ 	} else {
+@@ -660,12 +669,13 @@ we_slept:
+ 	 * finished or it will be canceled due to dq_count > 1 test */
+ 	wait_on_dquot(dquot);
+ 	/* Read the dquot and instantiate it (everything done only if needed) */
+-	if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags) && sb->dq_op->acquire_dquot(dquot) < 0) {
++	if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags) &&
++		hash->dqh_qop->acquire_dquot(dquot) < 0) {
+ 		dqput(dquot);
+ 		return NODQUOT;
+ 	}
+ #ifdef __DQUOT_PARANOIA
+-	BUG_ON(!dquot->dq_sb);	/* Has somebody invalidated entry under us? */
++	BUG_ON(!dquot->dq_dqh);	/* Has somebody invalidated entry under us? */
+ #endif
+ 
+ 	return dquot;
+@@ -686,9 +696,10 @@ static int dqinit_needed(struct inode *i
+ }
+ 
+ /* This routine is guarded by dqonoff_mutex mutex */
+-static void add_dquot_ref(struct super_block *sb, int type)
++static void add_dquot_ref(struct dqhash *hash, int type)
+ {
+ 	struct list_head *p;
++	struct super_block *sb = hash->dqh_sb;
+ 
+ restart:
+ 	file_list_lock();
+@@ -698,7 +709,7 @@ restart:
+ 		if (filp->f_mode & FMODE_WRITE && dqinit_needed(inode, type)) {
+ 			struct dentry *dentry = dget(filp->f_path.dentry);
+ 			file_list_unlock();
+-			sb->dq_op->initialize(inode, type);
++			hash->dqh_qop->initialize(inode, type);
+ 			dput(dentry);
+ 			/* As we may have blocked we had better restart... */
+ 			goto restart;
+@@ -757,13 +768,13 @@ static void put_dquot_list(struct list_h
+ }
+ 
+ /* Gather all references from inodes and drop them */
+-static void drop_dquot_ref(struct super_block *sb, int type)
++static void drop_dquot_ref(struct dqhash *hash, int type)
+ {
+ 	LIST_HEAD(tofree_head);
+ 
+-	down_write(&sb_dqopt(sb)->dqptr_sem);
+-	remove_dquot_ref(sb, type, &tofree_head);
+-	up_write(&sb_dqopt(sb)->dqptr_sem);
++	down_write(&dqh_dqopt(hash)->dqptr_sem);
++	remove_dquot_ref(hash, type, &tofree_head);
++	up_write(&dqh_dqopt(hash)->dqptr_sem);
+ 	put_dquot_list(&tofree_head);
+ }
+ 
+@@ -839,7 +850,7 @@ static void print_warning(struct dquot *
+ 	tty = get_current_tty();
+ 	if (!tty)
+ 		goto out_lock;
+-	tty_write_message(tty, dquot->dq_sb->s_id);
++	tty_write_message(tty, dquot->dq_dqh->dqh_sb->s_id);
+ 	if (warntype == ISOFTWARN || warntype == BSOFTWARN)
+ 		tty_write_message(tty, ": warning, ");
+ 	else
+@@ -881,7 +892,7 @@ static inline void flush_warnings(struct
+ 
+ static inline char ignore_hardlimit(struct dquot *dquot)
+ {
+-	struct mem_dqinfo *info = &sb_dqopt(dquot->dq_sb)->info[dquot->dq_type];
++	struct mem_dqinfo *info = &dqh_dqopt(dquot->dq_dqh)->info[dquot->dq_type];
+ 
+ 	return capable(CAP_SYS_RESOURCE) &&
+ 	    (info->dqi_format->qf_fmt_id != QFMT_VFS_OLD || !(info->dqi_flags & V1_DQF_RSQUASH));
+@@ -913,7 +924,7 @@ static int check_idq(struct dquot *dquot
+ 	   (dquot->dq_dqb.dqb_curinodes + inodes) > dquot->dq_dqb.dqb_isoftlimit &&
+ 	    dquot->dq_dqb.dqb_itime == 0) {
+ 		*warntype = ISOFTWARN;
+-		dquot->dq_dqb.dqb_itime = get_seconds() + sb_dqopt(dquot->dq_sb)->info[dquot->dq_type].dqi_igrace;
++		dquot->dq_dqb.dqb_itime = get_seconds() + dqh_dqopt(dquot->dq_dqh)->info[dquot->dq_type].dqi_igrace;
+ 	}
+ 
+ 	return QUOTA_OK;
+@@ -948,7 +959,7 @@ static int check_bdq(struct dquot *dquot
+ 	    dquot->dq_dqb.dqb_btime == 0) {
+ 		if (!prealloc) {
+ 			*warntype = BSOFTWARN;
+-			dquot->dq_dqb.dqb_btime = get_seconds() + sb_dqopt(dquot->dq_sb)->info[dquot->dq_type].dqi_bgrace;
++			dquot->dq_dqb.dqb_btime = get_seconds() + dqh_dqopt(dquot->dq_dqh)->info[dquot->dq_type].dqi_bgrace;
+ 		}
+ 		else
+ 			/*
+@@ -974,7 +985,7 @@ int dquot_initialize(struct inode *inode
+          * re-enter the quota code and are already holding the mutex */
+ 	if (IS_NOQUOTA(inode))
+ 		return 0;
+-	down_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
++	down_write(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 	/* Having dqptr_sem we know NOQUOTA flags can't be altered... */
+ 	if (IS_NOQUOTA(inode))
+ 		goto out_err;
+@@ -990,11 +1001,11 @@ int dquot_initialize(struct inode *inode
+ 					id = inode->i_gid;
+ 					break;
+ 			}
+-			inode->i_dquot[cnt] = dqget(inode->i_sb, id, cnt);
++			inode->i_dquot[cnt] = dqget(inode->i_dqh, id, cnt);
+ 		}
+ 	}
+ out_err:
+-	up_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
++	up_write(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 	return ret;
+ }
+ 
+@@ -1006,14 +1017,14 @@ int dquot_drop(struct inode *inode)
+ {
+ 	int cnt;
+ 
+-	down_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
++	down_write(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 	for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
+ 		if (inode->i_dquot[cnt] != NODQUOT) {
+ 			dqput(inode->i_dquot[cnt]);
+ 			inode->i_dquot[cnt] = NODQUOT;
+ 		}
+ 	}
+-	up_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
++	up_write(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 	return 0;
+ }
+ 
+@@ -1044,9 +1055,9 @@ out_add:
+ 	for (cnt = 0; cnt < MAXQUOTAS; cnt++)
+ 		warntype[cnt] = NOWARN;
+ 
+-	down_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
++	down_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 	if (IS_NOQUOTA(inode)) {	/* Now we can do reliable test... */
+-		up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
++		up_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 		goto out_add;
+ 	}
+ 	spin_lock(&dq_data_lock);
+@@ -1071,7 +1082,7 @@ warn_put_all:
+ 			if (inode->i_dquot[cnt])
+ 				mark_dquot_dirty(inode->i_dquot[cnt]);
+ 	flush_warnings(inode->i_dquot, warntype);
+-	up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
++	up_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 	return ret;
+ }
+ 
+@@ -1089,9 +1100,9 @@ int dquot_alloc_inode(const struct inode
+ 		return QUOTA_OK;
+ 	for (cnt = 0; cnt < MAXQUOTAS; cnt++)
+ 		warntype[cnt] = NOWARN;
+-	down_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
++	down_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 	if (IS_NOQUOTA(inode)) {
+-		up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
++		up_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 		return QUOTA_OK;
+ 	}
+ 	spin_lock(&dq_data_lock);
+@@ -1116,7 +1127,7 @@ warn_put_all:
+ 			if (inode->i_dquot[cnt])
+ 				mark_dquot_dirty(inode->i_dquot[cnt]);
+ 	flush_warnings((struct dquot **)inode->i_dquot, warntype);
+-	up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
++	up_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 	return ret;
+ }
+ 
+@@ -1134,10 +1145,10 @@ out_sub:
+ 		inode_sub_bytes(inode, number);
+ 		return QUOTA_OK;
+ 	}
+-	down_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
++	down_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 	/* Now recheck reliably when holding dqptr_sem */
+ 	if (IS_NOQUOTA(inode)) {
+-		up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
++		up_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 		goto out_sub;
+ 	}
+ 	spin_lock(&dq_data_lock);
+@@ -1152,7 +1163,7 @@ out_sub:
+ 	for (cnt = 0; cnt < MAXQUOTAS; cnt++)
+ 		if (inode->i_dquot[cnt])
+ 			mark_dquot_dirty(inode->i_dquot[cnt]);
+-	up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
++	up_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 	return QUOTA_OK;
+ }
+ 
+@@ -1167,10 +1178,10 @@ int dquot_free_inode(const struct inode 
+          * re-enter the quota code and are already holding the mutex */
+ 	if (IS_NOQUOTA(inode))
+ 		return QUOTA_OK;
+-	down_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
++	down_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 	/* Now recheck reliably when holding dqptr_sem */
+ 	if (IS_NOQUOTA(inode)) {
+-		up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
++		up_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 		return QUOTA_OK;
+ 	}
+ 	spin_lock(&dq_data_lock);
+@@ -1184,7 +1195,7 @@ int dquot_free_inode(const struct inode 
+ 	for (cnt = 0; cnt < MAXQUOTAS; cnt++)
+ 		if (inode->i_dquot[cnt])
+ 			mark_dquot_dirty(inode->i_dquot[cnt]);
+-	up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
++	up_read(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 	return QUOTA_OK;
+ }
+ 
+@@ -1199,6 +1210,7 @@ int dquot_transfer(struct inode *inode, 
+ 	qsize_t space;
+ 	struct dquot *transfer_from[MAXQUOTAS];
+ 	struct dquot *transfer_to[MAXQUOTAS];
++	struct dqhash *dqh = inode->i_sb->s_dqh;
+ 	int cnt, ret = NO_QUOTA, chuid = (iattr->ia_valid & ATTR_UID) && inode->i_uid != iattr->ia_uid,
+ 	    chgid = (iattr->ia_valid & ATTR_GID) && inode->i_gid != iattr->ia_gid;
+ 	char warntype[MAXQUOTAS];
+@@ -1212,10 +1224,10 @@ int dquot_transfer(struct inode *inode, 
+ 		transfer_to[cnt] = transfer_from[cnt] = NODQUOT;
+ 		warntype[cnt] = NOWARN;
+ 	}
+-	down_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
++	down_write(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 	/* Now recheck reliably when holding dqptr_sem */
+ 	if (IS_NOQUOTA(inode)) {	/* File without quota accounting? */
+-		up_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
++		up_write(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 		return QUOTA_OK;
+ 	}
+ 	/* First build the transfer_to list - here we can block on
+@@ -1226,12 +1238,12 @@ int dquot_transfer(struct inode *inode, 
+ 			case USRQUOTA:
+ 				if (!chuid)
+ 					continue;
+-				transfer_to[cnt] = dqget(inode->i_sb, iattr->ia_uid, cnt);
++				transfer_to[cnt] = dqget(dqh, iattr->ia_uid, cnt);
+ 				break;
+ 			case GRPQUOTA:
+ 				if (!chgid)
+ 					continue;
+-				transfer_to[cnt] = dqget(inode->i_sb, iattr->ia_gid, cnt);
++				transfer_to[cnt] = dqget(dqh, iattr->ia_gid, cnt);
+ 				break;
+ 		}
+ 	}
+@@ -1286,20 +1298,20 @@ warn_put_all:
+ 		if (ret == NO_QUOTA && transfer_to[cnt] != NODQUOT)
+ 			dqput(transfer_to[cnt]);
+ 	}
+-	up_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
++	up_write(&dqh_dqopt(inode->i_dqh)->dqptr_sem);
+ 	return ret;
+ }
+ 
+ /*
+  * Write info of quota file to disk
+  */
+-int dquot_commit_info(struct super_block *sb, int type)
++int dquot_commit_info(struct dqhash *hash, int type)
+ {
+ 	int ret;
+-	struct quota_info *dqopt = sb_dqopt(sb);
++	struct quota_info *dqopt = dqh_dqopt(hash);
+ 
+ 	mutex_lock(&dqopt->dqio_mutex);
+-	ret = dqopt->ops[type]->write_file_info(sb, type);
++	ret = dqopt->ops[type]->write_file_info(hash, type);
+ 	mutex_unlock(&dqopt->dqio_mutex);
+ 	return ret;
+ }
+@@ -1349,10 +1361,10 @@ static inline void reset_enable_flags(st
+ /*
+  * Turn quota off on a device. type == -1 ==> quotaoff for all types (umount)
+  */
+-int vfs_quota_off(struct super_block *sb, int type)
++int vfs_quota_off(struct dqhash *hash, int type)
+ {
+ 	int cnt;
+-	struct quota_info *dqopt = sb_dqopt(sb);
++	struct quota_info *dqopt = dqh_dqopt(hash);
+ 	struct inode *toputinode[MAXQUOTAS];
+ 
+ 	/* We need to serialize quota_off() for device */
+@@ -1361,21 +1373,21 @@ int vfs_quota_off(struct super_block *sb
+ 		toputinode[cnt] = NULL;
+ 		if (type != -1 && cnt != type)
+ 			continue;
+-		if (!sb_has_quota_enabled(sb, cnt))
++		if (!dqh_has_quota_enabled(hash, cnt))
+ 			continue;
+ 		reset_enable_flags(dqopt, cnt);
+ 
+ 		/* Note: these are blocking operations */
+-		drop_dquot_ref(sb, cnt);
+-		invalidate_dquots(sb, cnt);
++		drop_dquot_ref(hash, cnt);
++		invalidate_dquots(hash, cnt);
+ 		/*
+ 		 * Now all dquots should be invalidated, all writes done so we should be only
+ 		 * users of the info. No locks needed.
+ 		 */
+ 		if (info_dirty(&dqopt->info[cnt]))
+-			sb->dq_op->write_info(sb, cnt);
++			hash->dqh_qop->write_info(hash, cnt);
+ 		if (dqopt->ops[cnt]->free_file_info)
+-			dqopt->ops[cnt]->free_file_info(sb, cnt);
++			dqopt->ops[cnt]->free_file_info(hash, cnt);
+ 		put_quota_format(dqopt->info[cnt].dqi_format);
+ 
+ 		toputinode[cnt] = dqopt->files[cnt];
+@@ -1388,9 +1400,9 @@ int vfs_quota_off(struct super_block *sb
+ 	mutex_unlock(&dqopt->dqonoff_mutex);
+ 	/* Sync the superblock so that buffers with quota data are written to
+ 	 * disk (and so userspace sees correct data afterwards). */
+-	if (sb->s_op->sync_fs)
+-		sb->s_op->sync_fs(sb, 1);
+-	sync_blockdev(sb->s_bdev);
++	if (hash->dqh_sb->s_op->sync_fs)
++		hash->dqh_sb->s_op->sync_fs(hash->dqh_sb, 1);
++	sync_blockdev(hash->dqh_sb->s_bdev);
+ 	/* Now the quota files are just ordinary files and we can set the
+ 	 * inode flags back. Moreover we discard the pagecache so that
+ 	 * userspace sees the writes we did bypassing the pagecache. We
+@@ -1401,7 +1413,7 @@ int vfs_quota_off(struct super_block *sb
+ 			mutex_lock(&dqopt->dqonoff_mutex);
+ 			/* If quota was reenabled in the meantime, we have
+ 			 * nothing to do */
+-			if (!sb_has_quota_enabled(sb, cnt)) {
++			if (!dqh_has_quota_enabled(hash, cnt)) {
+ 				mutex_lock(&toputinode[cnt]->i_mutex);
+ 				toputinode[cnt]->i_flags &= ~(S_IMMUTABLE |
+ 				  S_NOATIME | S_NOQUOTA);
+@@ -1412,8 +1424,8 @@ int vfs_quota_off(struct super_block *sb
+ 			}
+ 			mutex_unlock(&dqopt->dqonoff_mutex);
+ 		}
+-	if (sb->s_bdev)
+-		invalidate_bdev(sb->s_bdev, 0);
++	if (hash->dqh_sb->s_bdev)
++		invalidate_bdev(hash->dqh_sb->s_bdev, 0);
+ 	return 0;
+ }
+ 
+@@ -1426,7 +1438,8 @@ static int vfs_quota_on_inode(struct ino
+ {
+ 	struct quota_format_type *fmt = find_quota_format(format_id);
+ 	struct super_block *sb = inode->i_sb;
+-	struct quota_info *dqopt = sb_dqopt(sb);
++	struct dqhash *hash = inode->i_dqh;
++	struct quota_info *dqopt = dqh_dqopt(hash);
+ 	int error;
+ 	int oldflags = -1;
+ 
+@@ -1452,7 +1465,7 @@ static int vfs_quota_on_inode(struct ino
+ 	invalidate_bdev(sb->s_bdev, 0);
+ 	mutex_lock(&inode->i_mutex);
+ 	mutex_lock(&dqopt->dqonoff_mutex);
+-	if (sb_has_quota_enabled(sb, type)) {
++	if (dqh_has_quota_enabled(hash, type)) {
+ 		error = -EBUSY;
+ 		goto out_lock;
+ 	}
+@@ -1463,21 +1476,21 @@ static int vfs_quota_on_inode(struct ino
+ 	oldflags = inode->i_flags & (S_NOATIME | S_IMMUTABLE | S_NOQUOTA);
+ 	inode->i_flags |= S_NOQUOTA | S_NOATIME | S_IMMUTABLE;
+ 	up_write(&dqopt->dqptr_sem);
+-	sb->dq_op->drop(inode);
++	hash->dqh_qop->drop(inode);
+ 
+ 	error = -EIO;
+ 	dqopt->files[type] = igrab(inode);
+ 	if (!dqopt->files[type])
+ 		goto out_lock;
+ 	error = -EINVAL;
+-	if (!fmt->qf_ops->check_quota_file(sb, type))
++	if (!fmt->qf_ops->check_quota_file(hash, type))
+ 		goto out_file_init;
+ 
+ 	dqopt->ops[type] = fmt->qf_ops;
+ 	dqopt->info[type].dqi_format = fmt;
+ 	INIT_LIST_HEAD(&dqopt->info[type].dqi_dirty_list);
+ 	mutex_lock(&dqopt->dqio_mutex);
+-	if ((error = dqopt->ops[type]->read_file_info(sb, type)) < 0) {
++	if ((error = dqopt->ops[type]->read_file_info(hash, type)) < 0) {
+ 		mutex_unlock(&dqopt->dqio_mutex);
+ 		goto out_file_init;
+ 	}
+@@ -1485,7 +1498,7 @@ static int vfs_quota_on_inode(struct ino
+ 	mutex_unlock(&inode->i_mutex);
+ 	set_enable_flags(dqopt, type);
+ 
+-	add_dquot_ref(sb, type);
++	add_dquot_ref(hash, type);
+ 	mutex_unlock(&dqopt->dqonoff_mutex);
+ 
+ 	return 0;
+@@ -1511,7 +1524,7 @@ out_fmt:
+ }
+ 
+ /* Actual function called from quotactl() */
+-int vfs_quota_on(struct super_block *sb, int type, int format_id, char *path)
++int vfs_quota_on(struct dqhash *hash, int type, int format_id, char *path)
+ {
+ 	struct nameidata nd;
+ 	int error;
+@@ -1523,7 +1536,7 @@ int vfs_quota_on(struct super_block *sb,
+ 	if (error)
+ 		goto out_path;
+ 	/* Quota file not on the same filesystem? */
+-	if (nd.mnt->mnt_sb != sb)
++	if (nd.mnt->mnt_sb != hash->dqh_sb)
+ 		error = -EXDEV;
+ 	else
+ 		error = vfs_quota_on_inode(nd.dentry->d_inode, type, format_id);
+@@ -1536,13 +1549,13 @@ out_path:
+  * This function is used when filesystem needs to initialize quotas
+  * during mount time.
+  */
+-int vfs_quota_on_mount(struct super_block *sb, char *qf_name,
++int vfs_quota_on_mount(struct dqhash *hash, char *qf_name,
+ 		int format_id, int type)
+ {
+ 	struct dentry *dentry;
+ 	int error;
+ 
+-	dentry = lookup_one_len(qf_name, sb->s_root, strlen(qf_name));
++	dentry = lookup_one_len(qf_name, hash->dqh_sb->s_root, strlen(qf_name));
+ 	if (IS_ERR(dentry))
+ 		return PTR_ERR(dentry);
+ 
+@@ -1578,18 +1591,18 @@ static void do_get_dqblk(struct dquot *d
+ 	spin_unlock(&dq_data_lock);
+ }
+ 
+-int vfs_get_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di)
++int vfs_get_dqblk(struct dqhash *hash, int type, qid_t id, struct if_dqblk *di)
+ {
+ 	struct dquot *dquot;
+ 
+-	mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);
+-	if (!(dquot = dqget(sb, id, type))) {
+-		mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
++	mutex_lock(&dqh_dqopt(hash)->dqonoff_mutex);
++	if (!(dquot = dqget(hash, id, type))) {
++		mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
+ 		return -ESRCH;
+ 	}
+ 	do_get_dqblk(dquot, di);
+ 	dqput(dquot);
+-	mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
++	mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
+ 	return 0;
+ }
+ 
+@@ -1629,7 +1642,7 @@ static void do_set_dqblk(struct dquot *d
+ 			clear_bit(DQ_BLKS_B, &dquot->dq_flags);
+ 		}
+ 		else if (!(di->dqb_valid & QIF_BTIME))	/* Set grace only if user hasn't provided his own... */
+-			dm->dqb_btime = get_seconds() + sb_dqopt(dquot->dq_sb)->info[dquot->dq_type].dqi_bgrace;
++			dm->dqb_btime = get_seconds() + dqh_dqopt(dquot->dq_dqh)->info[dquot->dq_type].dqi_bgrace;
+ 	}
+ 	if (check_ilim) {
+ 		if (!dm->dqb_isoftlimit || dm->dqb_curinodes < dm->dqb_isoftlimit) {
+@@ -1637,7 +1650,7 @@ static void do_set_dqblk(struct dquot *d
+ 			clear_bit(DQ_INODES_B, &dquot->dq_flags);
+ 		}
+ 		else if (!(di->dqb_valid & QIF_ITIME))	/* Set grace only if user hasn't provided his own... */
+-			dm->dqb_itime = get_seconds() + sb_dqopt(dquot->dq_sb)->info[dquot->dq_type].dqi_igrace;
++			dm->dqb_itime = get_seconds() + dqh_dqopt(dquot->dq_dqh)->info[dquot->dq_type].dqi_igrace;
+ 	}
+ 	if (dm->dqb_bhardlimit || dm->dqb_bsoftlimit || dm->dqb_ihardlimit || dm->dqb_isoftlimit)
+ 		clear_bit(DQ_FAKE_B, &dquot->dq_flags);
+@@ -1647,53 +1660,53 @@ static void do_set_dqblk(struct dquot *d
+ 	mark_dquot_dirty(dquot);
+ }
+ 
+-int vfs_set_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di)
++int vfs_set_dqblk(struct dqhash *hash, int type, qid_t id, struct if_dqblk *di)
+ {
+ 	struct dquot *dquot;
+ 
+-	mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);
+-	if (!(dquot = dqget(sb, id, type))) {
+-		mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
++	mutex_lock(&dqh_dqopt(hash)->dqonoff_mutex);
++	if (!(dquot = dqget(hash, id, type))) {
++		mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
+ 		return -ESRCH;
+ 	}
+ 	do_set_dqblk(dquot, di);
+ 	dqput(dquot);
+-	mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
++	mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
+ 	return 0;
+ }
+ 
+ /* Generic routine for getting common part of quota file information */
+-int vfs_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii)
++int vfs_get_dqinfo(struct dqhash *hash, int type, struct if_dqinfo *ii)
+ {
+ 	struct mem_dqinfo *mi;
+   
+-	mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);
+-	if (!sb_has_quota_enabled(sb, type)) {
+-		mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
++	mutex_lock(&dqh_dqopt(hash)->dqonoff_mutex);
++	if (!dqh_has_quota_enabled(hash, type)) {
++		mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
+ 		return -ESRCH;
+ 	}
+-	mi = sb_dqopt(sb)->info + type;
++	mi = dqh_dqopt(hash)->info + type;
+ 	spin_lock(&dq_data_lock);
+ 	ii->dqi_bgrace = mi->dqi_bgrace;
+ 	ii->dqi_igrace = mi->dqi_igrace;
+ 	ii->dqi_flags = mi->dqi_flags & DQF_MASK;
+ 	ii->dqi_valid = IIF_ALL;
+ 	spin_unlock(&dq_data_lock);
+-	mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
++	mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
+ 	return 0;
+ }
+ 
+ /* Generic routine for setting common part of quota file information */
+-int vfs_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii)
++int vfs_set_dqinfo(struct dqhash *hash, int type, struct if_dqinfo *ii)
+ {
+ 	struct mem_dqinfo *mi;
+ 
+-	mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);
+-	if (!sb_has_quota_enabled(sb, type)) {
+-		mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
++	mutex_lock(&dqh_dqopt(hash)->dqonoff_mutex);
++	if (!dqh_has_quota_enabled(hash, type)) {
++		mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
+ 		return -ESRCH;
+ 	}
+-	mi = sb_dqopt(sb)->info + type;
++	mi = dqh_dqopt(hash)->info + type;
+ 	spin_lock(&dq_data_lock);
+ 	if (ii->dqi_valid & IIF_BGRACE)
+ 		mi->dqi_bgrace = ii->dqi_bgrace;
+@@ -1702,10 +1715,10 @@ int vfs_set_dqinfo(struct super_block *s
+ 	if (ii->dqi_valid & IIF_FLAGS)
+ 		mi->dqi_flags = (mi->dqi_flags & ~DQF_MASK) | (ii->dqi_flags & DQF_MASK);
+ 	spin_unlock(&dq_data_lock);
+-	mark_info_dirty(sb, type);
++	mark_info_dirty(hash, type);
+ 	/* Force write to disk */
+-	sb->dq_op->write_info(sb, type);
+-	mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
++	hash->dqh_qop->write_info(hash, type);
++	mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
+ 	return 0;
+ }
+ 
+Index: linux-2.6.20/fs/ecryptfs/inode.c
+===================================================================
+--- linux-2.6.20.orig/fs/ecryptfs/inode.c
++++ linux-2.6.20/fs/ecryptfs/inode.c
+@@ -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);
+Index: linux-2.6.20/fs/exec.c
+===================================================================
+--- linux-2.6.20.orig/fs/exec.c
++++ linux-2.6.20/fs/exec.c
+@@ -50,6 +50,7 @@
+ #include <linux/tsacct_kern.h>
+ #include <linux/cn_proc.h>
+ #include <linux/audit.h>
++#include <linux/vs_memory.h>
+ 
+ #include <asm/uaccess.h>
+ #include <asm/mmu_context.h>
+@@ -437,7 +438,8 @@ int setup_arg_pages(struct linux_binprm 
+ 			kmem_cache_free(vm_area_cachep, mpnt);
+ 			return ret;
+ 		}
+-		mm->stack_vm = mm->total_vm = vma_pages(mpnt);
++		vx_vmpages_sub(mm, mm->total_vm - vma_pages(mpnt));
++		mm->stack_vm = mm->total_vm;
+ 	}
+ 
+ 	for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
+@@ -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,
+ 					      "%lu", tv.tv_sec);
+ 				if (rc > out_end - out_ptr)
+Index: linux-2.6.20/fs/ext2/balloc.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext2/balloc.c
++++ linux-2.6.20/fs/ext2/balloc.c
+@@ -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 +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 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, dx_current_tag(), &free_blocks, &root_blocks);
++
+ 	if (free_blocks < count)
+ 		count = free_blocks;
+ 
+@@ -258,6 +261,7 @@ do_more:
+ 	}
+ error_return:
+ 	brelse(bitmap_bh);
++	DLIMIT_FREE_BLOCK(inode, freed);
+ 	release_blocks(sb, freed);
+ 	DQUOT_FREE_BLOCK(inode, freed);
+ }
+@@ -361,6 +365,10 @@ int ext2_new_block(struct inode *inode, 
+ 		*err = -ENOSPC;
+ 		goto out_dquot;
+ 	}
++	if (DLIMIT_ALLOC_BLOCK(inode, es_alloc)) {
++		*err = -ENOSPC;
++		goto out_dlimit;
++	}
+ 
+ 	ext2_debug ("goal=%lu.\n", goal);
+ 
+@@ -508,6 +516,8 @@ got_block:
+ 	*err = 0;
+ out_release:
+ 	group_release_blocks(sb, group_no, desc, gdp_bh, group_alloc);
++	DLIMIT_FREE_BLOCK(inode, es_alloc);
++out_dlimit:
+ 	release_blocks(sb, es_alloc);
+ out_dquot:
+ 	DQUOT_FREE_BLOCK(inode, dq_alloc);
+Index: linux-2.6.20/fs/ext2/ext2.h
+===================================================================
+--- linux-2.6.20.orig/fs/ext2/ext2.h
++++ linux-2.6.20/fs/ext2/ext2.h
+@@ -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;
++extern int ext2_sync_flags(struct inode *inode);
+ 
+ /* namei.c */
+ extern struct inode_operations ext2_dir_inode_operations;
+Index: linux-2.6.20/fs/ext2/file.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext2/file.c
++++ linux-2.6.20/fs/ext2/file.c
+@@ -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,
+ };
+Index: linux-2.6.20/fs/ext2/ialloc.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext2/ialloc.c
++++ linux-2.6.20/fs/ext2/ialloc.c
+@@ -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/vs_tag.h>
+ #include "ext2.h"
+ #include "xattr.h"
+ #include "acl.h"
+@@ -125,6 +127,7 @@ void ext2_free_inode (struct inode * ino
+ 		ext2_xattr_delete_inode(inode);
+ 	    	DQUOT_FREE_INODE(inode);
+ 		DQUOT_DROP(inode);
++		DLIMIT_FREE_INODE(inode);
+ 	}
+ 
+ 	es = EXT2_SB(sb)->s_es;
+@@ -464,6 +467,11 @@ struct inode *ext2_new_inode(struct inod
+ 	if (!inode)
+ 		return ERR_PTR(-ENOMEM);
+ 
++	inode->i_tag = dx_current_fstag(sb);
++	if (DLIMIT_ALLOC_INODE(inode)) {
++		err = -ENOSPC;
++		goto fail_dlim;
++	}
+ 	ei = EXT2_I(inode);
+ 	sbi = EXT2_SB(sb);
+ 	es = sbi->s_es;
+@@ -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));
+-	ei->i_flags = EXT2_I(dir)->i_flags & ~EXT2_BTREE_FL;
++	ei->i_flags = EXT2_I(dir)->i_flags &
++		~(EXT2_BTREE_FL|EXT2_IUNLINK_FL|EXT2_BARRIER_FL);
+ 	if (S_ISLNK(mode))
+ 		ei->i_flags &= ~(EXT2_IMMUTABLE_FL|EXT2_APPEND_FL);
+ 	/* dirsync is only applied to directories */
+@@ -625,12 +634,15 @@ fail_free_drop:
+ 
+ fail_drop:
+ 	DQUOT_DROP(inode);
++	DLIMIT_FREE_INODE(inode);
+ 	inode->i_flags |= S_NOQUOTA;
+ 	inode->i_nlink = 0;
+ 	iput(inode);
+ 	return ERR_PTR(err);
+ 
+ fail:
++	DLIMIT_FREE_INODE(inode);
++fail_dlim:
+ 	make_bad_inode(inode);
+ 	iput(inode);
+ 	return ERR_PTR(err);
+Index: linux-2.6.20/fs/ext2/inode.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext2/inode.c
++++ linux-2.6.20/fs/ext2/inode.c
+@@ -31,6 +31,7 @@
+ #include <linux/writeback.h>
+ #include <linux/buffer_head.h>
+ #include <linux/mpage.h>
++#include <linux/vs_tag.h>
+ #include "ext2.h"
+ #include "acl.h"
+ #include "xip.h"
+@@ -913,7 +914,7 @@ void ext2_truncate (struct inode * inode
+ 		return;
+ 	if (ext2_inode_is_fast_symlink(inode))
+ 		return;
+-	if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
++	if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
+ 		return;
+ 
+ 	ext2_discard_prealloc(inode);
+@@ -1042,25 +1043,57 @@ void ext2_set_inode_flags(struct inode *
+ {
+ 	unsigned int flags = EXT2_I(inode)->i_flags;
+ 
+-	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 & EXT2_IMMUTABLE_FL)
++		inode->i_flags |= S_IMMUTABLE;
++	if (flags & EXT2_IUNLINK_FL)
++		inode->i_flags |= S_IUNLINK;
++	if (flags & EXT2_BARRIER_FL)
++		inode->i_flags |= S_BARRIER;
++
+ 	if (flags & EXT2_SYNC_FL)
+ 		inode->i_flags |= S_SYNC;
+ 	if (flags & EXT2_APPEND_FL)
+ 		inode->i_flags |= S_APPEND;
+-	if (flags & EXT2_IMMUTABLE_FL)
+-		inode->i_flags |= S_IMMUTABLE;
+ 	if (flags & EXT2_NOATIME_FL)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & EXT2_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
+ }
+ 
++int ext2_sync_flags(struct inode *inode)
++{
++	unsigned int oldflags, newflags;
++
++	oldflags = EXT2_I(inode)->i_flags;
++	newflags = oldflags & ~(EXT2_IMMUTABLE_FL |
++		EXT2_IUNLINK_FL | EXT2_BARRIER_FL);
++
++	if (IS_IMMUTABLE(inode))
++		newflags |= EXT2_IMMUTABLE_FL;
++	if (IS_IUNLINK(inode))
++		newflags |= EXT2_IUNLINK_FL;
++	if (IS_BARRIER(inode))
++		newflags |= EXT2_BARRIER_FL;
++
++	if (oldflags ^ newflags) {
++		EXT2_I(inode)->i_flags = newflags;
++		inode->i_ctime = CURRENT_TIME;
++		mark_inode_dirty(inode);
++	}
++	return 0;
++}
++
+ void ext2_read_inode (struct inode * inode)
+ {
+ 	struct ext2_inode_info *ei = EXT2_I(inode);
+ 	ino_t ino = inode->i_ino;
+ 	struct buffer_head * bh;
+ 	struct ext2_inode * raw_inode = ext2_get_inode(inode->i_sb, ino, &bh);
++	uid_t uid;
++	gid_t gid;
+ 	int n;
+ 
+ #ifdef CONFIG_EXT2_FS_POSIX_ACL
+@@ -1071,12 +1104,17 @@ void ext2_read_inode (struct inode * ino
+  		goto bad_inode;
+ 
+ 	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);
+@@ -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 = 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;
+@@ -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_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);
+@@ -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_TAG && iattr->ia_tag != inode->i_tag)) {
+ 		error = DQUOT_TRANSFER(inode, iattr) ? -EDQUOT : 0;
+ 		if (error)
+ 			return error;
+Index: linux-2.6.20/fs/ext2/ioctl.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext2/ioctl.c
++++ linux-2.6.20/fs/ext2/ioctl.c
+@@ -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>
+ 
+@@ -32,7 +33,8 @@ int ext2_ioctl (struct inode * inode, st
+ 	case EXT2_IOC_SETFLAGS: {
+ 		unsigned int oldflags;
+ 
+-		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))
+@@ -53,7 +55,9 @@ int ext2_ioctl (struct inode * inode, st
+ 		 *
+ 		 * This test looks nicer. Thanks to Pauline Middelink
+ 		 */
+-		if ((flags ^ oldflags) & (EXT2_APPEND_FL | EXT2_IMMUTABLE_FL)) {
++		if ((oldflags & EXT2_IMMUTABLE_FL) ||
++			((flags ^ oldflags) & (EXT2_APPEND_FL |
++			EXT2_IMMUTABLE_FL | EXT2_IUNLINK_FL))) {
+ 			if (!capable(CAP_LINUX_IMMUTABLE)) {
+ 				mutex_unlock(&inode->i_mutex);
+ 				return -EPERM;
+@@ -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;
+-		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;	
+Index: linux-2.6.20/fs/ext2/namei.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext2/namei.c
++++ linux-2.6.20/fs/ext2/namei.c
+@@ -31,6 +31,7 @@
+  */
+ 
+ #include <linux/pagemap.h>
++#include <linux/vs_tag.h>
+ #include "ext2.h"
+ #include "xattr.h"
+ #include "acl.h"
+@@ -66,6 +67,7 @@ static struct dentry *ext2_lookup(struct
+ 		inode = iget(dir->i_sb, ino);
+ 		if (!inode)
+ 			return ERR_PTR(-EACCES);
++		dx_propagate_tag(nd, inode);
+ 	}
+ 	return d_splice_alias(inode, dentry);
+ }
+@@ -391,6 +393,7 @@ struct inode_operations ext2_dir_inode_o
+ #endif
+ 	.setattr	= ext2_setattr,
+ 	.permission	= ext2_permission,
++	.sync_flags	= ext2_sync_flags,
+ };
+ 
+ struct inode_operations ext2_special_inode_operations = {
+@@ -402,4 +405,5 @@ struct inode_operations ext2_special_ino
+ #endif
+ 	.setattr	= ext2_setattr,
+ 	.permission	= ext2_permission,
++	.sync_flags	= ext2_sync_flags,
+ };
+Index: linux-2.6.20/fs/ext2/super.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext2/super.c
++++ linux-2.6.20/fs/ext2/super.c
+@@ -227,8 +227,8 @@ static int ext2_show_options(struct seq_
+ }
+ 
+ #ifdef CONFIG_QUOTA
+-static ssize_t ext2_quota_read(struct super_block *sb, int type, char *data, size_t len, loff_t off);
+-static ssize_t ext2_quota_write(struct super_block *sb, int type, const char *data, size_t len, loff_t off);
++static ssize_t ext2_quota_read(struct dqhash *hash, int type, char *data, size_t len, loff_t off);
++static ssize_t ext2_quota_write(struct dqhash *hash, int type, const char *data, size_t len, loff_t off);
+ #endif
+ 
+ static struct super_operations ext2_sops = {
+@@ -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_tag, Opt_notag, Opt_tagid
+ };
+ 
+ static match_table_t tokens = {
+@@ -352,6 +352,10 @@ static match_table_t tokens = {
+ 	{Opt_acl, "acl"},
+ 	{Opt_noacl, "noacl"},
+ 	{Opt_xip, "xip"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
++	{Opt_tag, "tagxid"},
+ 	{Opt_grpquota, "grpquota"},
+ 	{Opt_ignore, "noquota"},
+ 	{Opt_quota, "quota"},
+@@ -420,6 +424,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;
+@@ -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_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);
+@@ -1034,6 +1054,13 @@ static int ext2_remount (struct super_bl
+ 		goto restore_opts;
+ 	}
+ 
++	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;
++	}
++
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
+ 
+@@ -1152,10 +1179,11 @@ static int ext2_get_sb(struct file_syste
+  * acquiring the locks... As quota files are never truncated and quota code
+  * itself serializes the operations (and noone else should touch the files)
+  * we don't have to be afraid of races */
+-static ssize_t ext2_quota_read(struct super_block *sb, int type, char *data,
++static ssize_t ext2_quota_read(struct dqhash *hash, int type, char *data,
+ 			       size_t len, loff_t off)
+ {
+-	struct inode *inode = sb_dqopt(sb)->files[type];
++	struct inode *inode = dqh_dqopt(hash)->files[type];
++	struct super_block *sb = hash->dqh_sb;
+ 	sector_t blk = off >> EXT2_BLOCK_SIZE_BITS(sb);
+ 	int err = 0;
+ 	int offset = off & (sb->s_blocksize - 1);
+@@ -1196,10 +1224,11 @@ static ssize_t ext2_quota_read(struct su
+ }
+ 
+ /* Write to quotafile */
+-static ssize_t ext2_quota_write(struct super_block *sb, int type,
++static ssize_t ext2_quota_write(struct dqhash *hash, int type,
+ 				const char *data, size_t len, loff_t off)
+ {
+-	struct inode *inode = sb_dqopt(sb)->files[type];
++	struct inode *inode = dqh_dqopt(hash)->files[type];
++	struct super_block *sb = hash->dqh_sb;
+ 	sector_t blk = off >> EXT2_BLOCK_SIZE_BITS(sb);
+ 	int err = 0;
+ 	int offset = off & (sb->s_blocksize - 1);
+Index: linux-2.6.20/fs/ext2/symlink.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext2/symlink.c
++++ linux-2.6.20/fs/ext2/symlink.c
+@@ -38,6 +38,7 @@ struct inode_operations ext2_symlink_ino
+ 	.listxattr	= ext2_listxattr,
+ 	.removexattr	= generic_removexattr,
+ #endif
++	.sync_flags	= ext2_sync_flags,
+ };
+  
+ struct inode_operations ext2_fast_symlink_inode_operations = {
+@@ -49,4 +50,5 @@ struct inode_operations ext2_fast_symlin
+ 	.listxattr	= ext2_listxattr,
+ 	.removexattr	= generic_removexattr,
+ #endif
++	.sync_flags	= ext2_sync_flags,
+ };
+Index: linux-2.6.20/fs/ext2/xattr.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext2/xattr.c
++++ linux-2.6.20/fs/ext2/xattr.c
+@@ -60,6 +60,7 @@
+ #include <linux/mbcache.h>
+ #include <linux/quotaops.h>
+ #include <linux/rwsem.h>
++#include <linux/vs_dlimit.h>
+ #include "ext2.h"
+ #include "xattr.h"
+ #include "acl.h"
+@@ -641,8 +642,12 @@ ext2_xattr_set2(struct inode *inode, str
+ 				   the inode.  */
+ 				ea_bdebug(new_bh, "reusing block");
+ 
++				error = -ENOSPC;
++				if (DLIMIT_ALLOC_BLOCK(inode, 1))
++					goto cleanup;
+ 				error = -EDQUOT;
+ 				if (DQUOT_ALLOC_BLOCK(inode, 1)) {
++					DLIMIT_FREE_BLOCK(inode, 1);
+ 					unlock_buffer(new_bh);
+ 					goto cleanup;
+ 				}
+@@ -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);
++			DLIMIT_FREE_BLOCK(inode, 1);
+ 			DQUOT_FREE_BLOCK(inode, 1);
+ 			mark_buffer_dirty(old_bh);
+ 			ea_bdebug(old_bh, "refcount now=%d",
+@@ -800,6 +806,7 @@ ext2_xattr_delete_inode(struct inode *in
+ 		mark_buffer_dirty(bh);
+ 		if (IS_SYNC(inode))
+ 			sync_dirty_buffer(bh);
++		DLIMIT_FREE_BLOCK(inode, 1);
+ 		DQUOT_FREE_BLOCK(inode, 1);
+ 	}
+ 	EXT2_I(inode)->i_file_acl = 0;
+Index: linux-2.6.20/fs/ext3/balloc.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext3/balloc.c
++++ linux-2.6.20/fs/ext3/balloc.c
+@@ -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
+@@ -613,8 +615,10 @@ void ext3_free_blocks(handle_t *handle, 
+ 		return;
+ 	}
+ 	ext3_free_blocks_sb(handle, sb, block, count, &dquot_freed_blocks);
+-	if (dquot_freed_blocks)
++	if (dquot_freed_blocks) {
++		DLIMIT_FREE_BLOCK(inode, dquot_freed_blocks);
+ 		DQUOT_FREE_BLOCK(inode, dquot_freed_blocks);
++	}
+ 	return;
+ }
+ 
+@@ -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);
++	unsigned long long free_blocks, root_blocks;
++	int cond;
+ 
+ 	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
+ 	root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
+-	if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
++
++	vxdprintk(VXD_CBIT(dlim, 3),
++		"ext3_has_free_blocks(%p): free=%llu, root=%llu",
++		sb, free_blocks, root_blocks);
++
++	DLIMIT_ADJUST_BLOCK(sb, dx_current_tag(), &free_blocks, &root_blocks);
++
++	cond = (free_blocks < root_blocks + 1 &&
++		!capable(CAP_SYS_RESOURCE) &&
+ 		sbi->s_resuid != current->fsuid &&
+-		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
+-		return 0;
+-	}
+-	return 1;
++		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid)));
++
++	vxdprintk(VXD_CBIT(dlim, 3),
++		"ext3_has_free_blocks(%p): %llu<%llu+1, %c, %u!=%u r=%d",
++		sb, free_blocks, root_blocks,
++		!capable(CAP_SYS_RESOURCE)?'1':'0',
++		sbi->s_resuid, current->fsuid, cond?0:1);
++
++	return (cond ? 0 : 1);
+ }
+ 
+ /**
+@@ -1381,7 +1400,7 @@ static int ext3_has_free_blocks(struct e
+  */
+ int ext3_should_retry_alloc(struct super_block *sb, int *retries)
+ {
+-	if (!ext3_has_free_blocks(EXT3_SB(sb)) || (*retries)++ > 3)
++	if (!ext3_has_free_blocks(sb) || (*retries)++ > 3)
+ 		return 0;
+ 
+ 	jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);
+@@ -1444,6 +1463,8 @@ ext3_fsblk_t ext3_new_blocks(handle_t *h
+ 		*errp = -EDQUOT;
+ 		return 0;
+ 	}
++	if (DLIMIT_ALLOC_BLOCK(inode, 1))
++	    goto out_dlimit;
+ 
+ 	sbi = EXT3_SB(sb);
+ 	es = EXT3_SB(sb)->s_es;
+@@ -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;
+ 
+-	if (!ext3_has_free_blocks(sbi)) {
++	if (!ext3_has_free_blocks(sb)) {
+ 		*errp = -ENOSPC;
+ 		goto out;
+ 	}
+@@ -1653,6 +1674,9 @@ allocated:
+ io_error:
+ 	*errp = -EIO;
+ out:
++	if (!performed_allocation)
++		DLIMIT_FREE_BLOCK(inode, 1);
++out_dlimit:
+ 	if (fatal) {
+ 		*errp = fatal;
+ 		ext3_std_error(sb, fatal);
+Index: linux-2.6.20/fs/ext3/file.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext3/file.c
++++ linux-2.6.20/fs/ext3/file.c
+@@ -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,
+ };
+ 
+Index: linux-2.6.20/fs/ext3/ialloc.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext3/ialloc.c
++++ linux-2.6.20/fs/ext3/ialloc.c
+@@ -23,6 +23,8 @@
+ #include <linux/buffer_head.h>
+ #include <linux/random.h>
+ #include <linux/bitops.h>
++#include <linux/vs_dlimit.h>
++#include <linux/vs_tag.h>
+ 
+ #include <asm/byteorder.h>
+ 
+@@ -127,6 +129,7 @@ void ext3_free_inode (handle_t *handle, 
+ 	ext3_xattr_delete_inode(handle, inode);
+ 	DQUOT_FREE_INODE(inode);
+ 	DQUOT_DROP(inode);
++	DLIMIT_FREE_INODE(inode);
+ 
+ 	is_directory = S_ISDIR(inode->i_mode);
+ 
+@@ -445,6 +448,12 @@ struct inode *ext3_new_inode(handle_t *h
+ 	inode = new_inode(sb);
+ 	if (!inode)
+ 		return ERR_PTR(-ENOMEM);
++
++	inode->i_tag = dx_current_fstag(sb);
++	if (DLIMIT_ALLOC_INODE(inode)) {
++		err = -ENOSPC;
++		goto out_dlimit;
++	}
+ 	ei = EXT3_I(inode);
+ 
+ 	sbi = EXT3_SB(sb);
+@@ -566,7 +575,8 @@ got:
+ 	ei->i_dir_start_lookup = 0;
+ 	ei->i_disksize = 0;
+ 
+-	ei->i_flags = EXT3_I(dir)->i_flags & ~EXT3_INDEX_FL;
++	ei->i_flags = EXT3_I(dir)->i_flags &
++		~(EXT3_INDEX_FL|EXT3_IUNLINK_FL|EXT3_BARRIER_FL);
+ 	if (S_ISLNK(mode))
+ 		ei->i_flags &= ~(EXT3_IMMUTABLE_FL|EXT3_APPEND_FL);
+ 	/* dirsync only applies to directories */
+@@ -621,6 +631,8 @@ got:
+ fail:
+ 	ext3_std_error(sb, err);
+ out:
++	DLIMIT_FREE_INODE(inode);
++out_dlimit:
+ 	iput(inode);
+ 	ret = ERR_PTR(err);
+ really_out:
+@@ -632,6 +644,7 @@ fail_free_drop:
+ 
+ fail_drop:
+ 	DQUOT_DROP(inode);
++	DLIMIT_FREE_INODE(inode);
+ 	inode->i_flags |= S_NOQUOTA;
+ 	inode->i_nlink = 0;
+ 	iput(inode);
+Index: linux-2.6.20/fs/ext3/inode.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext3/inode.c
++++ linux-2.6.20/fs/ext3/inode.c
+@@ -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"
+ 
+@@ -2311,7 +2312,7 @@ void ext3_truncate(struct inode *inode)
+ 		return;
+ 	if (ext3_inode_is_fast_symlink(inode))
+ 		return;
+-	if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
++	if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
+ 		return;
+ 
+ 	/*
+@@ -2633,19 +2634,65 @@ void ext3_set_inode_flags(struct inode *
+ {
+ 	unsigned int flags = EXT3_I(inode)->i_flags;
+ 
+-	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 & EXT3_IMMUTABLE_FL)
++		inode->i_flags |= S_IMMUTABLE;
++	if (flags & EXT3_IUNLINK_FL)
++		inode->i_flags |= S_IUNLINK;
++	if (flags & EXT3_BARRIER_FL)
++		inode->i_flags |= S_BARRIER;
++
+ 	if (flags & EXT3_SYNC_FL)
+ 		inode->i_flags |= S_SYNC;
+ 	if (flags & EXT3_APPEND_FL)
+ 		inode->i_flags |= S_APPEND;
+-	if (flags & EXT3_IMMUTABLE_FL)
+-		inode->i_flags |= S_IMMUTABLE;
+ 	if (flags & EXT3_NOATIME_FL)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & EXT3_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
+ }
+ 
++int ext3_sync_flags(struct inode *inode)
++{
++	unsigned int oldflags, newflags;
++	int err = 0;
++
++	oldflags = EXT3_I(inode)->i_flags;
++	newflags = oldflags & ~(EXT3_IMMUTABLE_FL |
++		EXT3_IUNLINK_FL | EXT3_BARRIER_FL);
++
++	if (IS_IMMUTABLE(inode))
++		newflags |= EXT3_IMMUTABLE_FL;
++	if (IS_IUNLINK(inode))
++		newflags |= EXT3_IUNLINK_FL;
++	if (IS_BARRIER(inode))
++		newflags |= EXT3_BARRIER_FL;
++
++	if (oldflags ^ newflags) {
++		handle_t *handle;
++		struct ext3_iloc iloc;
++
++		handle = ext3_journal_start(inode, 1);
++		if (IS_ERR(handle))
++			return PTR_ERR(handle);
++		if (IS_SYNC(inode))
++			handle->h_sync = 1;
++		err = ext3_reserve_inode_write(handle, inode, &iloc);
++		if (err)
++			goto flags_err;
++
++		EXT3_I(inode)->i_flags = newflags;
++		inode->i_ctime = CURRENT_TIME;
++
++		err = ext3_mark_iloc_dirty(handle, inode, &iloc);
++	flags_err:
++		ext3_journal_stop(handle);
++	}
++	return err;
++}
++
+ void ext3_read_inode(struct inode * inode)
+ {
+ 	struct ext3_iloc iloc;
+@@ -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;
++	uid_t uid;
++	gid_t gid;
+ 
+ #ifdef CONFIG_EXT3_FS_POSIX_ACL
+ 	ei->i_acl = EXT3_ACL_NOT_CACHED;
+@@ -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);
+-	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);
+@@ -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 = 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,
+@@ -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))) {
+-		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;
+ 		}
+ 	} 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);
+@@ -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_TAG && attr->ia_tag != inode->i_tag)) {
+ 		handle_t *handle;
+ 
+ 		/* (user+group)*(old+new) structure, inode write (sb,
+@@ -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_TAG) && IS_TAGGED(inode))
++			inode->i_tag = attr->ia_tag;
+ 		error = ext3_mark_inode_dirty(handle, inode);
+ 		ext3_journal_stop(handle);
+ 	}
+Index: linux-2.6.20/fs/ext3/ioctl.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext3/ioctl.c
++++ linux-2.6.20/fs/ext3/ioctl.c
+@@ -8,6 +8,7 @@
+  */
+ 
+ #include <linux/fs.h>
++#include <linux/mount.h>
+ #include <linux/jbd.h>
+ #include <linux/capability.h>
+ #include <linux/ext3_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>
+ 
+ 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;
+ 
+-		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))
+@@ -61,7 +64,9 @@ int ext3_ioctl (struct inode * inode, st
+ 		 *
+ 		 * This test looks nicer. Thanks to Pauline Middelink
+ 		 */
+-		if ((flags ^ oldflags) & (EXT3_APPEND_FL | EXT3_IMMUTABLE_FL)) {
++		if ((oldflags & EXT3_IMMUTABLE_FL) ||
++			((flags ^ oldflags) & (EXT3_APPEND_FL |
++			EXT3_IMMUTABLE_FL | EXT3_IUNLINK_FL))) {
+ 			if (!capable(CAP_LINUX_IMMUTABLE)) {
+ 				mutex_unlock(&inode->i_mutex);
+ 				return -EPERM;
+@@ -123,7 +128,8 @@ flags_err:
+ 
+ 		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;
+ 
+-		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))
+@@ -212,7 +219,8 @@ flags_err:
+ 		if (!capable(CAP_SYS_RESOURCE))
+ 			return -EPERM;
+ 
+-		if (IS_RDONLY(inode))
++		if (IS_RDONLY(inode) ||
++			(filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
+ 			return -EROFS;
+ 
+ 		if (get_user(n_blocks_count, (__u32 __user *)arg))
+@@ -233,7 +241,8 @@ flags_err:
+ 		if (!capable(CAP_SYS_RESOURCE))
+ 			return -EPERM;
+ 
+-		if (IS_RDONLY(inode))
++		if (IS_RDONLY(inode) ||
++			(filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
+ 			return -EROFS;
+ 
+ 		if (copy_from_user(&input, (struct ext3_new_group_input __user *)arg,
+@@ -247,8 +256,6 @@ flags_err:
+ 
+ 		return err;
+ 	}
+-
+-
+ 	default:
+ 		return -ENOTTY;
+ 	}
+Index: linux-2.6.20/fs/ext3/namei.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext3/namei.c
++++ linux-2.6.20/fs/ext3/namei.c
+@@ -37,6 +37,7 @@
+ #include <linux/buffer_head.h>
+ #include <linux/bio.h>
+ #include <linux/smp_lock.h>
++#include <linux/vs_tag.h>
+ 
+ #include "namei.h"
+ #include "xattr.h"
+@@ -1019,6 +1020,7 @@ static struct dentry *ext3_lookup(struct
+ 
+ 		if (!inode)
+ 			return ERR_PTR(-EACCES);
++		dx_propagate_tag(nd, inode);
+ 	}
+ 	return d_splice_alias(inode, dentry);
+ }
+@@ -2392,6 +2394,7 @@ struct inode_operations ext3_dir_inode_o
+ 	.removexattr	= generic_removexattr,
+ #endif
+ 	.permission	= ext3_permission,
++	.sync_flags	= ext3_sync_flags,
+ };
+ 
+ struct inode_operations ext3_special_inode_operations = {
+@@ -2403,4 +2406,5 @@ struct inode_operations ext3_special_ino
+ 	.removexattr	= generic_removexattr,
+ #endif
+ 	.permission	= ext3_permission,
++	.sync_flags	= ext3_sync_flags,
+ };
+Index: linux-2.6.20/fs/ext3/super.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext3/super.c
++++ linux-2.6.20/fs/ext3/super.c
+@@ -605,12 +605,12 @@ static int ext3_write_dquot(struct dquot
+ static int ext3_acquire_dquot(struct dquot *dquot);
+ static int ext3_release_dquot(struct dquot *dquot);
+ static int ext3_mark_dquot_dirty(struct dquot *dquot);
+-static int ext3_write_info(struct super_block *sb, int type);
+-static int ext3_quota_on(struct super_block *sb, int type, int format_id, char *path);
+-static int ext3_quota_on_mount(struct super_block *sb, int type);
+-static ssize_t ext3_quota_read(struct super_block *sb, int type, char *data,
++static int ext3_write_info(struct dqhash *hash, int type);
++static int ext3_quota_on(struct dqhash *hash, int type, int format_id, char *path);
++static int ext3_quota_on_mount(struct dqhash *hash, int type);
++static ssize_t ext3_quota_read(struct dqhash *hash, int type, char *data,
+ 			       size_t len, loff_t off);
+-static ssize_t ext3_quota_write(struct super_block *sb, int type,
++static ssize_t ext3_quota_write(struct dqhash *hash, int type,
+ 				const char *data, size_t len, loff_t off);
+ 
+ static struct dquot_operations ext3_quota_operations = {
+@@ -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_tag, Opt_notag, Opt_tagid
+ };
+ 
+ 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_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
++	{Opt_tag, "tagxid"},
+ 	{Opt_err, NULL},
+ 	{Opt_resize, "resize"},
+ };
+@@ -820,6 +824,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;
+@@ -938,7 +956,7 @@ static int parse_options (char *options,
+ 		case Opt_grpjquota:
+ 			qtype = GRPQUOTA;
+ set_qf_name:
+-			if (sb_any_quota_enabled(sb)) {
++			if (dqh_any_quota_enabled(sb->s_dqh)) {
+ 				printk(KERN_ERR
+ 					"EXT3-fs: Cannot change journalled "
+ 					"quota options when quota turned on.\n");
+@@ -976,7 +994,7 @@ set_qf_name:
+ 		case Opt_offgrpjquota:
+ 			qtype = GRPQUOTA;
+ clear_qf_name:
+-			if (sb_any_quota_enabled(sb)) {
++			if (dqh_any_quota_enabled(sb->s_dqh)) {
+ 				printk(KERN_ERR "EXT3-fs: Cannot change "
+ 					"journalled quota options when "
+ 					"quota turned on.\n");
+@@ -1004,7 +1022,7 @@ clear_qf_name:
+ 			set_opt(sbi->s_mount_opt, GRPQUOTA);
+ 			break;
+ 		case Opt_noquota:
+-			if (sb_any_quota_enabled(sb)) {
++			if (dqh_any_quota_enabled(sb->s_dqh)) {
+ 				printk(KERN_ERR "EXT3-fs: Cannot change quota "
+ 					"options when quota turned on.\n");
+ 				return 0;
+@@ -1290,7 +1308,7 @@ static void ext3_orphan_cleanup (struct 
+ 	/* Turn on quotas so that they are updated correctly */
+ 	for (i = 0; i < MAXQUOTAS; i++) {
+ 		if (EXT3_SB(sb)->s_qf_names[i]) {
+-			int ret = ext3_quota_on_mount(sb, i);
++			int ret = ext3_quota_on_mount(sb->s_dqh, i);
+ 			if (ret < 0)
+ 				printk(KERN_ERR
+ 					"EXT3-fs: Cannot turn on journalled "
+@@ -1340,8 +1358,8 @@ static void ext3_orphan_cleanup (struct 
+ #ifdef CONFIG_QUOTA
+ 	/* Turn quotas off */
+ 	for (i = 0; i < MAXQUOTAS; i++) {
+-		if (sb_dqopt(sb)->files[i])
+-			vfs_quota_off(sb, i);
++		if (dqh_dqopt(sb->s_dqh)->files[i])
++			vfs_quota_off(sb->s_dqh, i);
+ 	}
+ #endif
+ 	sb->s_flags = s_flags; /* Restore MS_RDONLY status */
+@@ -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_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);
+ 
+@@ -1691,8 +1712,8 @@ static int ext3_fill_super (struct super
+ 	sb->s_export_op = &ext3_export_ops;
+ 	sb->s_xattr = ext3_xattr_handlers;
+ #ifdef CONFIG_QUOTA
+-	sb->s_qcop = &ext3_qctl_operations;
+-	sb->dq_op = &ext3_quota_operations;
++	sb->s_dqh->dqh_qop = &ext3_quota_operations;
++	sb->s_dqh->dqh_qcop = &ext3_qctl_operations;
+ #endif
+ 	INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */
+ 
+@@ -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_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);
+@@ -2459,7 +2486,7 @@ static int ext3_statfs (struct dentry * 
+ 
+ static inline struct inode *dquot_to_inode(struct dquot *dquot)
+ {
+-	return sb_dqopt(dquot->dq_sb)->files[dquot->dq_type];
++	return dqh_dqopt(dquot->dq_dqh)->files[dquot->dq_type];
+ }
+ 
+ static int ext3_dquot_initialize(struct inode *inode, int type)
+@@ -2502,7 +2529,7 @@ static int ext3_write_dquot(struct dquot
+ 
+ 	inode = dquot_to_inode(dquot);
+ 	handle = ext3_journal_start(inode,
+-					EXT3_QUOTA_TRANS_BLOCKS(dquot->dq_sb));
++		EXT3_QUOTA_TRANS_BLOCKS(dquot->dq_dqh->dqh_sb));
+ 	if (IS_ERR(handle))
+ 		return PTR_ERR(handle);
+ 	ret = dquot_commit(dquot);
+@@ -2518,7 +2545,7 @@ static int ext3_acquire_dquot(struct dqu
+ 	handle_t *handle;
+ 
+ 	handle = ext3_journal_start(dquot_to_inode(dquot),
+-					EXT3_QUOTA_INIT_BLOCKS(dquot->dq_sb));
++		EXT3_QUOTA_INIT_BLOCKS(dquot->dq_dqh->dqh_sb));
+ 	if (IS_ERR(handle))
+ 		return PTR_ERR(handle);
+ 	ret = dquot_acquire(dquot);
+@@ -2534,7 +2561,7 @@ static int ext3_release_dquot(struct dqu
+ 	handle_t *handle;
+ 
+ 	handle = ext3_journal_start(dquot_to_inode(dquot),
+-					EXT3_QUOTA_DEL_BLOCKS(dquot->dq_sb));
++		EXT3_QUOTA_DEL_BLOCKS(dquot->dq_dqh->dqh_sb));
+ 	if (IS_ERR(handle))
+ 		return PTR_ERR(handle);
+ 	ret = dquot_release(dquot);
+@@ -2547,8 +2574,8 @@ static int ext3_release_dquot(struct dqu
+ static int ext3_mark_dquot_dirty(struct dquot *dquot)
+ {
+ 	/* Are we journalling quotas? */
+-	if (EXT3_SB(dquot->dq_sb)->s_qf_names[USRQUOTA] ||
+-	    EXT3_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA]) {
++	if (EXT3_SB(dquot->dq_dqh->dqh_sb)->s_qf_names[USRQUOTA] ||
++	    EXT3_SB(dquot->dq_dqh->dqh_sb)->s_qf_names[GRPQUOTA]) {
+ 		dquot_mark_dquot_dirty(dquot);
+ 		return ext3_write_dquot(dquot);
+ 	} else {
+@@ -2556,8 +2583,9 @@ static int ext3_mark_dquot_dirty(struct 
+ 	}
+ }
+ 
+-static int ext3_write_info(struct super_block *sb, int type)
++static int ext3_write_info(struct dqhash *hash, int type)
+ {
++	struct super_block *sb = hash->dqh_sb;
+ 	int ret, err;
+ 	handle_t *handle;
+ 
+@@ -2565,7 +2593,7 @@ static int ext3_write_info(struct super_
+ 	handle = ext3_journal_start(sb->s_root->d_inode, 2);
+ 	if (IS_ERR(handle))
+ 		return PTR_ERR(handle);
+-	ret = dquot_commit_info(sb, type);
++	ret = dquot_commit_info(hash, type);
+ 	err = ext3_journal_stop(handle);
+ 	if (!ret)
+ 		ret = err;
+@@ -2576,18 +2604,20 @@ static int ext3_write_info(struct super_
+  * Turn on quotas during mount time - we need to find
+  * the quota file and such...
+  */
+-static int ext3_quota_on_mount(struct super_block *sb, int type)
++static int ext3_quota_on_mount(struct dqhash *hash, int type)
+ {
+-	return vfs_quota_on_mount(sb, EXT3_SB(sb)->s_qf_names[type],
+-			EXT3_SB(sb)->s_jquota_fmt, type);
++	return vfs_quota_on_mount(hash,
++		EXT3_SB(hash->dqh_sb)->s_qf_names[type],
++		EXT3_SB(hash->dqh_sb)->s_jquota_fmt, type);
+ }
+ 
+ /*
+  * Standard function to be called on quota_on
+  */
+-static int ext3_quota_on(struct super_block *sb, int type, int format_id,
++static int ext3_quota_on(struct dqhash *hash, int type, int format_id,
+ 			 char *path)
+ {
++	struct super_block *sb = hash->dqh_sb;
+ 	int err;
+ 	struct nameidata nd;
+ 
+@@ -2596,7 +2626,7 @@ static int ext3_quota_on(struct super_bl
+ 	/* Not journalling quota? */
+ 	if (!EXT3_SB(sb)->s_qf_names[USRQUOTA] &&
+ 	    !EXT3_SB(sb)->s_qf_names[GRPQUOTA])
+-		return vfs_quota_on(sb, type, format_id, path);
++		return vfs_quota_on(hash, type, format_id, path);
+ 	err = path_lookup(path, LOOKUP_FOLLOW, &nd);
+ 	if (err)
+ 		return err;
+@@ -2611,17 +2641,18 @@ static int ext3_quota_on(struct super_bl
+ 			"EXT3-fs: Quota file not on filesystem root. "
+ 			"Journalled quota will not work.\n");
+ 	path_release(&nd);
+-	return vfs_quota_on(sb, type, format_id, path);
++	return vfs_quota_on(hash, type, format_id, path);
+ }
+ 
+ /* Read data from quotafile - avoid pagecache and such because we cannot afford
+  * acquiring the locks... As quota files are never truncated and quota code
+  * itself serializes the operations (and noone else should touch the files)
+  * we don't have to be afraid of races */
+-static ssize_t ext3_quota_read(struct super_block *sb, int type, char *data,
++static ssize_t ext3_quota_read(struct dqhash *hash, int type, char *data,
+ 			       size_t len, loff_t off)
+ {
+-	struct inode *inode = sb_dqopt(sb)->files[type];
++	struct inode *inode = dqh_dqopt(hash)->files[type];
++	struct super_block *sb = hash->dqh_sb;
+ 	sector_t blk = off >> EXT3_BLOCK_SIZE_BITS(sb);
+ 	int err = 0;
+ 	int offset = off & (sb->s_blocksize - 1);
+@@ -2656,10 +2687,11 @@ static ssize_t ext3_quota_read(struct su
+ 
+ /* Write to quotafile (we know the transaction is already started and has
+  * enough credits) */
+-static ssize_t ext3_quota_write(struct super_block *sb, int type,
++static ssize_t ext3_quota_write(struct dqhash *hash, int type,
+ 				const char *data, size_t len, loff_t off)
+ {
+-	struct inode *inode = sb_dqopt(sb)->files[type];
++	struct inode *inode = dqh_dqopt(hash)->files[type];
++	struct super_block *sb = hash->dqh_sb;
+ 	sector_t blk = off >> EXT3_BLOCK_SIZE_BITS(sb);
+ 	int err = 0;
+ 	int offset = off & (sb->s_blocksize - 1);
+Index: linux-2.6.20/fs/ext3/symlink.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext3/symlink.c
++++ linux-2.6.20/fs/ext3/symlink.c
+@@ -40,6 +40,7 @@ struct inode_operations ext3_symlink_ino
+ 	.listxattr	= ext3_listxattr,
+ 	.removexattr	= generic_removexattr,
+ #endif
++	.sync_flags	= ext3_sync_flags,
+ };
+ 
+ struct inode_operations ext3_fast_symlink_inode_operations = {
+@@ -51,4 +52,5 @@ struct inode_operations ext3_fast_symlin
+ 	.listxattr	= ext3_listxattr,
+ 	.removexattr	= generic_removexattr,
+ #endif
++	.sync_flags	= ext3_sync_flags,
+ };
+Index: linux-2.6.20/fs/ext3/xattr.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext3/xattr.c
++++ linux-2.6.20/fs/ext3/xattr.c
+@@ -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"
+ 
+@@ -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;
++			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 = ext3_journal_get_write_access(handle,
+ 								      new_bh);
+ 				if (error)
+@@ -841,6 +846,8 @@ cleanup:
+ 
+ cleanup_dquot:
+ 	DQUOT_FREE_BLOCK(inode, 1);
++cleanup_dlimit:
++	DLIMIT_FREE_BLOCK(inode, 1);
+ 	goto cleanup;
+ 
+ bad_block:
+Index: linux-2.6.20/fs/ext4/balloc.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext4/balloc.c
++++ linux-2.6.20/fs/ext4/balloc.c
+@@ -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>
+ 
+ /*
+  * 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;
+ }
+ 
+@@ -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;
+ 
+ 	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) &&
++
++	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);
+ }
+ 
+ /**
+@@ -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;
+ 
+ 	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;
+ 	}
++	if (DLIMIT_ALLOC_BLOCK(inode, 1))
++	    goto out_dlimit;
+ 
+ 	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 (!ext4_has_free_blocks(sbi)) {
++	if (!ext4_has_free_blocks(sb)) {
+ 		*errp = -ENOSPC;
+ 		goto out;
+ 	}
+@@ -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);
+Index: linux-2.6.20/fs/ext4/file.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext4/file.c
++++ linux-2.6.20/fs/ext4/file.c
+@@ -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
+ 	.permission	= ext4_permission,
++	.sync_flags	= ext4_sync_flags,
+ };
+ 
+Index: linux-2.6.20/fs/ext4/ialloc.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext4/ialloc.c
++++ linux-2.6.20/fs/ext4/ialloc.c
+@@ -24,6 +24,8 @@
+ #include <linux/random.h>
+ #include <linux/bitops.h>
+ #include <linux/blkdev.h>
++#include <linux/vs_dlimit.h>
++#include <linux/vs_tag.h>
+ #include <asm/byteorder.h>
+ 
+ #include "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);
+ 
+ 	is_directory = S_ISDIR(inode->i_mode);
+ 
+@@ -448,6 +451,12 @@ struct inode *ext4_new_inode(handle_t *h
+ 	inode = new_inode(sb);
+ 	if (!inode)
+ 		return ERR_PTR(-ENOMEM);
++
++	inode->i_tag = dx_current_fstag(sb);
++	if (DLIMIT_ALLOC_INODE(inode)) {
++		err = -ENOSPC;
++		goto out_dlimit;
++	}
+ 	ei = EXT4_I(inode);
+ 
+ 	sbi = EXT4_SB(sb);
+@@ -569,7 +578,8 @@ got:
+ 	ei->i_dir_start_lookup = 0;
+ 	ei->i_disksize = 0;
+ 
+-	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:
+ 
+ fail_drop:
+ 	DQUOT_DROP(inode);
++	DLIMIT_FREE_INODE(inode);
+ 	inode->i_flags |= S_NOQUOTA;
+ 	inode->i_nlink = 0;
+ 	iput(inode);
+Index: linux-2.6.20/fs/ext4/inode.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext4/inode.c
++++ linux-2.6.20/fs/ext4/inode.c
+@@ -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"
+ 
+@@ -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;
+ 
+ 	/*
+@@ -2636,19 +2637,65 @@ void ext4_set_inode_flags(struct inode *
+ {
+ 	unsigned int flags = EXT4_I(inode)->i_flags;
+ 
+-	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 & EXT4_IMMUTABLE_FL)
++		inode->i_flags |= S_IMMUTABLE;
++	if (flags & EXT4_IUNLINK_FL)
++		inode->i_flags |= S_IUNLINK;
++	if (flags & EXT4_BARRIER_FL)
++		inode->i_flags |= S_BARRIER;
++
+ 	if (flags & EXT4_SYNC_FL)
+ 		inode->i_flags |= S_SYNC;
+ 	if (flags & EXT4_APPEND_FL)
+ 		inode->i_flags |= S_APPEND;
+-	if (flags & EXT4_IMMUTABLE_FL)
+-		inode->i_flags |= S_IMMUTABLE;
+ 	if (flags & EXT4_NOATIME_FL)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & EXT4_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
+ }
+ 
++int ext4_sync_flags(struct inode *inode)
++{
++	unsigned int oldflags, newflags;
++	int err = 0;
++
++	oldflags = EXT4_I(inode)->i_flags;
++	newflags = oldflags & ~(EXT4_IMMUTABLE_FL |
++		EXT4_IUNLINK_FL | EXT4_BARRIER_FL);
++
++	if (IS_IMMUTABLE(inode))
++		newflags |= EXT4_IMMUTABLE_FL;
++	if (IS_IUNLINK(inode))
++		newflags |= EXT4_IUNLINK_FL;
++	if (IS_BARRIER(inode))
++		newflags |= EXT4_BARRIER_FL;
++
++	if (oldflags ^ 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;
++
++		err = ext4_mark_iloc_dirty(handle, inode, &iloc);
++	flags_err:
++		ext4_journal_stop(handle);
++	}
++	return err;
++}
++
+ 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;
+ 
+ #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;
+ 
+ 	/* 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;
+ 		}
+ 	} 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;
+ 
+ 	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;
+ 
+ 		/* (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);
+ 	}
+Index: linux-2.6.20/fs/ext4/ioctl.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext4/ioctl.c
++++ linux-2.6.20/fs/ext4/ioctl.c
+@@ -8,6 +8,7 @@
+  */
+ 
+ #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>
+ 
+ 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;
+ 
+-		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))
+@@ -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:
+ 
+ 		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;
+ 
+-		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))
+@@ -212,7 +219,8 @@ flags_err:
+ 		if (!capable(CAP_SYS_RESOURCE))
+ 			return -EPERM;
+ 
+-		if (IS_RDONLY(inode))
++		if (IS_RDONLY(inode) ||
++			(filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
+ 			return -EROFS;
+ 
+ 		if (get_user(n_blocks_count, (__u32 __user *)arg))
+@@ -233,7 +241,8 @@ flags_err:
+ 		if (!capable(CAP_SYS_RESOURCE))
+ 			return -EPERM;
+ 
+-		if (IS_RDONLY(inode))
++		if (IS_RDONLY(inode) ||
++			(filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
+ 			return -EROFS;
+ 
+ 		if (copy_from_user(&input, (struct ext4_new_group_input __user *)arg,
+@@ -247,7 +256,6 @@ flags_err:
+ 
+ 		return err;
+ 	}
+-
+ 	default:
+ 		return -ENOTTY;
+ 	}
+Index: linux-2.6.20/fs/ext4/namei.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext4/namei.c
++++ linux-2.6.20/fs/ext4/namei.c
+@@ -37,6 +37,7 @@
+ #include <linux/buffer_head.h>
+ #include <linux/bio.h>
+ #include <linux/smp_lock.h>
++#include <linux/vs_tag.h>
+ 
+ #include "namei.h"
+ #include "xattr.h"
+@@ -1017,6 +1018,7 @@ static struct dentry *ext4_lookup(struct
+ 
+ 		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,
+ };
+ 
+ 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,
+ };
+Index: linux-2.6.20/fs/ext4/super.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext4/super.c
++++ linux-2.6.20/fs/ext4/super.c
+@@ -656,12 +656,12 @@ static int ext4_write_dquot(struct dquot
+ static int ext4_acquire_dquot(struct dquot *dquot);
+ static int ext4_release_dquot(struct dquot *dquot);
+ static int ext4_mark_dquot_dirty(struct dquot *dquot);
+-static int ext4_write_info(struct super_block *sb, int type);
+-static int ext4_quota_on(struct super_block *sb, int type, int format_id, char *path);
+-static int ext4_quota_on_mount(struct super_block *sb, int type);
+-static ssize_t ext4_quota_read(struct super_block *sb, int type, char *data,
++static int ext4_write_info(struct dqhash *hash, int type);
++static int ext4_quota_on(struct dqhash *hash, int type, int format_id, char *path);
++static int ext4_quota_on_mount(struct dqhash *hash, int type);
++static ssize_t ext4_quota_read(struct dqhash *hash, int type, char *data,
+ 			       size_t len, loff_t off);
+-static ssize_t ext4_quota_write(struct super_block *sb, int type,
++static ssize_t ext4_quota_write(struct dqhash *hash, int type,
+ 				const char *data, size_t len, loff_t off);
+ 
+ static struct dquot_operations ext4_quota_operations = {
+@@ -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
+ };
+ 
+ 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;
+@@ -990,7 +1008,7 @@ static int parse_options (char *options,
+ 		case Opt_grpjquota:
+ 			qtype = GRPQUOTA;
+ set_qf_name:
+-			if (sb_any_quota_enabled(sb)) {
++			if (dqh_any_quota_enabled(sb->s_dqh)) {
+ 				printk(KERN_ERR
+ 					"EXT4-fs: Cannot change journalled "
+ 					"quota options when quota turned on.\n");
+@@ -1028,7 +1046,7 @@ set_qf_name:
+ 		case Opt_offgrpjquota:
+ 			qtype = GRPQUOTA;
+ clear_qf_name:
+-			if (sb_any_quota_enabled(sb)) {
++			if (dqh_any_quota_enabled(sb->s_dqh)) {
+ 				printk(KERN_ERR "EXT4-fs: Cannot change "
+ 					"journalled quota options when "
+ 					"quota turned on.\n");
+@@ -1056,7 +1074,7 @@ clear_qf_name:
+ 			set_opt(sbi->s_mount_opt, GRPQUOTA);
+ 			break;
+ 		case Opt_noquota:
+-			if (sb_any_quota_enabled(sb)) {
++			if (dqh_any_quota_enabled(sb->s_dqh)) {
+ 				printk(KERN_ERR "EXT4-fs: Cannot change quota "
+ 					"options when quota turned on.\n");
+ 				return 0;
+@@ -1347,7 +1365,7 @@ static void ext4_orphan_cleanup (struct 
+ 	/* Turn on quotas so that they are updated correctly */
+ 	for (i = 0; i < MAXQUOTAS; i++) {
+ 		if (EXT4_SB(sb)->s_qf_names[i]) {
+-			int ret = ext4_quota_on_mount(sb, i);
++			int ret = ext4_quota_on_mount(sb->s_dqh, i);
+ 			if (ret < 0)
+ 				printk(KERN_ERR
+ 					"EXT4-fs: Cannot turn on journalled "
+@@ -1397,8 +1415,8 @@ static void ext4_orphan_cleanup (struct 
+ #ifdef CONFIG_QUOTA
+ 	/* Turn quotas off */
+ 	for (i = 0; i < MAXQUOTAS; i++) {
+-		if (sb_dqopt(sb)->files[i])
+-			vfs_quota_off(sb, i);
++		if (dqh_dqopt(sb->s_dqh)->files[i])
++			vfs_quota_off(sb->s_dqh, i);
+ 	}
+ #endif
+ 	sb->s_flags = s_flags; /* Restore MS_RDONLY status */
+@@ -1545,6 +1563,9 @@ static int ext4_fill_super (struct super
+ 			    NULL, 0))
+ 		goto failed_mount;
+ 
++	if (EXT4_SB(sb)->s_mount_opt & EXT4_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
++
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		((sbi->s_mount_opt & EXT4_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
+ 
+@@ -1763,8 +1784,8 @@ static int ext4_fill_super (struct super
+ 	sb->s_export_op = &ext4_export_ops;
+ 	sb->s_xattr = ext4_xattr_handlers;
+ #ifdef CONFIG_QUOTA
+-	sb->s_qcop = &ext4_qctl_operations;
+-	sb->dq_op = &ext4_quota_operations;
++	sb->s_dqh->dqh_qop = &ext4_quota_operations;
++	sb->s_dqh->dqh_qcop = &ext4_qctl_operations;
+ #endif
+ 	INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */
+ 
+@@ -2376,6 +2397,12 @@ static int ext4_remount (struct super_bl
+ 
+ 	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;
++	}
+ 
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		((sbi->s_mount_opt & EXT4_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
+@@ -2534,7 +2561,7 @@ static int ext4_statfs (struct dentry * 
+ 
+ static inline struct inode *dquot_to_inode(struct dquot *dquot)
+ {
+-	return sb_dqopt(dquot->dq_sb)->files[dquot->dq_type];
++	return dqh_dqopt(dquot->dq_dqh)->files[dquot->dq_type];
+ }
+ 
+ static int ext4_dquot_initialize(struct inode *inode, int type)
+@@ -2577,7 +2604,7 @@ static int ext4_write_dquot(struct dquot
+ 
+ 	inode = dquot_to_inode(dquot);
+ 	handle = ext4_journal_start(inode,
+-					EXT4_QUOTA_TRANS_BLOCKS(dquot->dq_sb));
++		EXT4_QUOTA_TRANS_BLOCKS(dquot->dq_dqh->dqh_sb));
+ 	if (IS_ERR(handle))
+ 		return PTR_ERR(handle);
+ 	ret = dquot_commit(dquot);
+@@ -2593,7 +2620,7 @@ static int ext4_acquire_dquot(struct dqu
+ 	handle_t *handle;
+ 
+ 	handle = ext4_journal_start(dquot_to_inode(dquot),
+-					EXT4_QUOTA_INIT_BLOCKS(dquot->dq_sb));
++		EXT4_QUOTA_INIT_BLOCKS(dquot->dq_dqh->dqh_sb));
+ 	if (IS_ERR(handle))
+ 		return PTR_ERR(handle);
+ 	ret = dquot_acquire(dquot);
+@@ -2609,7 +2636,7 @@ static int ext4_release_dquot(struct dqu
+ 	handle_t *handle;
+ 
+ 	handle = ext4_journal_start(dquot_to_inode(dquot),
+-					EXT4_QUOTA_DEL_BLOCKS(dquot->dq_sb));
++		EXT4_QUOTA_DEL_BLOCKS(dquot->dq_dqh->dqh_sb));
+ 	if (IS_ERR(handle))
+ 		return PTR_ERR(handle);
+ 	ret = dquot_release(dquot);
+@@ -2622,8 +2649,8 @@ static int ext4_release_dquot(struct dqu
+ static int ext4_mark_dquot_dirty(struct dquot *dquot)
+ {
+ 	/* Are we journalling quotas? */
+-	if (EXT4_SB(dquot->dq_sb)->s_qf_names[USRQUOTA] ||
+-	    EXT4_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA]) {
++	if (EXT4_SB(dquot->dq_dqh->dqh_sb)->s_qf_names[USRQUOTA] ||
++	    EXT4_SB(dquot->dq_dqh->dqh_sb)->s_qf_names[GRPQUOTA]) {
+ 		dquot_mark_dquot_dirty(dquot);
+ 		return ext4_write_dquot(dquot);
+ 	} else {
+@@ -2631,8 +2658,9 @@ static int ext4_mark_dquot_dirty(struct 
+ 	}
+ }
+ 
+-static int ext4_write_info(struct super_block *sb, int type)
++static int ext4_write_info(struct dqhash *hash, int type)
+ {
++	struct super_block *sb = hash->dqh_sb;
+ 	int ret, err;
+ 	handle_t *handle;
+ 
+@@ -2640,7 +2668,7 @@ static int ext4_write_info(struct super_
+ 	handle = ext4_journal_start(sb->s_root->d_inode, 2);
+ 	if (IS_ERR(handle))
+ 		return PTR_ERR(handle);
+-	ret = dquot_commit_info(sb, type);
++	ret = dquot_commit_info(hash, type);
+ 	err = ext4_journal_stop(handle);
+ 	if (!ret)
+ 		ret = err;
+@@ -2651,18 +2679,20 @@ static int ext4_write_info(struct super_
+  * Turn on quotas during mount time - we need to find
+  * the quota file and such...
+  */
+-static int ext4_quota_on_mount(struct super_block *sb, int type)
++static int ext4_quota_on_mount(struct dqhash *hash, int type)
+ {
+-	return vfs_quota_on_mount(sb, EXT4_SB(sb)->s_qf_names[type],
+-			EXT4_SB(sb)->s_jquota_fmt, type);
++	return vfs_quota_on_mount(hash,
++		EXT4_SB(hash->dqh_sb)->s_qf_names[type],
++		EXT4_SB(hash->dqh_sb)->s_jquota_fmt, type);
+ }
+ 
+ /*
+  * Standard function to be called on quota_on
+  */
+-static int ext4_quota_on(struct super_block *sb, int type, int format_id,
++static int ext4_quota_on(struct dqhash *hash, int type, int format_id,
+ 			 char *path)
+ {
++	struct super_block *sb = hash->dqh_sb;
+ 	int err;
+ 	struct nameidata nd;
+ 
+@@ -2671,7 +2701,7 @@ static int ext4_quota_on(struct super_bl
+ 	/* Not journalling quota? */
+ 	if (!EXT4_SB(sb)->s_qf_names[USRQUOTA] &&
+ 	    !EXT4_SB(sb)->s_qf_names[GRPQUOTA])
+-		return vfs_quota_on(sb, type, format_id, path);
++		return vfs_quota_on(hash, type, format_id, path);
+ 	err = path_lookup(path, LOOKUP_FOLLOW, &nd);
+ 	if (err)
+ 		return err;
+@@ -2686,17 +2716,18 @@ static int ext4_quota_on(struct super_bl
+ 			"EXT4-fs: Quota file not on filesystem root. "
+ 			"Journalled quota will not work.\n");
+ 	path_release(&nd);
+-	return vfs_quota_on(sb, type, format_id, path);
++	return vfs_quota_on(hash, type, format_id, path);
+ }
+ 
+ /* Read data from quotafile - avoid pagecache and such because we cannot afford
+  * acquiring the locks... As quota files are never truncated and quota code
+  * itself serializes the operations (and noone else should touch the files)
+  * we don't have to be afraid of races */
+-static ssize_t ext4_quota_read(struct super_block *sb, int type, char *data,
++static ssize_t ext4_quota_read(struct dqhash *hash, int type, char *data,
+ 			       size_t len, loff_t off)
+ {
+-	struct inode *inode = sb_dqopt(sb)->files[type];
++	struct inode *inode = dqh_dqopt(hash)->files[type];
++	struct super_block *sb = hash->dqh_sb;
+ 	sector_t blk = off >> EXT4_BLOCK_SIZE_BITS(sb);
+ 	int err = 0;
+ 	int offset = off & (sb->s_blocksize - 1);
+@@ -2731,10 +2762,11 @@ static ssize_t ext4_quota_read(struct su
+ 
+ /* Write to quotafile (we know the transaction is already started and has
+  * enough credits) */
+-static ssize_t ext4_quota_write(struct super_block *sb, int type,
++static ssize_t ext4_quota_write(struct dqhash *hash, int type,
+ 				const char *data, size_t len, loff_t off)
+ {
+-	struct inode *inode = sb_dqopt(sb)->files[type];
++	struct inode *inode = dqh_dqopt(hash)->files[type];
++	struct super_block *sb = hash->dqh_sb;
+ 	sector_t blk = off >> EXT4_BLOCK_SIZE_BITS(sb);
+ 	int err = 0;
+ 	int offset = off & (sb->s_blocksize - 1);
+Index: linux-2.6.20/fs/ext4/symlink.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext4/symlink.c
++++ linux-2.6.20/fs/ext4/symlink.c
+@@ -40,6 +40,7 @@ struct inode_operations ext4_symlink_ino
+ 	.listxattr	= ext4_listxattr,
+ 	.removexattr	= generic_removexattr,
+ #endif
++	.sync_flags	= ext4_sync_flags,
+ };
+ 
+ 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,
+ };
+Index: linux-2.6.20/fs/ext4/xattr.c
+===================================================================
+--- linux-2.6.20.orig/fs/ext4/xattr.c
++++ linux-2.6.20/fs/ext4/xattr.c
+@@ -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"
+ 
+@@ -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:
+ 
+ cleanup_dquot:
+ 	DQUOT_FREE_BLOCK(inode, 1);
++cleanup_dlimit:
++	DLIMIT_FREE_BLOCK(inode, 1);
+ 	goto cleanup;
+ 
+ bad_block:
+Index: linux-2.6.20/fs/fcntl.c
+===================================================================
+--- linux-2.6.20.orig/fs/fcntl.c
++++ linux-2.6.20/fs/fcntl.c
+@@ -18,6 +18,7 @@
+ #include <linux/ptrace.h>
+ #include <linux/signal.h>
+ #include <linux/rcupdate.h>
++#include <linux/vs_limit.h>
+ 
+ #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;
+ 
+ 	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
+ 
+ 	if (tofree)
+ 		filp_close(tofree, files);
++	else
++		vx_openfd_inc(newfd);	/* fd was unused */
++
+ 	err = newfd;
+ out:
+ 	return err;
+Index: linux-2.6.20/fs/file_table.c
+===================================================================
+--- linux-2.6.20.orig/fs/file_table.c
++++ linux-2.6.20/fs/file_table.c
+@@ -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>
+ 
+@@ -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;
+ 
+ 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)
+ {
+ 	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);
+ 	}
+Index: linux-2.6.20/fs/hfsplus/ioctl.c
+===================================================================
+--- linux-2.6.20.orig/fs/hfsplus/ioctl.c
++++ linux-2.6.20/fs/hfsplus/ioctl.c
+@@ -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 |= 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;
+ 
+ 		if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
+Index: linux-2.6.20/fs/inode.c
+===================================================================
+--- linux-2.6.20.orig/fs/inode.c
++++ linux-2.6.20/fs/inode.c
+@@ -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_tag = 0;
+ 		inode->i_blkbits = sb->s_blocksize_bits;
+ 		inode->i_flags = 0;
+ 		atomic_set(&inode->i_count, 1);
+@@ -126,6 +129,9 @@ static struct inode *alloc_inode(struct 
+ 		inode->i_blocks = 0;
+ 		inode->i_bytes = 0;
+ 		inode->i_generation = 0;
++#ifdef CONFIG_QUOTACTL
++		inode->i_dqh = dqhget(sb->s_dqh);
++#endif
+ #ifdef CONFIG_QUOTA
+ 		memset(&inode->i_dquot, 0, sizeof(inode->i_dquot));
+ #endif
+@@ -172,6 +178,8 @@ void destroy_inode(struct inode *inode) 
+ {
+ 	BUG_ON(inode_has_buffers(inode));
+ 	security_inode_free(inode);
++	if (dqhash_valid(inode->i_dqh))
++		dqhput(inode->i_dqh);
+ 	if (inode->i_sb->s_op->destroy_inode)
+ 		inode->i_sb->s_op->destroy_inode(inode);
+ 	else
+@@ -233,6 +241,8 @@ void __iget(struct inode * inode)
+ 	inodes_stat.nr_unused--;
+ }
+ 
++EXPORT_SYMBOL_GPL(__iget);
++
+ /**
+  * clear_inode - clear an inode
+  * @inode: inode to clear
+@@ -1257,12 +1267,13 @@ EXPORT_SYMBOL(inode_needs_sync);
+  */
+ #ifdef CONFIG_QUOTA
+ 
+-void remove_dquot_ref(struct super_block *sb, int type,
++void remove_dquot_ref(struct dqhash *hash, int type,
+ 			struct list_head *tofree_head)
+ {
+ 	struct inode *inode;
++	struct super_block *sb = hash->dqh_sb;
+ 
+-	if (!sb->dq_op)
++	if (!hash->dqh_qop)
+ 		return;	/* nothing to do */
+ 	spin_lock(&inode_lock);	/* This lock is for inodes code */
+ 
+Index: linux-2.6.20/fs/ioctl.c
+===================================================================
+--- linux-2.6.20.orig/fs/ioctl.c
++++ linux-2.6.20/fs/ioctl.c
+@@ -12,10 +12,14 @@
+ #include <linux/fs.h>
+ #include <linux/security.h>
+ #include <linux/module.h>
++#include <linux/proc_fs.h>
++#include <linux/vserver/inode.h>
++#include <linux/vs_tag.h>
+ 
+ #include <asm/uaccess.h>
+ #include <asm/ioctls.h>
+ 
++
+ static long do_ioctl(struct file *filp, unsigned int cmd,
+ 		unsigned long arg)
+ {
+Index: linux-2.6.20/fs/ioprio.c
+===================================================================
+--- linux-2.6.20.orig/fs/ioprio.c
++++ linux-2.6.20/fs/ioprio.c
+@@ -25,6 +25,7 @@
+ #include <linux/capability.h>
+ #include <linux/syscalls.h>
+ #include <linux/security.h>
++#include <linux/vs_base.h>
+ 
+ static int set_task_ioprio(struct task_struct *task, int ioprio)
+ {
+@@ -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);
+ 
+ 			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);
+ 
+ 			if (!user)
+ 				break;
+Index: linux-2.6.20/fs/jffs2/dir.c
+===================================================================
+--- linux-2.6.20.orig/fs/jffs2/dir.c
++++ linux-2.6.20/fs/jffs2/dir.c
+@@ -37,6 +37,8 @@ static int jffs2_mknod (struct inode *,s
+ static int jffs2_rename (struct inode *, struct dentry *,
+                         struct inode *, struct dentry *);
+ 
++extern int jffs2_sync_flags(struct inode *);
++
+ const struct file_operations jffs2_dir_operations =
+ {
+ 	.read =		generic_read_dir,
+@@ -59,6 +61,7 @@ struct inode_operations jffs2_dir_inode_
+ 	.rename =	jffs2_rename,
+ 	.permission =	jffs2_permission,
+ 	.setattr =	jffs2_setattr,
++	.sync_flags =	jffs2_sync_flags,
+ 	.setxattr =	jffs2_setxattr,
+ 	.getxattr =	jffs2_getxattr,
+ 	.listxattr =	jffs2_listxattr,
+Index: linux-2.6.20/fs/jffs2/file.c
+===================================================================
+--- linux-2.6.20.orig/fs/jffs2/file.c
++++ linux-2.6.20/fs/jffs2/file.c
+@@ -27,6 +27,9 @@ static int jffs2_prepare_write (struct f
+ 				unsigned start, unsigned end);
+ static int jffs2_readpage (struct file *filp, struct page *pg);
+ 
++extern int jffs2_sync_flags(struct inode *);
++
++
+ int jffs2_fsync(struct file *filp, struct dentry *dentry, int datasync)
+ {
+ 	struct inode *inode = dentry->d_inode;
+@@ -58,6 +61,7 @@ struct inode_operations jffs2_file_inode
+ {
+ 	.permission =	jffs2_permission,
+ 	.setattr =	jffs2_setattr,
++	.sync_flags =	jffs2_sync_flags,
+ 	.setxattr =	jffs2_setxattr,
+ 	.getxattr =	jffs2_getxattr,
+ 	.listxattr =	jffs2_listxattr,
+@@ -159,12 +163,14 @@ static int jffs2_prepare_write (struct f
+ 		ri.mode = cpu_to_jemode(inode->i_mode);
+ 		ri.uid = cpu_to_je16(inode->i_uid);
+ 		ri.gid = cpu_to_je16(inode->i_gid);
++		ri.tag = cpu_to_je16(inode->i_tag);
+ 		ri.isize = cpu_to_je32(max((uint32_t)inode->i_size, pageofs));
+ 		ri.atime = ri.ctime = ri.mtime = cpu_to_je32(get_seconds());
+ 		ri.offset = cpu_to_je32(inode->i_size);
+ 		ri.dsize = cpu_to_je32(pageofs - inode->i_size);
+ 		ri.csize = cpu_to_je32(0);
+ 		ri.compr = JFFS2_COMPR_ZERO;
++		ri.flags = cpu_to_je16(f->flags);
+ 		ri.node_crc = cpu_to_je32(crc32(0, &ri, sizeof(ri)-8));
+ 		ri.data_crc = cpu_to_je32(0);
+ 
+@@ -250,8 +256,10 @@ static int jffs2_commit_write (struct fi
+ 	ri->mode = cpu_to_jemode(inode->i_mode);
+ 	ri->uid = cpu_to_je16(inode->i_uid);
+ 	ri->gid = cpu_to_je16(inode->i_gid);
++	ri->tag = cpu_to_je16(inode->i_tag);
+ 	ri->isize = cpu_to_je32((uint32_t)inode->i_size);
+ 	ri->atime = ri->ctime = ri->mtime = cpu_to_je32(get_seconds());
++	ri->flags = cpu_to_je16(f->flags);
+ 
+ 	/* In 2.4, it was already kmapped by generic_file_write(). Doesn't
+ 	   hurt to do it again. The alternative is ifdefs, which are ugly. */
+Index: linux-2.6.20/fs/jffs2/fs.c
+===================================================================
+--- linux-2.6.20.orig/fs/jffs2/fs.c
++++ linux-2.6.20/fs/jffs2/fs.c
+@@ -22,6 +22,7 @@
+ #include <linux/vmalloc.h>
+ #include <linux/vfs.h>
+ #include <linux/crc32.h>
++#include <linux/vs_tag.h>
+ #include "nodelist.h"
+ 
+ static int jffs2_flash_setup(struct jffs2_sb_info *c);
+@@ -99,6 +100,7 @@ static int jffs2_do_setattr (struct inod
+ 
+ 	ri->uid = cpu_to_je16((ivalid & ATTR_UID)?iattr->ia_uid:inode->i_uid);
+ 	ri->gid = cpu_to_je16((ivalid & ATTR_GID)?iattr->ia_gid:inode->i_gid);
++	ri->tag = cpu_to_je16((ivalid & ATTR_TAG)?iattr->ia_tag:inode->i_tag);
+ 
+ 	if (ivalid & ATTR_MODE)
+ 		if (iattr->ia_mode & S_ISGID &&
+@@ -118,6 +120,8 @@ static int jffs2_do_setattr (struct inod
+ 	ri->offset = cpu_to_je32(0);
+ 	ri->csize = ri->dsize = cpu_to_je32(mdatalen);
+ 	ri->compr = JFFS2_COMPR_NONE;
++	ri->flags = cpu_to_je16(f->flags);
++
+ 	if (ivalid & ATTR_SIZE && inode->i_size < iattr->ia_size) {
+ 		/* It's an extension. Make it a hole node */
+ 		ri->compr = JFFS2_COMPR_ZERO;
+@@ -147,6 +151,7 @@ static int jffs2_do_setattr (struct inod
+ 	inode->i_mode = jemode_to_cpu(ri->mode);
+ 	inode->i_uid = je16_to_cpu(ri->uid);
+ 	inode->i_gid = je16_to_cpu(ri->gid);
++	inode->i_tag = je16_to_cpu(ri->tag);
+ 
+ 
+ 	old_metadata = f->metadata;
+@@ -181,6 +186,48 @@ static int jffs2_do_setattr (struct inod
+ 	return 0;
+ }
+ 
++void jffs2_set_inode_flags(struct inode *inode)
++{
++	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
++	unsigned int flags = f->flags;
++
++	inode->i_flags &= ~(JFFS2_INO_FLAG_IMMUTABLE |
++		JFFS2_INO_FLAG_IUNLINK | JFFS2_INO_FLAG_BARRIER);
++
++	if (flags & JFFS2_INO_FLAG_IMMUTABLE)
++		inode->i_flags |= S_IMMUTABLE;
++	if (flags & JFFS2_INO_FLAG_IUNLINK)
++		inode->i_flags |= S_IUNLINK;
++	if (flags & JFFS2_INO_FLAG_BARRIER)
++		inode->i_flags |= S_BARRIER;
++}
++
++int jffs2_sync_flags(struct inode *inode)
++{
++	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
++	unsigned int oldflags, newflags;
++
++	oldflags = f->flags;
++	newflags = oldflags & ~(JFFS2_INO_FLAG_IMMUTABLE |
++		JFFS2_INO_FLAG_IUNLINK | JFFS2_INO_FLAG_BARRIER);
++
++	if (IS_IMMUTABLE(inode))
++		newflags |= JFFS2_INO_FLAG_IMMUTABLE;
++	if (IS_IUNLINK(inode))
++		newflags |= JFFS2_INO_FLAG_IUNLINK;
++	if (IS_BARRIER(inode))
++		newflags |= JFFS2_INO_FLAG_BARRIER;
++
++	if (oldflags ^ newflags) {
++		f->flags = newflags;
++		inode->i_ctime = CURRENT_TIME;
++		/* strange requirement, see jffs2_dirty_inode() */
++		inode->i_state |= I_DIRTY_DATASYNC;
++		mark_inode_dirty(inode);
++	}
++	return 0;
++}
++
+ int jffs2_setattr(struct dentry *dentry, struct iattr *iattr)
+ {
+ 	int rc;
+@@ -256,6 +303,7 @@ void jffs2_read_inode (struct inode *ino
+ 	inode->i_mode = jemode_to_cpu(latest_node.mode);
+ 	inode->i_uid = je16_to_cpu(latest_node.uid);
+ 	inode->i_gid = je16_to_cpu(latest_node.gid);
++	inode->i_tag = je16_to_cpu(latest_node.tag);
+ 	inode->i_size = je32_to_cpu(latest_node.isize);
+ 	inode->i_atime = ITIME(je32_to_cpu(latest_node.atime));
+ 	inode->i_mtime = ITIME(je32_to_cpu(latest_node.mtime));
+@@ -287,6 +335,7 @@ void jffs2_read_inode (struct inode *ino
+ 
+ 		inode->i_op = &jffs2_dir_inode_operations;
+ 		inode->i_fop = &jffs2_dir_operations;
++		f->flags = je16_to_cpu(latest_node.flags);
+ 		break;
+ 	}
+ 	case S_IFREG:
+@@ -294,6 +343,7 @@ void jffs2_read_inode (struct inode *ino
+ 		inode->i_fop = &jffs2_file_operations;
+ 		inode->i_mapping->a_ops = &jffs2_file_address_operations;
+ 		inode->i_mapping->nrpages = 0;
++		f->flags = je16_to_cpu(latest_node.flags);
+ 		break;
+ 
+ 	case S_IFBLK:
+@@ -330,7 +380,7 @@ void jffs2_read_inode (struct inode *ino
+ 	default:
+ 		printk(KERN_WARNING "jffs2_read_inode(): Bogus imode %o for ino %lu\n", inode->i_mode, (unsigned long)inode->i_ino);
+ 	}
+-
++	jffs2_set_inode_flags(inode);
+ 	up(&f->sem);
+ 
+ 	D1(printk(KERN_DEBUG "jffs2_read_inode() returning\n"));
+@@ -347,10 +397,11 @@ void jffs2_dirty_inode(struct inode *ino
+ 
+ 	D1(printk(KERN_DEBUG "jffs2_dirty_inode() calling setattr() for ino #%lu\n", inode->i_ino));
+ 
+-	iattr.ia_valid = ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_ATIME|ATTR_MTIME|ATTR_CTIME;
++	iattr.ia_valid = ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_ATIME|ATTR_MTIME|ATTR_CTIME|ATTR_TAG;
+ 	iattr.ia_mode = inode->i_mode;
+ 	iattr.ia_uid = inode->i_uid;
+ 	iattr.ia_gid = inode->i_gid;
++	iattr.ia_tag = inode->i_tag;
+ 	iattr.ia_atime = inode->i_atime;
+ 	iattr.ia_mtime = inode->i_mtime;
+ 	iattr.ia_ctime = inode->i_ctime;
+@@ -424,6 +475,7 @@ struct inode *jffs2_new_inode (struct in
+ 
+ 	memset(ri, 0, sizeof(*ri));
+ 	/* Set OS-specific defaults for new inodes */
++	ri->tag = cpu_to_je16(dx_current_tag());
+ 	ri->uid = cpu_to_je16(current->fsuid);
+ 
+ 	if (dir_i->i_mode & S_ISGID) {
+@@ -445,14 +497,16 @@ struct inode *jffs2_new_inode (struct in
+ 	inode->i_mode = jemode_to_cpu(ri->mode);
+ 	inode->i_gid = je16_to_cpu(ri->gid);
+ 	inode->i_uid = je16_to_cpu(ri->uid);
++	inode->i_tag = je16_to_cpu(ri->tag);
+ 	inode->i_atime = inode->i_ctime = inode->i_mtime = CURRENT_TIME_SEC;
+ 	ri->atime = ri->mtime = ri->ctime = cpu_to_je32(I_SEC(inode->i_mtime));
+ 
+ 	inode->i_blocks = 0;
+ 	inode->i_size = 0;
+ 
++	f->flags = je16_to_cpu(ri->flags);
++	jffs2_set_inode_flags(inode);
+ 	insert_inode_hash(inode);
+-
+ 	return inode;
+ }
+ 
+Index: linux-2.6.20/fs/jffs2/gc.c
+===================================================================
+--- linux-2.6.20.orig/fs/jffs2/gc.c
++++ linux-2.6.20/fs/jffs2/gc.c
+@@ -736,6 +736,7 @@ static int jffs2_garbage_collect_metadat
+ 	ri.mode = cpu_to_jemode(JFFS2_F_I_MODE(f));
+ 	ri.uid = cpu_to_je16(JFFS2_F_I_UID(f));
+ 	ri.gid = cpu_to_je16(JFFS2_F_I_GID(f));
++	ri.tag = cpu_to_je16(JFFS2_F_I_TAG(f));
+ 	ri.isize = cpu_to_je32(ilen);
+ 	ri.atime = cpu_to_je32(JFFS2_F_I_ATIME(f));
+ 	ri.ctime = cpu_to_je32(JFFS2_F_I_CTIME(f));
+@@ -999,6 +1000,7 @@ static int jffs2_garbage_collect_hole(st
+ 	ri.mode = cpu_to_jemode(JFFS2_F_I_MODE(f));
+ 	ri.uid = cpu_to_je16(JFFS2_F_I_UID(f));
+ 	ri.gid = cpu_to_je16(JFFS2_F_I_GID(f));
++	ri.tag = cpu_to_je16(JFFS2_F_I_TAG(f));
+ 	ri.isize = cpu_to_je32(ilen);
+ 	ri.atime = cpu_to_je32(JFFS2_F_I_ATIME(f));
+ 	ri.ctime = cpu_to_je32(JFFS2_F_I_CTIME(f));
+@@ -1257,6 +1259,7 @@ static int jffs2_garbage_collect_dnode(s
+ 		ri.mode = cpu_to_jemode(JFFS2_F_I_MODE(f));
+ 		ri.uid = cpu_to_je16(JFFS2_F_I_UID(f));
+ 		ri.gid = cpu_to_je16(JFFS2_F_I_GID(f));
++		ri.tag = cpu_to_je16(JFFS2_F_I_TAG(f));
+ 		ri.isize = cpu_to_je32(JFFS2_F_I_SIZE(f));
+ 		ri.atime = cpu_to_je32(JFFS2_F_I_ATIME(f));
+ 		ri.ctime = cpu_to_je32(JFFS2_F_I_CTIME(f));
+Index: linux-2.6.20/fs/jffs2/ioctl.c
+===================================================================
+--- linux-2.6.20.orig/fs/jffs2/ioctl.c
++++ linux-2.6.20/fs/jffs2/ioctl.c
+@@ -12,12 +12,67 @@
+  */
+ 
+ #include <linux/fs.h>
++#include <linux/types.h>
++#include <linux/mount.h>
++#include <linux/jffs2.h>
++#include <linux/uaccess.h>
++#include <linux/vs_base.h>
++#include "jffs2_fs_sb.h"
++#include "jffs2_fs_i.h"
++#include "acl.h"
++#include "os-linux.h"
++
++extern void jffs2_set_inode_flags(struct inode *);
+ 
+ int jffs2_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
+ 		unsigned long arg)
+ {
+-	/* Later, this will provide for lsattr.jffs2 and chattr.jffs2, which
+-	   will include compression support etc. */
+-	return -ENOTTY;
++	struct jffs2_inode_info *j = JFFS2_INODE_INFO(inode);
++	unsigned int flags, oldflags, newflags;
++
++	switch (cmd) {
++	case JFFS2_IOC_GETFLAGS:
++		flags = j->flags & JFFS2_USER_VISIBLE;
++		return put_user(flags, (int __user *) arg);
++
++	case JFFS2_IOC_SETFLAGS:
++		if (IS_RDONLY(inode) ||
++			(filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
++			return -EROFS;
++
++		if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
++			return -EACCES;
++
++		if (get_user(flags, (int __user *) arg))
++			return -EFAULT;
++
++		oldflags = j->flags;
++		newflags = flags & JFFS2_USER_MODIFIABLE;
++		newflags |= oldflags & ~JFFS2_USER_MODIFIABLE;
++
++		/*
++		 * The IMMUTABLE flags can only be changed by
++		 * the relevant capability.
++		 */
++		if (((oldflags ^ newflags) &
++			(JFFS2_INO_FLAG_IMMUTABLE | JFFS2_INO_FLAG_IUNLINK)) ||
++			(oldflags & JFFS2_INO_FLAG_IMMUTABLE)) {
++			if (!capable(CAP_LINUX_IMMUTABLE))
++				return -EPERM;
++		}
++
++		if (oldflags ^ newflags) {
++			j->flags = newflags;
++			inode->i_ctime = CURRENT_TIME;
++			/* strange requirement, see jffs2_dirty_inode() */
++			inode->i_state |= I_DIRTY_DATASYNC;
++			mark_inode_dirty(inode);
++			jffs2_set_inode_flags(inode);
++		}
++		return 0;
++
++	default:
++		return -ENOTTY;
++	}
+ }
+ 
+Index: linux-2.6.20/fs/jffs2/jffs2_fs_sb.h
+===================================================================
+--- linux-2.6.20.orig/fs/jffs2/jffs2_fs_sb.h
++++ linux-2.6.20/fs/jffs2/jffs2_fs_sb.h
+@@ -30,6 +30,7 @@ struct jffs2_sb_info {
+ 	uint32_t checked_ino;
+ 
+ 	unsigned int flags;
++	unsigned int s_mount_opt;
+ 
+ 	struct task_struct *gc_task;	/* GC task struct */
+ 	struct completion gc_thread_start; /* GC thread start completion */
+Index: linux-2.6.20/fs/jffs2/nodelist.h
+===================================================================
+--- linux-2.6.20.orig/fs/jffs2/nodelist.h
++++ linux-2.6.20/fs/jffs2/nodelist.h
+@@ -46,19 +46,19 @@
+ #elif defined(JFFS2_BIG_ENDIAN)
+ #define cpu_to_je16(x) ((jint16_t){cpu_to_be16(x)})
+ #define cpu_to_je32(x) ((jint32_t){cpu_to_be32(x)})
+-#define cpu_to_jemode(x) ((jmode_t){cpu_to_be32(os_to_jffs2_mode(x))})
++#define cpu_to_jemode(x) ((jmode_t){cpu_to_be16(os_to_jffs2_mode(x))})
+ 
+ #define je16_to_cpu(x) (be16_to_cpu(x.v16))
+ #define je32_to_cpu(x) (be32_to_cpu(x.v32))
+-#define jemode_to_cpu(x) (be32_to_cpu(jffs2_to_os_mode((x).m)))
++#define jemode_to_cpu(x) (be16_to_cpu(jffs2_to_os_mode((x).m)))
+ #elif defined(JFFS2_LITTLE_ENDIAN)
+ #define cpu_to_je16(x) ((jint16_t){cpu_to_le16(x)})
+ #define cpu_to_je32(x) ((jint32_t){cpu_to_le32(x)})
+-#define cpu_to_jemode(x) ((jmode_t){cpu_to_le32(os_to_jffs2_mode(x))})
++#define cpu_to_jemode(x) ((jmode_t){cpu_to_le16(os_to_jffs2_mode(x))})
+ 
+ #define je16_to_cpu(x) (le16_to_cpu(x.v16))
+ #define je32_to_cpu(x) (le32_to_cpu(x.v32))
+-#define jemode_to_cpu(x) (le32_to_cpu(jffs2_to_os_mode((x).m)))
++#define jemode_to_cpu(x) (le16_to_cpu(jffs2_to_os_mode((x).m)))
+ #else
+ #error wibble
+ #endif
+Index: linux-2.6.20/fs/jffs2/os-linux.h
+===================================================================
+--- linux-2.6.20.orig/fs/jffs2/os-linux.h
++++ linux-2.6.20/fs/jffs2/os-linux.h
+@@ -31,6 +31,7 @@ struct kvec;
+ #define JFFS2_F_I_MODE(f) (OFNI_EDONI_2SFFJ(f)->i_mode)
+ #define JFFS2_F_I_UID(f) (OFNI_EDONI_2SFFJ(f)->i_uid)
+ #define JFFS2_F_I_GID(f) (OFNI_EDONI_2SFFJ(f)->i_gid)
++#define JFFS2_F_I_TAG(f) (OFNI_EDONI_2SFFJ(f)->i_tag)
+ #define JFFS2_F_I_RDEV(f) (OFNI_EDONI_2SFFJ(f)->i_rdev)
+ 
+ #define ITIME(sec) ((struct timespec){sec, 0})
+@@ -200,6 +201,9 @@ int jffs2_flash_direct_writev(struct jff
+ int jffs2_flash_direct_write(struct jffs2_sb_info *c, loff_t ofs, size_t len,
+ 			size_t *retlen, const u_char *buf);
+ 
++#define JFFS2_IOC_GETFLAGS		FS_IOC_GETFLAGS
++#define JFFS2_IOC_SETFLAGS		FS_IOC_SETFLAGS
++
+ #endif /* __JFFS2_OS_LINUX_H__ */
+ 
+ 
+Index: linux-2.6.20/fs/jffs2/readinode.c
+===================================================================
+--- linux-2.6.20.orig/fs/jffs2/readinode.c
++++ linux-2.6.20/fs/jffs2/readinode.c
+@@ -759,6 +759,8 @@ static int jffs2_do_read_inode_internal(
+ 		latest_node->isize = cpu_to_je32(0);
+ 		latest_node->gid = cpu_to_je16(0);
+ 		latest_node->uid = cpu_to_je16(0);
++		latest_node->tag = cpu_to_je16(0);
++		latest_node->flags = cpu_to_je16(0);
+ 		if (f->inocache->state == INO_STATE_READING)
+ 			jffs2_set_inocache_state(c, f->inocache, INO_STATE_PRESENT);
+ 		return 0;
+Index: linux-2.6.20/fs/jffs2/super.c
+===================================================================
+--- linux-2.6.20.orig/fs/jffs2/super.c
++++ linux-2.6.20/fs/jffs2/super.c
+@@ -24,6 +24,7 @@
+ #include <linux/mtd/mtd.h>
+ #include <linux/ctype.h>
+ #include <linux/namei.h>
++#include <linux/parser.h>
+ #include "compr.h"
+ #include "nodelist.h"
+ 
+@@ -111,6 +112,58 @@ static int jffs2_sb_set(struct super_blo
+ 	return 0;
+ }
+ 
++enum {
++	Opt_tag, Opt_notag, Opt_tagid, Opt_ignore, Opt_err
++};
++
++static match_table_t tokens = {
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
++	{Opt_tag, "tagxid"},
++	{Opt_err, NULL}
++};
++
++static int parse_options (char * options,
++			  struct jffs2_sb_info *sbi)
++{
++	char * p;
++	substring_t args[MAX_OPT_ARGS];
++
++	if (!options)
++		return 1;
++
++	while ((p = strsep (&options, ",")) != NULL) {
++		int token;
++		if (!*p)
++			continue;
++
++		token = match_token(p, tokens, args);
++		switch (token) {
++#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_ignore:
++			break;
++		default:
++			return 0;
++		}
++	}
++	return 1;
++}
++
++
+ static int jffs2_get_sb_mtd(struct file_system_type *fs_type,
+ 			    int flags, const char *dev_name,
+ 			    void *data, struct mtd_info *mtd,
+@@ -156,25 +209,32 @@ static int jffs2_get_sb_mtd(struct file_
+ #ifdef CONFIG_JFFS2_FS_POSIX_ACL
+ 	sb->s_flags |= MS_POSIXACL;
+ #endif
+-	ret = jffs2_do_fill_super(sb, data, flags & MS_SILENT ? 1 : 0);
++	ret = -EINVAL;
++	if (!parse_options ((char *) data, c))
++		goto failed_mount;
+ 
+-	if (ret) {
+-		/* Failure case... */
+-		up_write(&sb->s_umount);
+-		deactivate_super(sb);
+-		return ret;
+-	}
++	ret = jffs2_do_fill_super(sb, data, flags & MS_SILENT ? 1 : 0);
++	if (ret)
++		goto failed_mount;
+ 
++	if (c->s_mount_opt & JFFS2_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
+ 	sb->s_flags |= MS_ACTIVE;
+ 	return simple_set_mnt(mnt, sb);
+ 
+ out_error:
+ 	ret = PTR_ERR(sb);
+- out_put:
++out_put:
+ 	kfree(c);
+ 	put_mtd_device(mtd);
+ 
+ 	return ret;
++
++failed_mount:
++	/* Failure case... */
++	up_write(&sb->s_umount);
++	deactivate_super(sb);
++	return ret;
+ }
+ 
+ static int jffs2_get_sb_mtdnr(struct file_system_type *fs_type,
+Index: linux-2.6.20/fs/jffs2/write.c
+===================================================================
+--- linux-2.6.20.orig/fs/jffs2/write.c
++++ linux-2.6.20/fs/jffs2/write.c
+@@ -46,6 +46,7 @@ int jffs2_do_new_inode(struct jffs2_sb_i
+ 	ri->totlen = cpu_to_je32(PAD(sizeof(*ri)));
+ 	ri->hdr_crc = cpu_to_je32(crc32(0, ri, sizeof(struct jffs2_unknown_node)-4));
+ 	ri->mode = cpu_to_jemode(mode);
++	ri->flags = cpu_to_je16(0);
+ 
+ 	f->highest_version = 1;
+ 	ri->version = cpu_to_je32(f->highest_version);
+Index: linux-2.6.20/fs/jfs/acl.c
+===================================================================
+--- linux-2.6.20.orig/fs/jfs/acl.c
++++ linux-2.6.20/fs/jfs/acl.c
+@@ -232,7 +232,8 @@ int jfs_setattr(struct dentry *dentry, s
+ 		return rc;
+ 
+ 	if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
+-	    (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {
++	    (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid) ||
++	    (iattr->ia_valid & ATTR_TAG && iattr->ia_tag != inode->i_tag)) {
+ 		if (DQUOT_TRANSFER(inode, iattr))
+ 			return -EDQUOT;
+ 	}
+Index: linux-2.6.20/fs/jfs/file.c
+===================================================================
+--- linux-2.6.20.orig/fs/jfs/file.c
++++ linux-2.6.20/fs/jfs/file.c
+@@ -98,6 +98,7 @@ struct inode_operations jfs_file_inode_o
+ 	.setattr	= jfs_setattr,
+ 	.permission	= jfs_permission,
+ #endif
++	.sync_flags	= jfs_sync_flags,
+ };
+ 
+ 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,
+Index: linux-2.6.20/fs/jfs/inode.c
+===================================================================
+--- linux-2.6.20.orig/fs/jfs/inode.c
++++ linux-2.6.20/fs/jfs/inode.c
+@@ -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);
+ 	}
+ 
+ 	clear_inode(inode);
+Index: linux-2.6.20/fs/jfs/ioctl.c
+===================================================================
+--- linux-2.6.20.orig/fs/jfs/ioctl.c
++++ linux-2.6.20/fs/jfs/ioctl.c
+@@ -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>
+ 
+@@ -65,7 +66,8 @@ int jfs_ioctl(struct inode * inode, stru
+ 	case JFS_IOC_SETFLAGS: {
+ 		unsigned int oldflags;
+ 
+-		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;
+ 		}
+Index: linux-2.6.20/fs/jfs/jfs_dinode.h
+===================================================================
+--- linux-2.6.20.orig/fs/jfs/jfs_dinode.h
++++ linux-2.6.20/fs/jfs/jfs_dinode.h
+@@ -162,9 +162,12 @@ struct dinode {
+ #define JFS_APPEND_FL		0x01000000 /* writes to file may only append */
+ #define JFS_IMMUTABLE_FL	0x02000000 /* Immutable file */
+ 
+-#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
+ 
+ /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
+ #define JFS_IOC_GETFLAGS	_IOR('f', 1, long)
+Index: linux-2.6.20/fs/jfs/jfs_dtree.c
+===================================================================
+--- linux-2.6.20.orig/fs/jfs/jfs_dtree.c
++++ linux-2.6.20/fs/jfs/jfs_dtree.c
+@@ -102,6 +102,7 @@
+ 
+ #include <linux/fs.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_dlimit.h>
+ #include "jfs_incore.h"
+ #include "jfs_superblock.h"
+ #include "jfs_filsys.h"
+@@ -383,10 +384,10 @@ static u32 add_index(tid_t tid, struct i
+ 		 */
+ 		if (DQUOT_ALLOC_BLOCK(ip, sbi->nbperpage))
+ 			goto clean_up;
+-		if (dbAlloc(ip, 0, sbi->nbperpage, &xaddr)) {
+-			DQUOT_FREE_BLOCK(ip, sbi->nbperpage);
+-			goto clean_up;
+-		}
++		if (DLIMIT_ALLOC_BLOCK(ip, sbi->nbperpage))
++			goto clean_up_dquot;
++		if (dbAlloc(ip, 0, sbi->nbperpage, &xaddr))
++			goto clean_up_dlimit;
+ 
+ 		/*
+ 		 * Save the table, we're going to overwrite it with the
+@@ -479,6 +480,12 @@ static u32 add_index(tid_t tid, struct i
+ 
+ 	return index;
+ 
++      clean_up_dlimit:
++	DLIMIT_FREE_BLOCK(ip, sbi->nbperpage);
++
++      clean_up_dquot:
++	DQUOT_FREE_BLOCK(ip, sbi->nbperpage);
++
+       clean_up:
+ 
+ 	jfs_ip->next_index--;
+@@ -952,6 +959,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 +1044,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 +1323,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 +1393,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 +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;
++	}
+ 
+ 	BT_MARK_DIRTY(rmp, ip);
+ 	/*
+@@ -2292,6 +2321,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 +2399,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);
+ 
+Index: linux-2.6.20/fs/jfs/jfs_extent.c
+===================================================================
+--- linux-2.6.20.orig/fs/jfs/jfs_extent.c
++++ linux-2.6.20/fs/jfs/jfs_extent.c
+@@ -18,6 +18,7 @@
+ 
+ #include <linux/fs.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_dlimit.h>
+ #include "jfs_incore.h"
+ #include "jfs_inode.h"
+ #include "jfs_superblock.h"
+@@ -147,6 +148,14 @@ extAlloc(struct inode *ip, s64 xlen, s64
+ 		return -EDQUOT;
+ 	}
+ 
++	/* Allocate blocks to dlimit. */
++	if (DLIMIT_ALLOC_BLOCK(ip, nxlen)) {
++		DQUOT_FREE_BLOCK(ip, nxlen);
++		dbFree(ip, nxaddr, (s64) nxlen);
++		mutex_unlock(&JFS_IP(ip)->commit_mutex);
++		return -ENOSPC;
++	}
++
+ 	/* determine the value of the extent flag */
+ 	xflag = abnr ? XAD_NOTRECORDED : 0;
+ 
+@@ -164,6 +173,7 @@ extAlloc(struct inode *ip, s64 xlen, s64
+ 	 */
+ 	if (rc) {
+ 		dbFree(ip, nxaddr, nxlen);
++		DLIMIT_FREE_BLOCK(ip, nxlen);
+ 		DQUOT_FREE_BLOCK(ip, nxlen);
+ 		mutex_unlock(&JFS_IP(ip)->commit_mutex);
+ 		return (rc);
+@@ -261,6 +271,13 @@ int extRealloc(struct inode *ip, s64 nxl
+ 		mutex_unlock(&JFS_IP(ip)->commit_mutex);
+ 		return -EDQUOT;
+ 	}
++	/* Allocate blocks to dlimit. */
++	if (DLIMIT_ALLOC_BLOCK(ip, nxlen)) {
++		DQUOT_FREE_BLOCK(ip, nxlen);
++		dbFree(ip, nxaddr, (s64) nxlen);
++		up(&JFS_IP(ip)->commit_sem);
++		return -ENOSPC;
++	}
+ 
+ 	delta = nxlen - xlen;
+ 
+@@ -297,6 +314,7 @@ int extRealloc(struct inode *ip, s64 nxl
+ 		/* extend the extent */
+ 		if ((rc = xtExtend(0, ip, xoff + xlen, (int) nextend, 0))) {
+ 			dbFree(ip, xaddr + xlen, delta);
++			DLIMIT_FREE_BLOCK(ip, nxlen);
+ 			DQUOT_FREE_BLOCK(ip, nxlen);
+ 			goto exit;
+ 		}
+@@ -308,6 +326,7 @@ int extRealloc(struct inode *ip, s64 nxl
+ 		 */
+ 		if ((rc = xtTailgate(0, ip, xoff, (int) ntail, nxaddr, 0))) {
+ 			dbFree(ip, nxaddr, nxlen);
++			DLIMIT_FREE_BLOCK(ip, nxlen);
+ 			DQUOT_FREE_BLOCK(ip, nxlen);
+ 			goto exit;
+ 		}
+Index: linux-2.6.20/fs/jfs/jfs_filsys.h
+===================================================================
+--- linux-2.6.20.orig/fs/jfs/jfs_filsys.h
++++ linux-2.6.20/fs/jfs/jfs_filsys.h
+@@ -264,6 +264,7 @@
+ #define JFS_NAME_MAX	255
+ #define JFS_PATH_MAX	BPSIZE
+ 
++#define JFS_TAGGED		0x00800000	/* Context Tagging */
+ 
+ /*
+  *	file system state (superblock state)
+Index: linux-2.6.20/fs/jfs/jfs_imap.c
+===================================================================
+--- linux-2.6.20.orig/fs/jfs/jfs_imap.c
++++ linux-2.6.20/fs/jfs/jfs_imap.c
+@@ -45,6 +45,7 @@
+ #include <linux/buffer_head.h>
+ #include <linux/pagemap.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.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);
+ 
+-	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);
++
++	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;
+ 	}
+ 
+-	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
+Index: linux-2.6.20/fs/jfs/jfs_inode.c
+===================================================================
+--- linux-2.6.20.orig/fs/jfs/jfs_inode.c
++++ linux-2.6.20/fs/jfs/jfs_inode.c
+@@ -18,6 +18,8 @@
+ 
+ #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
+ {
+ 	unsigned int flags = JFS_IP(inode)->mode2;
+ 
+-	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);
+ 
+ 	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;
+ }
+ 
+ /*
+@@ -90,10 +120,17 @@ struct inode *ialloc(struct inode *paren
+ 	jfs_inode->saved_uid = inode->i_uid;
+ 	jfs_inode->saved_gid = inode->i_gid;
+ 
++	inode->i_tag = dx_current_fstag(sb);
++	if (DLIMIT_ALLOC_INODE(inode)) {
++		iput(inode);
++		return NULL;
++	}
++
+ 	/*
+ 	 * 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;
+Index: linux-2.6.20/fs/jfs/jfs_inode.h
+===================================================================
+--- linux-2.6.20.orig/fs/jfs/jfs_inode.h
++++ linux-2.6.20/fs/jfs/jfs_inode.h
+@@ -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);
+ 
+Index: linux-2.6.20/fs/jfs/jfs_xtree.c
+===================================================================
+--- linux-2.6.20.orig/fs/jfs/jfs_xtree.c
++++ linux-2.6.20/fs/jfs/jfs_xtree.c
+@@ -21,6 +21,7 @@
+ 
+ #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;
+ 
+ 	smp = split->mp;
+ 	sp = XT_PAGE(ip, smp);
+@@ -1250,6 +1258,13 @@ xtSplitPage(tid_t tid, struct inode *ip,
+ 
+ 	quota_allocation += lengthPXD(pxd);
+ 
++	/* Allocate blocks to dlimit. */
++	if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) {
++	       rc = -ENOSPC;
++	       goto clean_up;
++	}
++	dlimit_allocation += lengthPXD(pxd);
++
+ 	/*
+ 	 * allocate the new right page for the split
+ 	 */
+@@ -1451,6 +1466,9 @@ xtSplitPage(tid_t tid, struct inode *ip,
+ 
+       clean_up:
+ 
++	/* Rollback dlimit allocation. */
++	if (dlimit_allocation)
++		DLIMIT_FREE_BLOCK(ip, dlimit_allocation);
+ 	/* Rollback quota allocation. */
+ 	if (quota_allocation)
+ 		DQUOT_FREE_BLOCK(ip, quota_allocation);
+@@ -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
+ 		ip->i_size = newsize;
+ 
++	/* update dlimit allocation to reflect freed blocks */
++	DLIMIT_FREE_BLOCK(ip, nfreed);
+ 	/* update quota allocation to reflect freed blocks */
+ 	DQUOT_FREE_BLOCK(ip, nfreed);
+ 
+Index: linux-2.6.20/fs/jfs/namei.c
+===================================================================
+--- linux-2.6.20.orig/fs/jfs/namei.c
++++ linux-2.6.20/fs/jfs/namei.c
+@@ -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);
+ 	}
+ 
++	dx_propagate_tag(nd, ip);
+ 	dentry = d_splice_alias(ip, dentry);
+ 
+ 	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,
+ };
+ 
+ const struct file_operations jfs_dir_operations = {
+Index: linux-2.6.20/fs/jfs/super.c
+===================================================================
+--- linux-2.6.20.orig/fs/jfs/super.c
++++ linux-2.6.20/fs/jfs/super.c
+@@ -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
+ };
+ 
+ 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;
+ 	}
++
++	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;
+ 
+ 	if (newLVSize) {
+ 		printk(KERN_ERR "resize option for remount only\n");
+@@ -615,10 +644,11 @@ static int jfs_show_options(struct seq_f
+  * acquiring the locks... As quota files are never truncated and quota code
+  * itself serializes the operations (and noone else should touch the files)
+  * we don't have to be afraid of races */
+-static ssize_t jfs_quota_read(struct super_block *sb, int type, char *data,
++static ssize_t jfs_quota_read(struct dqhash *hash, int type, char *data,
+ 			      size_t len, loff_t off)
+ {
+-	struct inode *inode = sb_dqopt(sb)->files[type];
++	struct inode *inode = dqh_dqopt(hash)->files[type];
++	struct super_block *sb = hash->dqh_sb;
+ 	sector_t blk = off >> sb->s_blocksize_bits;
+ 	int err = 0;
+ 	int offset = off & (sb->s_blocksize - 1);
+@@ -660,10 +690,11 @@ static ssize_t jfs_quota_read(struct sup
+ }
+ 
+ /* Write to quotafile */
+-static ssize_t jfs_quota_write(struct super_block *sb, int type,
++static ssize_t jfs_quota_write(struct dqhash *hash, int type,
+ 			       const char *data, size_t len, loff_t off)
+ {
+-	struct inode *inode = sb_dqopt(sb)->files[type];
++	struct inode *inode = dqh_dqopt(hash)->files[type];
++	struct super_block *sb = hash->dqh_sb;
+ 	sector_t blk = off >> sb->s_blocksize_bits;
+ 	int err = 0;
+ 	int offset = off & (sb->s_blocksize - 1);
+Index: linux-2.6.20/fs/jfs/xattr.c
+===================================================================
+--- linux-2.6.20.orig/fs/jfs/xattr.c
++++ linux-2.6.20/fs/jfs/xattr.c
+@@ -23,6 +23,7 @@
+ #include <linux/posix_acl_xattr.h>
+ #include <linux/quotaops.h>
+ #include <linux/security.h>
++#include <linux/vs_dlimit.h>
+ #include "jfs_incore.h"
+ #include "jfs_superblock.h"
+ #include "jfs_dmap.h"
+@@ -263,9 +264,16 @@ static int ea_write(struct inode *ip, st
+ 	if (DQUOT_ALLOC_BLOCK(ip, nblocks)) {
+ 		return -EDQUOT;
+ 	}
++	/* Allocate new blocks to dlimit. */
++	if (DLIMIT_ALLOC_BLOCK(ip, nblocks)) {
++		DQUOT_FREE_BLOCK(ip, nblocks);
++		return -ENOSPC;
++	}
+ 
+ 	rc = dbAlloc(ip, INOHINT(ip), nblocks, &blkno);
+ 	if (rc) {
++		/*Rollback dlimit allocation. */
++		DLIMIT_FREE_BLOCK(ip, nblocks);
+ 		/*Rollback quota allocation. */
+ 		DQUOT_FREE_BLOCK(ip, nblocks);
+ 		return rc;
+@@ -332,6 +340,8 @@ static int ea_write(struct inode *ip, st
+ 
+       failed:
+ 	/* Rollback quota allocation. */
++	DLIMIT_FREE_BLOCK(ip, nblocks);
++	/* Rollback quota allocation. */
+ 	DQUOT_FREE_BLOCK(ip, nblocks);
+ 
+ 	dbFree(ip, blkno, nblocks);
+@@ -468,6 +478,7 @@ static int ea_get(struct inode *inode, s
+ 	s64 blkno;
+ 	int rc;
+ 	int quota_allocation = 0;
++	int dlimit_allocation = 0;
+ 
+ 	/* When fsck.jfs clears a bad ea, it doesn't clear the size */
+ 	if (ji->ea.flag == 0)
+@@ -543,6 +554,12 @@ static int ea_get(struct inode *inode, s
+ 
+ 		quota_allocation = blocks_needed;
+ 
++		/* Allocate new blocks to dlimit. */
++		rc = -ENOSPC;
++		if (DLIMIT_ALLOC_BLOCK(inode, blocks_needed))
++			goto clean_up;
++		dlimit_allocation = blocks_needed;
++
+ 		rc = dbAlloc(inode, INOHINT(inode), (s64) blocks_needed,
+ 			     &blkno);
+ 		if (rc)
+@@ -599,6 +616,9 @@ static int ea_get(struct inode *inode, s
+ 	return ea_size;
+ 
+       clean_up:
++	/* Rollback dlimit allocation */
++	if (dlimit_allocation)
++		DLIMIT_FREE_BLOCK(inode, dlimit_allocation);
+ 	/* Rollback quota allocation */
+ 	if (quota_allocation)
+ 		DQUOT_FREE_BLOCK(inode, quota_allocation);
+@@ -675,8 +695,10 @@ static int ea_put(tid_t tid, struct inod
+ 	}
+ 
+ 	/* If old blocks exist, they must be removed from quota allocation. */
+-	if (old_blocks)
++	if (old_blocks) {
++		DLIMIT_FREE_BLOCK(inode, old_blocks);
+ 		DQUOT_FREE_BLOCK(inode, old_blocks);
++	}
+ 
+ 	inode->i_ctime = CURRENT_TIME;
+ 
+Index: linux-2.6.20/fs/libfs.c
+===================================================================
+--- linux-2.6.20.orig/fs/libfs.c
++++ linux-2.6.20/fs/libfs.c
+@@ -124,7 +124,8 @@ static inline unsigned char dt_type(stru
+  * both impossible due to the lock on directory.
+  */
+ 
+-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;
+ }
+ 
++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);
+Index: linux-2.6.20/fs/locks.c
+===================================================================
+--- linux-2.6.20.orig/fs/locks.c
++++ linux-2.6.20/fs/locks.c
+@@ -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>
+ 
+ #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);
+ }
+ 
+@@ -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));
+ 
++	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;
+ }
+ 
+ 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;
+ 
+ 	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,
+ 
+ 	fl->fl_owner = current->files;
+ 	fl->fl_pid = current->tgid;
++	fl->fl_xid = vx_current_xid();
+ 
+ 	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;
+ 
++	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);
+@@ -773,6 +791,7 @@ static int flock_lock_file(struct file *
+ 	if (found)
+ 		cond_resched();
+ 
++	new_fl->fl_xid = -1;
+ find_conflict:
+ 	for_each_lock(inode, before) {
+ 		struct file_lock *fl = *before;
+@@ -791,6 +810,7 @@ find_conflict:
+ 		goto out;
+ 	locks_copy_lock(new_fl, request);
+ 	locks_insert_lock(&inode->i_flock, new_fl);
++	vx_locks_inc(new_fl);
+ 	new_fl = NULL;
+ 	error = 0;
+ 
+@@ -801,7 +821,8 @@ out:
+ 	return error;
+ }
+ 
+-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 file_lock *fl;
+ 	struct file_lock *new_fl = NULL;
+@@ -811,6 +832,8 @@ static int __posix_lock_file_conf(struct
+ 	struct file_lock **before;
+ 	int error, added = 0;
+ 
++	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 +844,11 @@ static int __posix_lock_file_conf(struct
+ 	    (request->fl_type != F_UNLCK ||
+ 	     request->fl_start != 0 || request->fl_end != OFFSET_MAX)) {
+ 		new_fl = locks_alloc_lock();
++		new_fl->fl_xid = xid;
++		vx_locks_inc(new_fl);
+ 		new_fl2 = locks_alloc_lock();
++		new_fl2->fl_xid = xid;
++		vx_locks_inc(new_fl2);
+ 	}
+ 
+ 	lock_kernel();
+@@ -1018,7 +1045,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);
+ 
+@@ -1033,7 +1061,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);
+ 
+@@ -1123,7 +1152,7 @@ int locks_mandatory_area(int read_write,
+ 	fl.fl_end = offset + count - 1;
+ 
+ 	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))
+@@ -1427,8 +1456,8 @@ static int __setlease(struct file *filp,
+ 		goto out;
+ 
+ 	locks_copy_lock(fl, lease);
+-
+ 	locks_insert_lock(before, fl);
++	vx_locks_inc(fl);
+ 
+ 	*flp = fl;
+ 	error = 0;
+@@ -1685,6 +1714,11 @@ int fcntl_setlk(unsigned int fd, struct 
+ 	if (file_lock == NULL)
+ 		return -ENOLCK;
+ 
++	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 +1862,11 @@ int fcntl_setlk64(unsigned int fd, struc
+ 	if (file_lock == NULL)
+ 		return -ENOLCK;
+ 
++	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.
+ 	 */
+@@ -2123,6 +2162,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, VS_WATCH_P|VS_IDENT))
++			continue;
++
+ 		lock_get_status(q, fl, ++i, "");
+ 		move_lock_status(&q, &pos, offset);
+ 
+Index: linux-2.6.20/fs/namei.c
+===================================================================
+--- linux-2.6.20.orig/fs/namei.c
++++ linux-2.6.20/fs/namei.c
+@@ -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>
+ 
+@@ -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;
++}
++
++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;
++
++	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;
+ 
+ 		/*
+ 		 * Nobody gets write access to an immutable file.
+ 		 */
+-		if (IS_IMMUTABLE(inode))
++		if (IS_IMMUTABLE(inode) && !IS_COW(inode))
+ 			return -EACCES;
+ 	}
+ 
+@@ -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
+ {
+ 	umode_t	mode = inode->i_mode;
+ 
++	if (dx_barrier(inode))
++		return -EACCES;
+ 	if (inode->i_op && inode->i_op->permission)
+ 		return -EAGAIN;
+ 
+@@ -733,7 +767,8 @@ static __always_inline void follow_dotdo
+ 		if (nd->dentry == fs->root &&
+ 		    nd->mnt == fs->rootmnt) {
+                         read_unlock(&fs->lock);
+-			break;
++			/* 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);
++
++		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;
+ 
+ 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);
++	}
++#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;
+ 		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)
+ {
+-	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);
+ }
+ 
+-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);
+ 
+ 	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);
+ }
+ 
+-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);
+ 
+ 	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);
+ 	}
+@@ -2181,9 +2270,10 @@ asmlinkage long sys_unlink(const char __
+ 	return do_unlinkat(AT_FDCWD, pathname);
+ }
+ 
+-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);
+ 
+ 	if (error)
+ 		return error;
+@@ -2227,7 +2317,7 @@ asmlinkage long sys_symlinkat(const char
+ 	if (IS_ERR(dentry))
+ 		goto out_unlock;
+ 
+-	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);
+ }
+ 
+-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;
+ 
+-	error = may_create(dir, new_dentry, NULL);
++	error = may_create(dir, new_dentry, nd);
+ 	if (error)
+ 		return error;
+ 
+@@ -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;
+ 
+ 	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,129 @@ int vfs_follow_link(struct nameidata *nd
+ 	return __vfs_follow_link(nd, link);
+ }
+ 
++
++#ifdef	CONFIG_VSERVER_COWBL
++
++#include <linux/file.h>
++
++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;
++	}
++	else if (ret < 0) {
++		res = ERR_PTR(ret);
++		goto out_rel_both;
++	}
++
++	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);
++	}
++
++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)
+ {
+Index: linux-2.6.20/fs/namespace.c
+===================================================================
+--- linux-2.6.20.orig/fs/namespace.c
++++ linux-2.6.20/fs/namespace.c
+@@ -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;
+ 
+ 		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\\");
+ }
+ 
++static int mnt_is_reachable(struct vfsmount *mnt)
++{
++	struct vfsmount *root_mnt;
++	struct dentry *root, *point;
++	int ret;
++
++	if (mnt == mnt->mnt_ns->root)
++		return 1;
++
++	spin_lock(&vfsmount_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(&vfsmount_lock);
++
++	return ret;
++}
++
+ 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, ' ');
++	if (vx_flags(VXF_HIDE_MOUNT, 0))
++		return 0;
++	if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
++		return 0;
++
++	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, ' ');
++	}
+ 	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);
+-	}
+-	for (fs_infop = mnt_info; fs_infop->flag; fs_infop++) {
+-		if (mnt->mnt_flags & fs_infop->flag)
+-			seq_puts(m, fs_infop->str);
++	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);
++		}
+ 	}
++	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;
+ 
+-	/* 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, ' ');
++	if (vx_flags(VXF_HIDE_MOUNT, 0))
++		return 0;
++	if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
++		return 0;
++
++	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, ' ');
++	}
+ 
+ 	/* file system type */
+ 	seq_puts(m, "with fstype ");
+@@ -596,7 +654,7 @@ static int do_umount(struct vfsmount *mn
+ 		down_write(&sb->s_umount);
+ 		if (!(sb->s_flags & MS_RDONLY)) {
+ 			lock_kernel();
+-			DQUOT_OFF(sb);
++			DQUOT_OFF(sb->s_dqh);
+ 			retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
+ 			unlock_kernel();
+ 		}
+@@ -645,7 +703,7 @@ asmlinkage long sys_umount(char __user *
+ 		goto dput_and_out;
+ 
+ 	retval = -EPERM;
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ 		goto dput_and_out;
+ 
+ 	retval = do_umount(nd.mnt, flags);
+@@ -669,7 +727,7 @@ asmlinkage long sys_oldumount(char __use
+ 
+ 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;
+ 
++	mnt->mnt_flags = mnt_flags;
++	if (flags & MS_TAGID) {
++		mnt->mnt_tag = tag;
++		mnt->mnt_flags |= MNT_TAGID;
++	}
++
+ 	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;
+ 
+ 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)
+ {
+ 	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))
+@@ -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;
+ 
+ 	/* we need capabilities... */
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ 		return -EPERM;
+ 
+ 	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;
+ 
+ 	/* 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;
++	}
++#endif
++
+ 	/* 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;
+ 
++	if (!capable(CAP_SYS_ADMIN))
++		mnt_flags |= MNT_NODEV;
+ 	flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE |
+ 		   MS_NOATIME | MS_NODIRATIME | MS_RELATIME);
+ 
+@@ -1423,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, 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);
+ 
+ 	if (rootmnt)
+ 		mntput(rootmnt);
+@@ -1524,7 +1607,7 @@ int copy_mnt_ns(int flags, struct task_s
+ 	if (!(flags & CLONE_NEWNS))
+ 		return 0;
+ 
+-	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);
+ }
+Index: linux-2.6.20/fs/nfs/client.c
+===================================================================
+--- linux-2.6.20.orig/fs/nfs/client.c
++++ linux-2.6.20/fs/nfs/client.c
+@@ -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;
+ }
+ 
+@@ -676,6 +679,10 @@ static void nfs_server_set_fsinfo(struct
+ 		server->acdirmin = server->acdirmax = 0;
+ 	}
+ 
++	/* FIXME: needs fsinfo
++	if (server->flags & NFS_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;	*/
++
+ 	server->maxfilesize = fsinfo->maxfilesize;
+ 
+ 	/* We're airborne Set socket buffersize */
+Index: linux-2.6.20/fs/nfs/dir.c
+===================================================================
+--- linux-2.6.20.orig/fs/nfs/dir.c
++++ linux-2.6.20/fs/nfs/dir.c
+@@ -33,6 +33,7 @@
+ #include <linux/pagevec.h>
+ #include <linux/namei.h>
+ #include <linux/mount.h>
++#include <linux/vs_tag.h>
+ 
+ #include "nfs4_fs.h"
+ #include "delegation.h"
+@@ -933,6 +934,7 @@ static struct dentry *nfs_lookup(struct 
+ 	if (IS_ERR(res))
+ 		goto out_unlock;
+ 
++	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;
+ }
+Index: linux-2.6.20/fs/nfs/inode.c
+===================================================================
+--- linux-2.6.20.orig/fs/nfs/inode.c
++++ linux-2.6.20/fs/nfs/inode.c
+@@ -37,6 +37,7 @@
+ #include <linux/vfs.h>
+ #include <linux/inet.h>
+ #include <linux/nfs_xdr.h>
++#include <linux/vs_tag.h>
+ 
+ #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;
+ 
+ 
+ 	/* 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;
+ 
++	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;
+ 
+ 	/* 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;
+ 
+ 	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));
+ 
++	uid = INOTAG_UID(DX_TAG(inode), fattr->uid, fattr->gid);
++	gid = INOTAG_GID(DX_TAG(inode), fattr->uid, fattr->gid);
++	tag = INOTAG_TAG(DX_TAG(inode), fattr->uid, fattr->gid, 0);
++
+ 	if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO) ||
+-	    inode->i_uid != fattr->uid ||
+-	    inode->i_gid != fattr->gid)
++	    inode->i_uid != uid ||
++	    inode->i_gid != gid ||
++	    inode->i_tag != tag)
+ 		invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
+ 
+ 	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;
+ 
+ 	if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
+ 		/*
+Index: linux-2.6.20/fs/nfs/nfs3xdr.c
+===================================================================
+--- linux-2.6.20.orig/fs/nfs/nfs3xdr.c
++++ linux-2.6.20/fs/nfs/nfs3xdr.c
+@@ -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
+ }
+ 
+ static inline __be32 *
+-xdr_encode_sattr(__be32 *p, struct iattr *attr)
++xdr_encode_sattr(__be32 *p, struct iattr *attr, int tag)
+ {
+ 	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);
+ 
+ 	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_tag);
+ 	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_tag);
+ 	*p++ = htonl(args->pathlen);
+ 	req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
+ 
+@@ -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));
+Index: linux-2.6.20/fs/nfs/nfsroot.c
+===================================================================
+--- linux-2.6.20.orig/fs/nfs/nfsroot.c
++++ linux-2.6.20/fs/nfs/nfsroot.c
+@@ -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);
+Index: linux-2.6.20/fs/nfs/super.c
+===================================================================
+--- linux-2.6.20.orig/fs/nfs/super.c
++++ linux-2.6.20/fs/nfs/super.c
+@@ -44,6 +44,7 @@
+ #include <linux/vfs.h>
+ #include <linux/inet.h>
+ #include <linux/nfs_xdr.h>
++#include <linux/vs_tag.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;
+Index: linux-2.6.20/fs/nfsd/auth.c
+===================================================================
+--- linux-2.6.20.orig/fs/nfsd/auth.c
++++ linux-2.6.20/fs/nfsd/auth.c
+@@ -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))
+ 
+@@ -41,19 +42,22 @@ int nfsd_setuser(struct svc_rqst *rqstp,
+ 		get_group_info(cred.cr_group_info);
+ 
+ 	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;
+ 
++	/* this desperately needs a tag :) */
++	current->xid = (xid_t)INOTAG_TAG(DX_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 (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 &
+Index: linux-2.6.20/fs/nfsd/nfs3xdr.c
+===================================================================
+--- linux-2.6.20.orig/fs/nfsd/nfs3xdr.c
++++ linux-2.6.20/fs/nfsd/nfs3xdr.c
+@@ -21,6 +21,7 @@
+ #include <linux/sunrpc/svc.h>
+ #include <linux/nfsd/nfsd.h>
+ #include <linux/nfsd/xdr3.h>
++#include <linux/vs_tag.h>
+ 
+ #define NFSDDBG_FACILITY		NFSDDBG_XDR
+ 
+@@ -107,6 +108,8 @@ static __be32 *
+ decode_sattr3(__be32 *p, struct iattr *iap)
+ {
+ 	u32	tmp;
++	uid_t	uid = 0;
++	gid_t	gid = 0;
+ 
+ 	iap->ia_valid = 0;
+ 
+@@ -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++);
+ 	}
+ 	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;
+ 
+@@ -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 {
+Index: linux-2.6.20/fs/nfsd/nfs4recover.c
+===================================================================
+--- linux-2.6.20.orig/fs/nfsd/nfs4recover.c
++++ linux-2.6.20/fs/nfsd/nfs4recover.c
+@@ -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;
+ }
+@@ -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;
+ }
+Index: linux-2.6.20/fs/nfsd/nfs4xdr.c
+===================================================================
+--- linux-2.6.20.orig/fs/nfsd/nfs4xdr.c
++++ linux-2.6.20/fs/nfsd/nfs4xdr.c
+@@ -57,6 +57,7 @@
+ #include <linux/nfsd_idmap.h>
+ #include <linux/nfs4.h>
+ #include <linux/nfs4_acl.h>
++#include <linux/vs_tag.h>
+ 
+ #define NFSDDBG_FACILITY		NFSDDBG_XDR
+ 
+@@ -1727,14 +1728,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,
++			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)
+Index: linux-2.6.20/fs/nfsd/nfsxdr.c
+===================================================================
+--- linux-2.6.20.orig/fs/nfsd/nfsxdr.c
++++ linux-2.6.20/fs/nfsd/nfsxdr.c
+@@ -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);
+Index: linux-2.6.20/fs/nfsd/vfs.c
+===================================================================
+--- linux-2.6.20.orig/fs/nfsd/vfs.c
++++ linux-2.6.20/fs/nfsd/vfs.c
+@@ -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;
+Index: linux-2.6.20/fs/ocfs2/dlm/dlmfs.c
+===================================================================
+--- linux-2.6.20.orig/fs/ocfs2/dlm/dlmfs.c
++++ linux-2.6.20/fs/ocfs2/dlm/dlmfs.c
+@@ -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;
+Index: linux-2.6.20/fs/ocfs2/dlmglue.c
+===================================================================
+--- linux-2.6.20.orig/fs/ocfs2/dlmglue.c
++++ linux-2.6.20/fs/ocfs2/dlmglue.c
+@@ -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,
+Index: linux-2.6.20/fs/ocfs2/dlmglue.h
+===================================================================
+--- linux-2.6.20.orig/fs/ocfs2/dlmglue.h
++++ linux-2.6.20/fs/ocfs2/dlmglue.h
+@@ -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;
+Index: linux-2.6.20/fs/ocfs2/file.c
+===================================================================
+--- linux-2.6.20.orig/fs/ocfs2/file.c
++++ linux-2.6.20/fs/ocfs2/file.c
+@@ -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,
+ };
+ 
+Index: linux-2.6.20/fs/ocfs2/inode.c
+===================================================================
+--- linux-2.6.20.orig/fs/ocfs2/inode.c
++++ linux-2.6.20/fs/ocfs2/inode.c
+@@ -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;
+ }
+ 
++int ocfs2_sync_flags(struct inode *inode)
++{
++	unsigned int oldflags, newflags;
++
++	oldflags = OCFS2_I(inode)->ip_flags;
++	newflags = oldflags & ~(OCFS2_IMMUTABLE_FL |
++		OCFS2_IUNLINK_FL | OCFS2_BARRIER_FL);
++
++	if (IS_IMMUTABLE(inode))
++		newflags |= OCFS2_IMMUTABLE_FL;
++	if (IS_IUNLINK(inode))
++		newflags |= OCFS2_IUNLINK_FL;
++	if (IS_BARRIER(inode))
++		newflags |= OCFS2_BARRIER_FL;
++
++	if (oldflags ^ newflags)
++		return ocfs2_set_inode_attr(inode,
++			newflags, OCFS2_FL_MASK);
++	return 0;
++}
++
+ 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;
+ 
+ 	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);
+ 
+ 	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;
+Index: linux-2.6.20/fs/ocfs2/inode.h
+===================================================================
+--- linux-2.6.20.orig/fs/ocfs2/inode.h
++++ linux-2.6.20/fs/ocfs2/inode.h
+@@ -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 */
+Index: linux-2.6.20/fs/ocfs2/ioctl.c
+===================================================================
+--- linux-2.6.20.orig/fs/ocfs2/ioctl.c
++++ linux-2.6.20/fs/ocfs2/ioctl.c
+@@ -38,7 +38,7 @@ static int ocfs2_get_inode_attr(struct i
+ 	return status;
+ }
+ 
+-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);
+Index: linux-2.6.20/fs/ocfs2/ioctl.h
+===================================================================
+--- linux-2.6.20.orig/fs/ocfs2/ioctl.h
++++ linux-2.6.20/fs/ocfs2/ioctl.h
+@@ -10,6 +10,9 @@
+ #ifndef OCFS2_IOCTL_H
+ #define OCFS2_IOCTL_H
+ 
++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);
+ 
+Index: linux-2.6.20/fs/ocfs2/namei.c
+===================================================================
+--- linux-2.6.20.orig/fs/ocfs2/namei.c
++++ linux-2.6.20/fs/ocfs2/namei.c
+@@ -40,6 +40,7 @@
+ #include <linux/types.h>
+ #include <linux/slab.h>
+ #include <linux/highmem.h>
++#include <linux/vs_tag.h>
+ 
+ #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;
+ 
+ 	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,
+ };
+Index: linux-2.6.20/fs/ocfs2/ocfs2.h
+===================================================================
+--- linux-2.6.20.orig/fs/ocfs2/ocfs2.h
++++ linux-2.6.20/fs/ocfs2/ocfs2.h
+@@ -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 */
+ };
+ 
+ #define OCFS2_OSB_SOFT_RO	0x0001
+Index: linux-2.6.20/fs/ocfs2/ocfs2_fs.h
+===================================================================
+--- linux-2.6.20.orig/fs/ocfs2/ocfs2_fs.h
++++ linux-2.6.20/fs/ocfs2/ocfs2_fs.h
+@@ -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)
+ 
+ /*
+  * ioctl commands
+Index: linux-2.6.20/fs/ocfs2/super.c
+===================================================================
+--- linux-2.6.20.orig/fs/ocfs2/super.c
++++ linux-2.6.20/fs/ocfs2/super.c
+@@ -140,6 +140,7 @@ enum {
+ 	Opt_data_ordered,
+ 	Opt_data_writeback,
+ 	Opt_atime_quantum,
++	Opt_tag, Opt_notag, Opt_tagid,
+ 	Opt_err,
+ };
+ 
+@@ -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}
+ };
+ 
+@@ -362,6 +367,14 @@ static int ocfs2_remount(struct super_bl
+ 		goto out;
+ 	}
+ 
++	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
+ 
+ 	ocfs2_complete_mount_recovery(osb);
+ 
++	if (osb->s_mount_opt & OCFS2_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
++
+ 	if (ocfs2_mount_local(osb))
+ 		snprintf(nodestr, sizeof(nodestr), "local");
+ 	else
+@@ -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\" "
+Index: linux-2.6.20/fs/open.c
+===================================================================
+--- linux-2.6.20.orig/fs/open.c
++++ linux-2.6.20/fs/open.c
+@@ -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>
+ 
+ int vfs_statfs(struct dentry *dentry, struct kstatfs *buf)
+ {
+ 	int retval = -ENODEV;
+ 
+ 	if (dentry) {
++		struct super_block *sb = dentry->d_sb;
++
+ 		retval = -ENOSYS;
+-		if (dentry->d_sb->s_op->statfs) {
++		if (sb->s_op->statfs) {
+ 			memset(buf, 0, sizeof(*buf));
+ 			retval = security_sb_statfs(dentry);
+ 			if (retval)
+ 				return retval;
+-			retval = dentry->d_sb->s_op->statfs(dentry, buf);
++			retval = sb->s_op->statfs(dentry, buf);
+ 			if (retval == 0 && buf->f_frsize == 0)
+ 				buf->f_frsize = buf->f_bsize;
+ 		}
++		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;
+ 
+ 	error = -EROFS;
+-	if (IS_RDONLY(inode))
++	if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt))
+ 		goto dput_and_out;
+ 
+ 	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;
+ 
+ out_path_release:
+@@ -509,7 +518,7 @@ asmlinkage long sys_fchmod(unsigned int 
+ 	audit_inode(NULL, inode);
+ 
+ 	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;
+ 
+-	error = -EROFS;
+-	if (IS_RDONLY(inode))
++	error = cow_check_and_break(&nd);
++	if (error)
+ 		goto dput_and_out;
++	inode = nd.dentry->d_inode;
+ 
+ 	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);
+ }
+ 
+-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 
+ 
+ 	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);
+ }
+ 
+ void fastcall put_unused_fd(unsigned int fd)
+Index: linux-2.6.20/fs/proc/array.c
+===================================================================
+--- linux-2.6.20.orig/fs/proc/array.c
++++ linux-2.6.20/fs/proc/array.c
+@@ -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>
+ 
+ #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 */
+ };
+ 
+ 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;
+ 
+ 	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);
++
+ 	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);
+ 
+@@ -283,12 +293,15 @@ static inline char * task_sig(struct tas
+ 
+ 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));
+ }
+ 
+ int proc_pid_status(struct task_struct *task, char * buffer)
+@@ -306,6 +319,12 @@ 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;
++	buffer += sprintf (buffer,"VxID: %d\n", vx_task_xid(task));
++	buffer += sprintf (buffer,"NxID: %d\n", nx_task_nid(task));
++skip:
+ #if defined(CONFIG_S390)
+ 	buffer = task_show_regs(task, buffer);
+ #endif
+@@ -320,7 +339,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 +401,10 @@ static int do_task_stat(struct task_stru
+ 		}
+ 
+ 		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;
+ 
+ 		unlock_task_sighand(task, &flags);
+ 	}
+@@ -410,10 +431,21 @@ static int do_task_stat(struct task_stru
+ 	/* convert nsec -> ticks */
+ 	start_time = nsec_to_clock_t(start_time);
+ 
++	/* 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;
++	}
++
+ 	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,
+Index: linux-2.6.20/fs/proc/base.c
+===================================================================
+--- linux-2.6.20.orig/fs/proc/base.c
++++ linux-2.6.20/fs/proc/base.c
+@@ -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"
+ 
+ /* 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);
+ 
+ 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,12 @@ 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;
++	if (!ret)
++		d_drop(dentry);
++	return ret;
+ }
+ 
+ static int pid_delete_dentry(struct dentry * dentry)
+@@ -1467,6 +1479,13 @@ static struct dentry *proc_pident_lookup
+ 	if (!task)
+ 		goto out_no_task;
+ 
++	/* TODO: 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 +1690,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);
+ }
+ 
+ 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));
+ }
+ 
+@@ -1772,7 +1791,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 +1852,9 @@ static int proc_pid_io_accounting(struct
+ static struct file_operations proc_task_operations;
+ static struct inode_operations proc_task_inode_operations;
+ 
++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 +1892,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 +2042,7 @@ struct dentry *proc_pid_lookup(struct in
+ 		goto out;
+ 
+ 	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 +2106,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 +2125,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 +2252,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;
+ 
+ 	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 +2401,11 @@ 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; */
++		WARN_ON(!vx_proc_task_visible(task));
+ 		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 */
+Index: linux-2.6.20/fs/proc/generic.c
+===================================================================
+--- linux-2.6.20.orig/fs/proc/generic.c
++++ linux-2.6.20/fs/proc/generic.c
+@@ -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>
+ 
+ #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;
+ 
+ 				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,
+ 			}
+ 
+ 			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;
+Index: linux-2.6.20/fs/proc/inode.c
+===================================================================
+--- linux-2.6.20.orig/fs/proc/inode.c
++++ linux-2.6.20/fs/proc/inode.c
+@@ -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)
+Index: linux-2.6.20/fs/proc/internal.h
+===================================================================
+--- linux-2.6.20.orig/fs/proc/internal.h
++++ linux-2.6.20/fs/proc/internal.h
+@@ -10,6 +10,7 @@
+  */
+ 
+ #include <linux/proc_fs.h>
++#include <linux/vs_pid.h>
+ 
+ struct vmalloc_info {
+ 	unsigned long	used;
+@@ -56,11 +57,16 @@ static inline struct pid *proc_pid(struc
+ 	return PROC_I(inode)->pid;
+ }
+ 
+-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);
+ }
+ 
++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;
+Index: linux-2.6.20/fs/proc/proc_misc.c
+===================================================================
+--- linux-2.6.20.orig/fs/proc/proc_misc.c
++++ linux-2.6.20/fs/proc/proc_misc.c
+@@ -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)
+ /*
+@@ -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;
+ 
+-	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, 
+ 
+ 	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,
+ 
+ 	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);
+Index: linux-2.6.20/fs/proc/root.c
+===================================================================
+--- linux-2.6.20.orig/fs/proc/root.c
++++ linux-2.6.20/fs/proc/root.c
+@@ -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);
+ 
+ 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();
+ }
+ 
+ static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
+Index: linux-2.6.20/fs/quota.c
+===================================================================
+--- linux-2.6.20.orig/fs/quota.c
++++ linux-2.6.20/fs/quota.c
+@@ -17,47 +17,129 @@
+ #include <linux/buffer_head.h>
+ #include <linux/capability.h>
+ #include <linux/quotaops.h>
++#include <linux/major.h>
++#include <linux/blkdev.h>
++#include <linux/vs_context.h>
++
++
++/* Dquota Hash Management Functions */
++
++static LIST_HEAD(dqhash_list);
++
++static spinlock_t dqhash_lock = SPIN_LOCK_UNLOCKED;
++
++
++struct dqhash *new_dqhash(struct super_block *sb, unsigned int id)
++{
++	struct dqhash *hash;
++	unsigned long flags;
++	int err;
++
++	err = -ENOMEM;
++	hash = kmalloc(sizeof(struct dqhash),  GFP_USER);
++	if (!hash)
++		goto out;
++
++	memset(hash, 0, sizeof(struct dqhash));
++	hash->dqh_id = id;
++	atomic_set(&hash->dqh_count, 1);
++
++	INIT_LIST_HEAD(&hash->dqh_list);
++
++	mutex_init(&hash->dqh_dqopt.dqio_mutex);
++	mutex_init(&hash->dqh_dqopt.dqonoff_mutex);
++	init_rwsem(&hash->dqh_dqopt.dqptr_sem);
++	hash->dqh_qop = sb->s_qop;
++	hash->dqh_qcop = sb->s_qcop;
++	hash->dqh_sb = sb;
++
++	spin_lock_irqsave(&dqhash_lock, flags);
++	list_add(&hash->dqh_list, &dqhash_list);
++	spin_unlock_irqrestore(&dqhash_lock, flags);
++	vxdprintk(VXD_CBIT(misc, 0),
++		"new_dqhash: %p [#0x%08x]", hash, hash->dqh_id);
++	return hash;
++
++	// kfree(hash);
++out:
++	return ERR_PTR(err);
++}
++
++void destroy_dqhash(struct dqhash *hash)
++{
++	unsigned long flags;
++
++	vxdprintk(VXD_CBIT(misc, 0),
++		"destroy_dqhash: %p [#0x%08x] c=%d",
++		hash, hash->dqh_id, atomic_read(&hash->dqh_count));
++	spin_lock_irqsave(&dqhash_lock, flags);
++	list_del_init(&hash->dqh_list);
++	spin_unlock_irqrestore(&dqhash_lock, flags);
++	kfree(hash);
++}
++
++
++struct dqhash *find_dqhash(unsigned int id)
++{
++	struct list_head *head;
++	unsigned long flags;
++	struct dqhash *hash;
++
++	spin_lock_irqsave(&dqhash_lock, flags);
++	list_for_each(head, &dqhash_list) {
++		hash = list_entry(head, struct dqhash, dqh_list);
++		if (hash->dqh_id == id)
++			goto dqh_found;
++	}
++	hash = NULL;
++dqh_found:
++	spin_unlock_irqrestore(&dqhash_lock, flags);
++	if (hash)
++		dqhget(hash);
++	return hash;
++}
++
+ 
+ /* Check validity of generic quotactl commands */
+-static int generic_quotactl_valid(struct super_block *sb, int type, int cmd, qid_t id)
++static int generic_quotactl_valid(struct dqhash *hash, int type, int cmd, qid_t id)
+ {
+ 	if (type >= MAXQUOTAS)
+ 		return -EINVAL;
+-	if (!sb && cmd != Q_SYNC)
++	if (!hash && cmd != Q_SYNC)
+ 		return -ENODEV;
+ 	/* Is operation supported? */
+-	if (sb && !sb->s_qcop)
++	if (hash && !hash->dqh_qcop)
+ 		return -ENOSYS;
+ 
+ 	switch (cmd) {
+ 		case Q_GETFMT:
+ 			break;
+ 		case Q_QUOTAON:
+-			if (!sb->s_qcop->quota_on)
++			if (!hash->dqh_qcop->quota_on)
+ 				return -ENOSYS;
+ 			break;
+ 		case Q_QUOTAOFF:
+-			if (!sb->s_qcop->quota_off)
++			if (!hash->dqh_qcop->quota_off)
+ 				return -ENOSYS;
+ 			break;
+ 		case Q_SETINFO:
+-			if (!sb->s_qcop->set_info)
++			if (!hash->dqh_qcop->set_info)
+ 				return -ENOSYS;
+ 			break;
+ 		case Q_GETINFO:
+-			if (!sb->s_qcop->get_info)
++			if (!hash->dqh_qcop->get_info)
+ 				return -ENOSYS;
+ 			break;
+ 		case Q_SETQUOTA:
+-			if (!sb->s_qcop->set_dqblk)
++			if (!hash->dqh_qcop->set_dqblk)
+ 				return -ENOSYS;
+ 			break;
+ 		case Q_GETQUOTA:
+-			if (!sb->s_qcop->get_dqblk)
++			if (!hash->dqh_qcop->get_dqblk)
+ 				return -ENOSYS;
+ 			break;
+ 		case Q_SYNC:
+-			if (sb && !sb->s_qcop->quota_sync)
++			if (hash && !hash->dqh_qcop->quota_sync)
+ 				return -ENOSYS;
+ 			break;
+ 		default:
+@@ -73,7 +155,7 @@ static int generic_quotactl_valid(struct
+ 		case Q_SETQUOTA:
+ 		case Q_GETQUOTA:
+ 			/* This is just informative test so we are satisfied without a lock */
+-			if (!sb_has_quota_enabled(sb, type))
++			if (!dqh_has_quota_enabled(hash, type))
+ 				return -ESRCH;
+ 	}
+ 
+@@ -81,47 +163,47 @@ 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;
+ }
+ 
+ /* Check validity of XFS Quota Manager commands */
+-static int xqm_quotactl_valid(struct super_block *sb, int type, int cmd, qid_t id)
++static int xqm_quotactl_valid(struct dqhash *hash, int type, int cmd, qid_t id)
+ {
+ 	if (type >= XQM_MAXQUOTAS)
+ 		return -EINVAL;
+-	if (!sb)
++	if (!hash)
+ 		return -ENODEV;
+-	if (!sb->s_qcop)
++	if (!hash->dqh_qcop)
+ 		return -ENOSYS;
+ 
+ 	switch (cmd) {
+ 		case Q_XQUOTAON:
+ 		case Q_XQUOTAOFF:
+ 		case Q_XQUOTARM:
+-			if (!sb->s_qcop->set_xstate)
++			if (!hash->dqh_qcop->set_xstate)
+ 				return -ENOSYS;
+ 			break;
+ 		case Q_XGETQSTAT:
+-			if (!sb->s_qcop->get_xstate)
++			if (!hash->dqh_qcop->get_xstate)
+ 				return -ENOSYS;
+ 			break;
+ 		case Q_XSETQLIM:
+-			if (!sb->s_qcop->set_xquota)
++			if (!hash->dqh_qcop->set_xquota)
+ 				return -ENOSYS;
+ 			break;
+ 		case Q_XGETQUOTA:
+-			if (!sb->s_qcop->get_xquota)
++			if (!hash->dqh_qcop->get_xquota)
+ 				return -ENOSYS;
+ 			break;
+ 		case Q_XQUOTASYNC:
+-			if (!sb->s_qcop->quota_sync)
++			if (!hash->dqh_qcop->quota_sync)
+ 				return -ENOSYS;
+ 			break;
+ 		default:
+@@ -132,57 +214,68 @@ 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;
+ 	}
+ 
+ 	return 0;
+ }
+ 
+-static int check_quotactl_valid(struct super_block *sb, int type, int cmd, qid_t id)
++static int check_quotactl_valid(struct dqhash *hash, int type, int cmd, qid_t id)
+ {
+ 	int error;
+ 
+ 	if (XQM_COMMAND(cmd))
+-		error = xqm_quotactl_valid(sb, type, cmd, id);
++		error = xqm_quotactl_valid(hash, type, cmd, id);
+ 	else
+-		error = generic_quotactl_valid(sb, type, cmd, id);
++		error = generic_quotactl_valid(hash, type, cmd, id);
+ 	if (!error)
+-		error = security_quotactl(cmd, type, id, sb);
++		error = security_quotactl(cmd, type, id, hash);
+ 	return error;
+ }
+ 
+-static void quota_sync_sb(struct super_block *sb, int type)
++static void quota_sync_sb(struct super_block *sb)
+ {
+-	int cnt;
+-	struct inode *discard[MAXQUOTAS];
+-
+-	sb->s_qcop->quota_sync(sb, type);
+ 	/* This is not very clever (and fast) but currently I don't know about
+ 	 * any other simple way of getting quota data to disk and we must get
+ 	 * them there for userspace to be visible... */
+ 	if (sb->s_op->sync_fs)
+ 		sb->s_op->sync_fs(sb, 1);
+ 	sync_blockdev(sb->s_bdev);
++}
++
++static void quota_sync_dqh(struct dqhash *hash, int type)
++{
++	int cnt;
++	struct inode *discard[MAXQUOTAS];
++
++	vxdprintk(VXD_CBIT(quota, 1),
++		"quota_sync_dqh(%p,%d)", hash, type);
++	hash->dqh_qcop->quota_sync(hash, type);
++
++	quota_sync_sb(hash->dqh_sb);
+ 
+ 	/* Now when everything is written we can discard the pagecache so
+ 	 * that userspace sees the changes. We need i_mutex and so we could
+ 	 * not do it inside dqonoff_mutex. Moreover we need to be carefull
+ 	 * about races with quotaoff() (that is the reason why we have own
+ 	 * reference to inode). */
+-	mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);
++	mutex_lock(&dqh_dqopt(hash)->dqonoff_mutex);
+ 	for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
+ 		discard[cnt] = NULL;
+ 		if (type != -1 && cnt != type)
+ 			continue;
+-		if (!sb_has_quota_enabled(sb, cnt))
++		if (!dqh_has_quota_enabled(hash, cnt))
+ 			continue;
+-		discard[cnt] = igrab(sb_dqopt(sb)->files[cnt]);
++		vxdprintk(VXD_CBIT(quota, 0),
++			"quota_sync_dqh(%p,%d) discard inode %p",
++			hash, type, dqh_dqopt(hash)->files[cnt]);
++		discard[cnt] = igrab(dqh_dqopt(hash)->files[cnt]);
+ 	}
+-	mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
++	mutex_unlock(&dqh_dqopt(hash)->dqonoff_mutex);
+ 	for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
+ 		if (discard[cnt]) {
+ 			mutex_lock(&discard[cnt]->i_mutex);
+@@ -193,67 +286,59 @@ static void quota_sync_sb(struct super_b
+ 	}
+ }
+ 
+-void sync_dquots(struct super_block *sb, int type)
++void sync_dquots_dqh(struct dqhash *hash, int type)
+ {
+-	int cnt, dirty;
++	vxdprintk(VXD_CBIT(quota, 1),
++		"sync_dquots_dqh(%p,%d)", hash, type);
+ 
+-	if (sb) {
+-		if (sb->s_qcop->quota_sync)
+-			quota_sync_sb(sb, type);
+-		return;
+-	}
++	if (hash->dqh_qcop->quota_sync)
++		quota_sync_dqh(hash, type);
++}
+ 
+-	spin_lock(&sb_lock);
+-restart:
+-	list_for_each_entry(sb, &super_blocks, s_list) {
+-		/* This test just improves performance so it needn't be reliable... */
+-		for (cnt = 0, dirty = 0; cnt < MAXQUOTAS; cnt++)
+-			if ((type == cnt || type == -1) && sb_has_quota_enabled(sb, cnt)
+-			    && info_any_dirty(&sb_dqopt(sb)->info[cnt]))
+-				dirty = 1;
+-		if (!dirty)
+-			continue;
+-		sb->s_count++;
+-		spin_unlock(&sb_lock);
+-		down_read(&sb->s_umount);
+-		if (sb->s_root && sb->s_qcop->quota_sync)
+-			quota_sync_sb(sb, type);
+-		up_read(&sb->s_umount);
+-		spin_lock(&sb_lock);
+-		if (__put_super_and_need_restart(sb))
+-			goto restart;
++void sync_dquots(struct dqhash *hash, int type)
++
++{
++	vxdprintk(VXD_CBIT(quota, 1),
++		"sync_dquots(%p,%d)", hash, type);
++
++	if (hash) {
++		if (hash->dqh_qcop->quota_sync)
++			quota_sync_dqh(hash, type);
++		return;
+ 	}
+-	spin_unlock(&sb_lock);
+ }
+ 
+ /* Copy parameters and call proper function */
+-static int do_quotactl(struct super_block *sb, int type, int cmd, qid_t id, void __user *addr)
++static int do_quotactl(struct dqhash *hash, int type, int cmd, qid_t id, void __user *addr)
+ {
+ 	int ret;
+ 
++	vxdprintk(VXD_CBIT(quota, 3),
++		"do_quotactl(%p,%d,cmd=%d,id=%d,%p)", hash, type, cmd, id, addr);
++
+ 	switch (cmd) {
+ 		case Q_QUOTAON: {
+ 			char *pathname;
+ 
+ 			if (IS_ERR(pathname = getname(addr)))
+ 				return PTR_ERR(pathname);
+-			ret = sb->s_qcop->quota_on(sb, type, id, pathname);
++			ret = hash->dqh_qcop->quota_on(hash, type, id, pathname);
+ 			putname(pathname);
+ 			return ret;
+ 		}
+ 		case Q_QUOTAOFF:
+-			return sb->s_qcop->quota_off(sb, type);
++			return hash->dqh_qcop->quota_off(hash, type);
+ 
+ 		case Q_GETFMT: {
+ 			__u32 fmt;
+ 
+-			down_read(&sb_dqopt(sb)->dqptr_sem);
+-			if (!sb_has_quota_enabled(sb, type)) {
+-				up_read(&sb_dqopt(sb)->dqptr_sem);
++			down_read(&dqh_dqopt(hash)->dqptr_sem);
++			if (!dqh_has_quota_enabled(hash, type)) {
++				up_read(&dqh_dqopt(hash)->dqptr_sem);
+ 				return -ESRCH;
+ 			}
+-			fmt = sb_dqopt(sb)->info[type].dqi_format->qf_fmt_id;
+-			up_read(&sb_dqopt(sb)->dqptr_sem);
++			fmt = dqh_dqopt(hash)->info[type].dqi_format->qf_fmt_id;
++			up_read(&dqh_dqopt(hash)->dqptr_sem);
+ 			if (copy_to_user(addr, &fmt, sizeof(fmt)))
+ 				return -EFAULT;
+ 			return 0;
+@@ -261,7 +346,7 @@ static int do_quotactl(struct super_bloc
+ 		case Q_GETINFO: {
+ 			struct if_dqinfo info;
+ 
+-			if ((ret = sb->s_qcop->get_info(sb, type, &info)))
++			if ((ret = hash->dqh_qcop->get_info(hash, type, &info)))
+ 				return ret;
+ 			if (copy_to_user(addr, &info, sizeof(info)))
+ 				return -EFAULT;
+@@ -272,12 +357,12 @@ static int do_quotactl(struct super_bloc
+ 
+ 			if (copy_from_user(&info, addr, sizeof(info)))
+ 				return -EFAULT;
+-			return sb->s_qcop->set_info(sb, type, &info);
++			return hash->dqh_qcop->set_info(hash, type, &info);
+ 		}
+ 		case Q_GETQUOTA: {
+ 			struct if_dqblk idq;
+ 
+-			if ((ret = sb->s_qcop->get_dqblk(sb, type, id, &idq)))
++			if ((ret = hash->dqh_qcop->get_dqblk(hash, type, id, &idq)))
+ 				return ret;
+ 			if (copy_to_user(addr, &idq, sizeof(idq)))
+ 				return -EFAULT;
+@@ -288,10 +373,10 @@ static int do_quotactl(struct super_bloc
+ 
+ 			if (copy_from_user(&idq, addr, sizeof(idq)))
+ 				return -EFAULT;
+-			return sb->s_qcop->set_dqblk(sb, type, id, &idq);
++			return hash->dqh_qcop->set_dqblk(hash, type, id, &idq);
+ 		}
+ 		case Q_SYNC:
+-			sync_dquots(sb, type);
++			sync_dquots_dqh(hash, type);
+ 			return 0;
+ 
+ 		case Q_XQUOTAON:
+@@ -301,12 +386,12 @@ static int do_quotactl(struct super_bloc
+ 
+ 			if (copy_from_user(&flags, addr, sizeof(flags)))
+ 				return -EFAULT;
+-			return sb->s_qcop->set_xstate(sb, flags, cmd);
++			return hash->dqh_qcop->set_xstate(hash, flags, cmd);
+ 		}
+ 		case Q_XGETQSTAT: {
+ 			struct fs_quota_stat fqs;
+ 		
+-			if ((ret = sb->s_qcop->get_xstate(sb, &fqs)))
++			if ((ret = hash->dqh_qcop->get_xstate(hash, &fqs)))
+ 				return ret;
+ 			if (copy_to_user(addr, &fqs, sizeof(fqs)))
+ 				return -EFAULT;
+@@ -317,19 +402,19 @@ static int do_quotactl(struct super_bloc
+ 
+ 			if (copy_from_user(&fdq, addr, sizeof(fdq)))
+ 				return -EFAULT;
+-		       return sb->s_qcop->set_xquota(sb, type, id, &fdq);
++		       return hash->dqh_qcop->set_xquota(hash, type, id, &fdq);
+ 		}
+ 		case Q_XGETQUOTA: {
+ 			struct fs_disk_quota fdq;
+ 
+-			if ((ret = sb->s_qcop->get_xquota(sb, type, id, &fdq)))
++			if ((ret = hash->dqh_qcop->get_xquota(hash, type, id, &fdq)))
+ 				return ret;
+ 			if (copy_to_user(addr, &fdq, sizeof(fdq)))
+ 				return -EFAULT;
+ 			return 0;
+ 		}
+ 		case Q_XQUOTASYNC:
+-			return sb->s_qcop->quota_sync(sb, type);
++			return hash->dqh_qcop->quota_sync(hash, type);
+ 		/* We never reach here unless validity check is broken */
+ 		default:
+ 			BUG();
+@@ -365,6 +450,43 @@ 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/kallsyms.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
++
+ /*
+  * This is the system call interface. This communicates with
+  * the user-level programs. Currently this only supports diskquota
+@@ -375,6 +497,7 @@ asmlinkage long sys_quotactl(unsigned in
+ {
+ 	uint cmds, type;
+ 	struct super_block *sb = NULL;
++	struct dqhash *dqh = NULL;
+ 	int ret;
+ 
+ 	cmds = cmd >> SUBCMDSHIFT;
+@@ -386,9 +509,11 @@ asmlinkage long sys_quotactl(unsigned in
+ 			return PTR_ERR(sb);
+ 	}
+ 
+-	ret = check_quotactl_valid(sb, type, cmds, id);
++	if (sb)
++		dqh = sb->s_dqh;
++	ret = check_quotactl_valid(dqh, type, cmds, id);
+ 	if (ret >= 0)
+-		ret = do_quotactl(sb, type, cmds, id, addr);
++		ret = do_quotactl(dqh, type, cmds, id, addr);
+ 	if (sb)
+ 		drop_super(sb);
+ 
+Index: linux-2.6.20/fs/quota_v1.c
+===================================================================
+--- linux-2.6.20.orig/fs/quota_v1.c
++++ linux-2.6.20/fs/quota_v1.c
+@@ -42,12 +42,13 @@ static int v1_read_dqblk(struct dquot *d
+ 	int type = dquot->dq_type;
+ 	struct v1_disk_dqblk dqblk;
+ 
+-	if (!sb_dqopt(dquot->dq_sb)->files[type])
++	if (!dqh_dqopt(dquot->dq_dqh)->files[type])
+ 		return -EINVAL;
+ 
+ 	/* Set structure to 0s in case read fails/is after end of file */
+ 	memset(&dqblk, 0, sizeof(struct v1_disk_dqblk));
+-	dquot->dq_sb->s_op->quota_read(dquot->dq_sb, type, (char *)&dqblk, sizeof(struct v1_disk_dqblk), v1_dqoff(dquot->dq_id));
++	dquot->dq_dqh->dqh_sb->s_op->quota_read(dquot->dq_dqh, type,
++		(char *)&dqblk, sizeof(struct v1_disk_dqblk), v1_dqoff(dquot->dq_id));
+ 
+ 	v1_disk2mem_dqblk(&dquot->dq_dqb, &dqblk);
+ 	if (dquot->dq_dqb.dqb_bhardlimit == 0 && dquot->dq_dqb.dqb_bsoftlimit == 0 &&
+@@ -66,16 +67,16 @@ static int v1_commit_dqblk(struct dquot 
+ 
+ 	v1_mem2disk_dqblk(&dqblk, &dquot->dq_dqb);
+ 	if (dquot->dq_id == 0) {
+-		dqblk.dqb_btime = sb_dqopt(dquot->dq_sb)->info[type].dqi_bgrace;
+-		dqblk.dqb_itime = sb_dqopt(dquot->dq_sb)->info[type].dqi_igrace;
++		dqblk.dqb_btime = dqh_dqopt(dquot->dq_dqh)->info[type].dqi_bgrace;
++		dqblk.dqb_itime = dqh_dqopt(dquot->dq_dqh)->info[type].dqi_igrace;
+ 	}
+ 	ret = 0;
+-	if (sb_dqopt(dquot->dq_sb)->files[type])
+-		ret = dquot->dq_sb->s_op->quota_write(dquot->dq_sb, type, (char *)&dqblk,
+-					sizeof(struct v1_disk_dqblk), v1_dqoff(dquot->dq_id));
++	if (dqh_dqopt(dquot->dq_dqh)->files[type])
++		ret = dquot->dq_dqh->dqh_sb->s_op->quota_write(dquot->dq_dqh, type,
++			(char *)&dqblk, sizeof(struct v1_disk_dqblk), v1_dqoff(dquot->dq_id));
+ 	if (ret != sizeof(struct v1_disk_dqblk)) {
+ 		printk(KERN_WARNING "VFS: dquota write failed on dev %s\n",
+-			dquot->dq_sb->s_id);
++			dquot->dq_dqh->dqh_sb->s_id);
+ 		if (ret >= 0)
+ 			ret = -EIO;
+ 		goto out;
+@@ -100,9 +101,9 @@ struct v2_disk_dqheader {
+ 	__le32 dqh_version;      /* File version */
+ };
+ 
+-static int v1_check_quota_file(struct super_block *sb, int type)
++static int v1_check_quota_file(struct dqhash *hash, int type)
+ {
+-	struct inode *inode = sb_dqopt(sb)->files[type];
++	struct inode *inode = dqh_dqopt(hash)->files[type];
+ 	ulong blocks;
+ 	size_t off; 
+ 	struct v2_disk_dqheader dqhead;
+@@ -118,22 +119,26 @@ static int v1_check_quota_file(struct su
+ 	if ((blocks % sizeof(struct v1_disk_dqblk) * BLOCK_SIZE + off) % sizeof(struct v1_disk_dqblk))
+ 		return 0;
+ 	/* Doublecheck whether we didn't get file with new format - with old quotactl() this could happen */
+-	size = sb->s_op->quota_read(sb, type, (char *)&dqhead, sizeof(struct v2_disk_dqheader), 0);
++	size = hash->dqh_sb->s_op->quota_read(hash, type,
++		(char *)&dqhead, sizeof(struct v2_disk_dqheader), 0);
+ 	if (size != sizeof(struct v2_disk_dqheader))
+ 		return 1;	/* Probably not new format */
+ 	if (le32_to_cpu(dqhead.dqh_magic) != quota_magics[type])
+ 		return 1;	/* Definitely not new format */
+-	printk(KERN_INFO "VFS: %s: Refusing to turn on old quota format on given file. It probably contains newer quota format.\n", sb->s_id);
++	printk(KERN_INFO "VFS: %s: Refusing to turn on old quota format on given file."
++		" It probably contains newer quota format.\n", hash->dqh_sb->s_id);
+         return 0;		/* Seems like a new format file -> refuse it */
+ }
+ 
+-static int v1_read_file_info(struct super_block *sb, int type)
++static int v1_read_file_info(struct dqhash *hash, int type)
+ {
+-	struct quota_info *dqopt = sb_dqopt(sb);
++	struct quota_info *dqopt = dqh_dqopt(hash);
+ 	struct v1_disk_dqblk dqblk;
+ 	int ret;
+ 
+-	if ((ret = sb->s_op->quota_read(sb, type, (char *)&dqblk, sizeof(struct v1_disk_dqblk), v1_dqoff(0))) != sizeof(struct v1_disk_dqblk)) {
++	if ((ret = hash->dqh_sb->s_op->quota_read(hash, type,
++		(char *)&dqblk, sizeof(struct v1_disk_dqblk),
++		v1_dqoff(0))) != sizeof(struct v1_disk_dqblk)) {
+ 		if (ret >= 0)
+ 			ret = -EIO;
+ 		goto out;
+@@ -145,14 +150,14 @@ out:
+ 	return ret;
+ }
+ 
+-static int v1_write_file_info(struct super_block *sb, int type)
++static int v1_write_file_info(struct dqhash *hash, int type)
+ {
+-	struct quota_info *dqopt = sb_dqopt(sb);
++	struct quota_info *dqopt = dqh_dqopt(hash);
+ 	struct v1_disk_dqblk dqblk;
+ 	int ret;
+ 
+ 	dqopt->info[type].dqi_flags &= ~DQF_INFO_DIRTY;
+-	if ((ret = sb->s_op->quota_read(sb, type, (char *)&dqblk,
++	if ((ret = hash->dqh_sb->s_op->quota_read(hash, type, (char *)&dqblk,
+ 	    sizeof(struct v1_disk_dqblk), v1_dqoff(0))) != sizeof(struct v1_disk_dqblk)) {
+ 		if (ret >= 0)
+ 			ret = -EIO;
+@@ -160,7 +165,7 @@ static int v1_write_file_info(struct sup
+ 	}
+ 	dqblk.dqb_itime = dqopt->info[type].dqi_igrace;
+ 	dqblk.dqb_btime = dqopt->info[type].dqi_bgrace;
+-	ret = sb->s_op->quota_write(sb, type, (char *)&dqblk,
++	ret = hash->dqh_sb->s_op->quota_write(hash, type, (char *)&dqblk,
+ 	      sizeof(struct v1_disk_dqblk), v1_dqoff(0));
+ 	if (ret == sizeof(struct v1_disk_dqblk))
+ 		ret = 0;
+Index: linux-2.6.20/fs/quota_v2.c
+===================================================================
+--- linux-2.6.20.orig/fs/quota_v2.c
++++ linux-2.6.20/fs/quota_v2.c
+@@ -26,14 +26,15 @@ typedef char *dqbuf_t;
+ #define GETENTRIES(buf) ((struct v2_disk_dqblk *)(((char *)buf)+sizeof(struct v2_disk_dqdbheader)))
+ 
+ /* Check whether given file is really vfsv0 quotafile */
+-static int v2_check_quota_file(struct super_block *sb, int type)
++static int v2_check_quota_file(struct dqhash *hash, int type)
+ {
+ 	struct v2_disk_dqheader dqhead;
+ 	ssize_t size;
+ 	static const uint quota_magics[] = V2_INITQMAGICS;
+ 	static const uint quota_versions[] = V2_INITQVERSIONS;
+  
+-	size = sb->s_op->quota_read(sb, type, (char *)&dqhead, sizeof(struct v2_disk_dqheader), 0);
++	size = hash->dqh_sb->s_op->quota_read(hash, type,
++		(char *)&dqhead, sizeof(struct v2_disk_dqheader), 0);
+ 	if (size != sizeof(struct v2_disk_dqheader)) {
+ 		printk("quota_v2: failed read expected=%zd got=%zd\n",
+ 			sizeof(struct v2_disk_dqheader), size);
+@@ -46,17 +47,17 @@ static int v2_check_quota_file(struct su
+ }
+ 
+ /* Read information header from quota file */
+-static int v2_read_file_info(struct super_block *sb, int type)
++static int v2_read_file_info(struct dqhash *hash, int type)
+ {
+ 	struct v2_disk_dqinfo dinfo;
+-	struct mem_dqinfo *info = sb_dqopt(sb)->info+type;
++	struct mem_dqinfo *info = dqh_dqopt(hash)->info+type;
+ 	ssize_t size;
+ 
+-	size = sb->s_op->quota_read(sb, type, (char *)&dinfo,
+-	       sizeof(struct v2_disk_dqinfo), V2_DQINFOOFF);
++	size = hash->dqh_sb->s_op->quota_read(hash, type,
++		(char *)&dinfo, sizeof(struct v2_disk_dqinfo), V2_DQINFOOFF);
+ 	if (size != sizeof(struct v2_disk_dqinfo)) {
+ 		printk(KERN_WARNING "Can't read info structure on device %s.\n",
+-			sb->s_id);
++			hash->dqh_sb->s_id);
+ 		return -1;
+ 	}
+ 	info->dqi_bgrace = le32_to_cpu(dinfo.dqi_bgrace);
+@@ -69,10 +70,10 @@ static int v2_read_file_info(struct supe
+ }
+ 
+ /* Write information header to quota file */
+-static int v2_write_file_info(struct super_block *sb, int type)
++static int v2_write_file_info(struct dqhash *hash, int type)
+ {
+ 	struct v2_disk_dqinfo dinfo;
+-	struct mem_dqinfo *info = sb_dqopt(sb)->info+type;
++	struct mem_dqinfo *info = dqh_dqopt(hash)->info+type;
+ 	ssize_t size;
+ 
+ 	spin_lock(&dq_data_lock);
+@@ -84,11 +85,11 @@ static int v2_write_file_info(struct sup
+ 	dinfo.dqi_blocks = cpu_to_le32(info->u.v2_i.dqi_blocks);
+ 	dinfo.dqi_free_blk = cpu_to_le32(info->u.v2_i.dqi_free_blk);
+ 	dinfo.dqi_free_entry = cpu_to_le32(info->u.v2_i.dqi_free_entry);
+-	size = sb->s_op->quota_write(sb, type, (char *)&dinfo,
++	size = hash->dqh_sb->s_op->quota_write(hash, type, (char *)&dinfo,
+ 	       sizeof(struct v2_disk_dqinfo), V2_DQINFOOFF);
+ 	if (size != sizeof(struct v2_disk_dqinfo)) {
+ 		printk(KERN_WARNING "Can't write info structure on device %s.\n",
+-			sb->s_id);
++			hash->dqh_sb->s_id);
+ 		return -1;
+ 	}
+ 	return 0;
+@@ -132,24 +133,24 @@ static inline void freedqbuf(dqbuf_t buf
+ 	kfree(buf);
+ }
+ 
+-static inline ssize_t read_blk(struct super_block *sb, int type, uint blk, dqbuf_t buf)
++static inline ssize_t read_blk(struct dqhash *hash, int type, uint blk, dqbuf_t buf)
+ {
+ 	memset(buf, 0, V2_DQBLKSIZE);
+-	return sb->s_op->quota_read(sb, type, (char *)buf,
+-	       V2_DQBLKSIZE, blk << V2_DQBLKSIZE_BITS);
++	return hash->dqh_sb->s_op->quota_read(hash, type,
++		(char *)buf, V2_DQBLKSIZE, blk << V2_DQBLKSIZE_BITS);
+ }
+ 
+-static inline ssize_t write_blk(struct super_block *sb, int type, uint blk, dqbuf_t buf)
++static inline ssize_t write_blk(struct dqhash *hash, int type, uint blk, dqbuf_t buf)
+ {
+-	return sb->s_op->quota_write(sb, type, (char *)buf,
+-	       V2_DQBLKSIZE, blk << V2_DQBLKSIZE_BITS);
++	return hash->dqh_sb->s_op->quota_write(hash, type,
++		(char *)buf, V2_DQBLKSIZE, blk << V2_DQBLKSIZE_BITS);
+ }
+ 
+ /* Remove empty block from list and return it */
+-static int get_free_dqblk(struct super_block *sb, int type)
++static int get_free_dqblk(struct dqhash *hash, int type)
+ {
+ 	dqbuf_t buf = getdqbuf();
+-	struct mem_dqinfo *info = sb_dqinfo(sb, type);
++	struct mem_dqinfo *info = dqh_dqinfo(hash, type);
+ 	struct v2_disk_dqdbheader *dh = (struct v2_disk_dqdbheader *)buf;
+ 	int ret, blk;
+ 
+@@ -157,18 +158,18 @@ static int get_free_dqblk(struct super_b
+ 		return -ENOMEM;
+ 	if (info->u.v2_i.dqi_free_blk) {
+ 		blk = info->u.v2_i.dqi_free_blk;
+-		if ((ret = read_blk(sb, type, blk, buf)) < 0)
++		if ((ret = read_blk(hash, type, blk, buf)) < 0)
+ 			goto out_buf;
+ 		info->u.v2_i.dqi_free_blk = le32_to_cpu(dh->dqdh_next_free);
+ 	}
+ 	else {
+ 		memset(buf, 0, V2_DQBLKSIZE);
+ 		/* Assure block allocation... */
+-		if ((ret = write_blk(sb, type, info->u.v2_i.dqi_blocks, buf)) < 0)
++		if ((ret = write_blk(hash, type, info->u.v2_i.dqi_blocks, buf)) < 0)
+ 			goto out_buf;
+ 		blk = info->u.v2_i.dqi_blocks++;
+ 	}
+-	mark_info_dirty(sb, type);
++	mark_info_dirty(hash, type);
+ 	ret = blk;
+ out_buf:
+ 	freedqbuf(buf);
+@@ -176,9 +177,9 @@ out_buf:
+ }
+ 
+ /* Insert empty block to the list */
+-static int put_free_dqblk(struct super_block *sb, int type, dqbuf_t buf, uint blk)
++static int put_free_dqblk(struct dqhash *hash, int type, dqbuf_t buf, uint blk)
+ {
+-	struct mem_dqinfo *info = sb_dqinfo(sb, type);
++	struct mem_dqinfo *info = dqh_dqinfo(hash, type);
+ 	struct v2_disk_dqdbheader *dh = (struct v2_disk_dqdbheader *)buf;
+ 	int err;
+ 
+@@ -186,18 +187,18 @@ static int put_free_dqblk(struct super_b
+ 	dh->dqdh_prev_free = cpu_to_le32(0);
+ 	dh->dqdh_entries = cpu_to_le16(0);
+ 	info->u.v2_i.dqi_free_blk = blk;
+-	mark_info_dirty(sb, type);
++	mark_info_dirty(hash, type);
+ 	/* Some strange block. We had better leave it... */
+-	if ((err = write_blk(sb, type, blk, buf)) < 0)
++	if ((err = write_blk(hash, type, blk, buf)) < 0)
+ 		return err;
+ 	return 0;
+ }
+ 
+ /* Remove given block from the list of blocks with free entries */
+-static int remove_free_dqentry(struct super_block *sb, int type, dqbuf_t buf, uint blk)
++static int remove_free_dqentry(struct dqhash *hash, int type, dqbuf_t buf, uint blk)
+ {
+ 	dqbuf_t tmpbuf = getdqbuf();
+-	struct mem_dqinfo *info = sb_dqinfo(sb, type);
++	struct mem_dqinfo *info = dqh_dqinfo(hash, type);
+ 	struct v2_disk_dqdbheader *dh = (struct v2_disk_dqdbheader *)buf;
+ 	uint nextblk = le32_to_cpu(dh->dqdh_next_free), prevblk = le32_to_cpu(dh->dqdh_prev_free);
+ 	int err;
+@@ -205,27 +206,27 @@ static int remove_free_dqentry(struct su
+ 	if (!tmpbuf)
+ 		return -ENOMEM;
+ 	if (nextblk) {
+-		if ((err = read_blk(sb, type, nextblk, tmpbuf)) < 0)
++		if ((err = read_blk(hash, type, nextblk, tmpbuf)) < 0)
+ 			goto out_buf;
+ 		((struct v2_disk_dqdbheader *)tmpbuf)->dqdh_prev_free = dh->dqdh_prev_free;
+-		if ((err = write_blk(sb, type, nextblk, tmpbuf)) < 0)
++		if ((err = write_blk(hash, type, nextblk, tmpbuf)) < 0)
+ 			goto out_buf;
+ 	}
+ 	if (prevblk) {
+-		if ((err = read_blk(sb, type, prevblk, tmpbuf)) < 0)
++		if ((err = read_blk(hash, type, prevblk, tmpbuf)) < 0)
+ 			goto out_buf;
+ 		((struct v2_disk_dqdbheader *)tmpbuf)->dqdh_next_free = dh->dqdh_next_free;
+-		if ((err = write_blk(sb, type, prevblk, tmpbuf)) < 0)
++		if ((err = write_blk(hash, type, prevblk, tmpbuf)) < 0)
+ 			goto out_buf;
+ 	}
+ 	else {
+ 		info->u.v2_i.dqi_free_entry = nextblk;
+-		mark_info_dirty(sb, type);
++		mark_info_dirty(hash, type);
+ 	}
+ 	freedqbuf(tmpbuf);
+ 	dh->dqdh_next_free = dh->dqdh_prev_free = cpu_to_le32(0);
+ 	/* No matter whether write succeeds block is out of list */
+-	if (write_blk(sb, type, blk, buf) < 0)
++	if (write_blk(hash, type, blk, buf) < 0)
+ 		printk(KERN_ERR "VFS: Can't write block (%u) with free entries.\n", blk);
+ 	return 0;
+ out_buf:
+@@ -234,10 +235,10 @@ out_buf:
+ }
+ 
+ /* Insert given block to the beginning of list with free entries */
+-static int insert_free_dqentry(struct super_block *sb, int type, dqbuf_t buf, uint blk)
++static int insert_free_dqentry(struct dqhash *hash, int type, dqbuf_t buf, uint blk)
+ {
+ 	dqbuf_t tmpbuf = getdqbuf();
+-	struct mem_dqinfo *info = sb_dqinfo(sb, type);
++	struct mem_dqinfo *info = dqh_dqinfo(hash, type);
+ 	struct v2_disk_dqdbheader *dh = (struct v2_disk_dqdbheader *)buf;
+ 	int err;
+ 
+@@ -245,18 +246,18 @@ static int insert_free_dqentry(struct su
+ 		return -ENOMEM;
+ 	dh->dqdh_next_free = cpu_to_le32(info->u.v2_i.dqi_free_entry);
+ 	dh->dqdh_prev_free = cpu_to_le32(0);
+-	if ((err = write_blk(sb, type, blk, buf)) < 0)
++	if ((err = write_blk(hash, type, blk, buf)) < 0)
+ 		goto out_buf;
+ 	if (info->u.v2_i.dqi_free_entry) {
+-		if ((err = read_blk(sb, type, info->u.v2_i.dqi_free_entry, tmpbuf)) < 0)
++		if ((err = read_blk(hash, type, info->u.v2_i.dqi_free_entry, tmpbuf)) < 0)
+ 			goto out_buf;
+ 		((struct v2_disk_dqdbheader *)tmpbuf)->dqdh_prev_free = cpu_to_le32(blk);
+-		if ((err = write_blk(sb, type, info->u.v2_i.dqi_free_entry, tmpbuf)) < 0)
++		if ((err = write_blk(hash, type, info->u.v2_i.dqi_free_entry, tmpbuf)) < 0)
+ 			goto out_buf;
+ 	}
+ 	freedqbuf(tmpbuf);
+ 	info->u.v2_i.dqi_free_entry = blk;
+-	mark_info_dirty(sb, type);
++	mark_info_dirty(hash, type);
+ 	return 0;
+ out_buf:
+ 	freedqbuf(tmpbuf);
+@@ -266,8 +267,9 @@ out_buf:
+ /* Find space for dquot */
+ static uint find_free_dqentry(struct dquot *dquot, int *err)
+ {
+-	struct super_block *sb = dquot->dq_sb;
+-	struct mem_dqinfo *info = sb_dqopt(sb)->info+dquot->dq_type;
++	// struct super_block *sb = dquot->dq_sb;
++	struct dqhash *dqh = dquot->dq_dqh;
++	struct mem_dqinfo *info = dqh_dqopt(dqh)->info+dquot->dq_type;
+ 	uint blk, i;
+ 	struct v2_disk_dqdbheader *dh;
+ 	struct v2_disk_dqblk *ddquot;
+@@ -283,11 +285,11 @@ static uint find_free_dqentry(struct dqu
+ 	ddquot = GETENTRIES(buf);
+ 	if (info->u.v2_i.dqi_free_entry) {
+ 		blk = info->u.v2_i.dqi_free_entry;
+-		if ((*err = read_blk(sb, dquot->dq_type, blk, buf)) < 0)
++		if ((*err = read_blk(dqh, dquot->dq_type, blk, buf)) < 0)
+ 			goto out_buf;
+ 	}
+ 	else {
+-		blk = get_free_dqblk(sb, dquot->dq_type);
++		blk = get_free_dqblk(dqh, dquot->dq_type);
+ 		if ((int)blk < 0) {
+ 			*err = blk;
+ 			freedqbuf(buf);
+@@ -296,10 +298,10 @@ static uint find_free_dqentry(struct dqu
+ 		memset(buf, 0, V2_DQBLKSIZE);
+ 		/* This is enough as block is already zeroed and entry list is empty... */
+ 		info->u.v2_i.dqi_free_entry = blk;
+-		mark_info_dirty(sb, dquot->dq_type);
++		mark_info_dirty(dqh, dquot->dq_type);
+ 	}
+ 	if (le16_to_cpu(dh->dqdh_entries)+1 >= V2_DQSTRINBLK)	/* Block will be full? */
+-		if ((*err = remove_free_dqentry(sb, dquot->dq_type, buf, blk)) < 0) {
++		if ((*err = remove_free_dqentry(dqh, dquot->dq_type, buf, blk)) < 0) {
+ 			printk(KERN_ERR "VFS: find_free_dqentry(): Can't remove block (%u) from entry free list.\n", blk);
+ 			goto out_buf;
+ 		}
+@@ -314,7 +316,7 @@ static uint find_free_dqentry(struct dqu
+ 		goto out_buf;
+ 	}
+ #endif
+-	if ((*err = write_blk(sb, dquot->dq_type, blk, buf)) < 0) {
++	if ((*err = write_blk(dqh, dquot->dq_type, blk, buf)) < 0) {
+ 		printk(KERN_ERR "VFS: find_free_dqentry(): Can't write quota data block %u.\n", blk);
+ 		goto out_buf;
+ 	}
+@@ -329,7 +331,7 @@ out_buf:
+ /* Insert reference to structure into the trie */
+ static int do_insert_tree(struct dquot *dquot, uint *treeblk, int depth)
+ {
+-	struct super_block *sb = dquot->dq_sb;
++	struct dqhash *dqh = dquot->dq_dqh;
+ 	dqbuf_t buf;
+ 	int ret = 0, newson = 0, newact = 0;
+ 	__le32 *ref;
+@@ -338,7 +340,7 @@ static int do_insert_tree(struct dquot *
+ 	if (!(buf = getdqbuf()))
+ 		return -ENOMEM;
+ 	if (!*treeblk) {
+-		ret = get_free_dqblk(sb, dquot->dq_type);
++		ret = get_free_dqblk(dqh, dquot->dq_type);
+ 		if (ret < 0)
+ 			goto out_buf;
+ 		*treeblk = ret;
+@@ -346,7 +348,7 @@ static int do_insert_tree(struct dquot *
+ 		newact = 1;
+ 	}
+ 	else {
+-		if ((ret = read_blk(sb, dquot->dq_type, *treeblk, buf)) < 0) {
++		if ((ret = read_blk(dqh, dquot->dq_type, *treeblk, buf)) < 0) {
+ 			printk(KERN_ERR "VFS: Can't read tree quota block %u.\n", *treeblk);
+ 			goto out_buf;
+ 		}
+@@ -369,10 +371,10 @@ static int do_insert_tree(struct dquot *
+ 		ret = do_insert_tree(dquot, &newblk, depth+1);
+ 	if (newson && ret >= 0) {
+ 		ref[GETIDINDEX(dquot->dq_id, depth)] = cpu_to_le32(newblk);
+-		ret = write_blk(sb, dquot->dq_type, *treeblk, buf);
++		ret = write_blk(dqh, dquot->dq_type, *treeblk, buf);
+ 	}
+ 	else if (newact && ret < 0)
+-		put_free_dqblk(sb, dquot->dq_type, buf, *treeblk);
++		put_free_dqblk(dqh, dquot->dq_type, buf, *treeblk);
+ out_buf:
+ 	freedqbuf(buf);
+ 	return ret;
+@@ -409,10 +411,11 @@ static int v2_write_dquot(struct dquot *
+ 	if (!memcmp(&empty, &ddquot, sizeof(struct v2_disk_dqblk)))
+ 		ddquot.dqb_itime = cpu_to_le64(1);
+ 	spin_unlock(&dq_data_lock);
+-	ret = dquot->dq_sb->s_op->quota_write(dquot->dq_sb, type,
++	ret = dquot->dq_dqh->dqh_sb->s_op->quota_write(dquot->dq_dqh, type,
+ 	      (char *)&ddquot, sizeof(struct v2_disk_dqblk), dquot->dq_off);
+ 	if (ret != sizeof(struct v2_disk_dqblk)) {
+-		printk(KERN_WARNING "VFS: dquota write failed on dev %s\n", dquot->dq_sb->s_id);
++		printk(KERN_WARNING "VFS: dquota write failed on dev %s\n",
++			dquot->dq_dqh->dqh_sb->s_id);
+ 		if (ret >= 0)
+ 			ret = -ENOSPC;
+ 	}
+@@ -426,7 +429,8 @@ static int v2_write_dquot(struct dquot *
+ /* Free dquot entry in data block */
+ static int free_dqentry(struct dquot *dquot, uint blk)
+ {
+-	struct super_block *sb = dquot->dq_sb;
++	// struct super_block *sb = dquot->dq_sb;
++	struct dqhash *dqh = dquot->dq_dqh;
+ 	int type = dquot->dq_type;
+ 	struct v2_disk_dqdbheader *dh;
+ 	dqbuf_t buf = getdqbuf();
+@@ -440,15 +444,15 @@ static int free_dqentry(struct dquot *dq
+ 		  (uint)(dquot->dq_off >> V2_DQBLKSIZE_BITS));
+ 		goto out_buf;
+ 	}
+-	if ((ret = read_blk(sb, type, blk, buf)) < 0) {
++	if ((ret = read_blk(dqh, type, blk, buf)) < 0) {
+ 		printk(KERN_ERR "VFS: Can't read quota data block %u\n", blk);
+ 		goto out_buf;
+ 	}
+ 	dh = (struct v2_disk_dqdbheader *)buf;
+ 	dh->dqdh_entries = cpu_to_le16(le16_to_cpu(dh->dqdh_entries)-1);
+ 	if (!le16_to_cpu(dh->dqdh_entries)) {	/* Block got free? */
+-		if ((ret = remove_free_dqentry(sb, type, buf, blk)) < 0 ||
+-		    (ret = put_free_dqblk(sb, type, buf, blk)) < 0) {
++		if ((ret = remove_free_dqentry(dqh, type, buf, blk)) < 0 ||
++		    (ret = put_free_dqblk(dqh, type, buf, blk)) < 0) {
+ 			printk(KERN_ERR "VFS: Can't move quota data block (%u) "
+ 			  "to free list.\n", blk);
+ 			goto out_buf;
+@@ -459,13 +463,13 @@ static int free_dqentry(struct dquot *dq
+ 		  sizeof(struct v2_disk_dqblk));
+ 		if (le16_to_cpu(dh->dqdh_entries) == V2_DQSTRINBLK-1) {
+ 			/* Insert will write block itself */
+-			if ((ret = insert_free_dqentry(sb, type, buf, blk)) < 0) {
++			if ((ret = insert_free_dqentry(dqh, type, buf, blk)) < 0) {
+ 				printk(KERN_ERR "VFS: Can't insert quota data block (%u) to free entry list.\n", blk);
+ 				goto out_buf;
+ 			}
+ 		}
+ 		else
+-			if ((ret = write_blk(sb, type, blk, buf)) < 0) {
++			if ((ret = write_blk(dqh, type, blk, buf)) < 0) {
+ 				printk(KERN_ERR "VFS: Can't write quota data "
+ 				  "block %u\n", blk);
+ 				goto out_buf;
+@@ -480,7 +484,7 @@ out_buf:
+ /* Remove reference to dquot from tree */
+ static int remove_tree(struct dquot *dquot, uint *blk, int depth)
+ {
+-	struct super_block *sb = dquot->dq_sb;
++	struct dqhash *dqh = dquot->dq_dqh;
+ 	int type = dquot->dq_type;
+ 	dqbuf_t buf = getdqbuf();
+ 	int ret = 0;
+@@ -489,7 +493,7 @@ static int remove_tree(struct dquot *dqu
+ 	
+ 	if (!buf)
+ 		return -ENOMEM;
+-	if ((ret = read_blk(sb, type, *blk, buf)) < 0) {
++	if ((ret = read_blk(dqh, type, *blk, buf)) < 0) {
+ 		printk(KERN_ERR "VFS: Can't read quota data block %u\n", *blk);
+ 		goto out_buf;
+ 	}
+@@ -506,11 +510,11 @@ static int remove_tree(struct dquot *dqu
+ 		for (i = 0; i < V2_DQBLKSIZE && !buf[i]; i++);	/* Block got empty? */
+ 		/* Don't put the root block into the free block list */
+ 		if (i == V2_DQBLKSIZE && *blk != V2_DQTREEOFF) {
+-			put_free_dqblk(sb, type, buf, *blk);
++			put_free_dqblk(dqh, type, buf, *blk);
+ 			*blk = 0;
+ 		}
+ 		else
+-			if ((ret = write_blk(sb, type, *blk, buf)) < 0)
++			if ((ret = write_blk(dqh, type, *blk, buf)) < 0)
+ 				printk(KERN_ERR "VFS: Can't write quota tree "
+ 				  "block %u.\n", *blk);
+ 	}
+@@ -539,7 +543,7 @@ static loff_t find_block_dqentry(struct 
+ 
+ 	if (!buf)
+ 		return -ENOMEM;
+-	if ((ret = read_blk(dquot->dq_sb, dquot->dq_type, blk, buf)) < 0) {
++	if ((ret = read_blk(dquot->dq_dqh, dquot->dq_type, blk, buf)) < 0) {
+ 		printk(KERN_ERR "VFS: Can't read quota tree block %u.\n", blk);
+ 		goto out_buf;
+ 	}
+@@ -578,7 +582,7 @@ static loff_t find_tree_dqentry(struct d
+ 
+ 	if (!buf)
+ 		return -ENOMEM;
+-	if ((ret = read_blk(dquot->dq_sb, dquot->dq_type, blk, buf)) < 0) {
++	if ((ret = read_blk(dquot->dq_dqh, dquot->dq_type, blk, buf)) < 0) {
+ 		printk(KERN_ERR "VFS: Can't read quota tree block %u.\n", blk);
+ 		goto out_buf;
+ 	}
+@@ -610,7 +614,7 @@ static int v2_read_dquot(struct dquot *d
+ 
+ #ifdef __QUOTA_V2_PARANOIA
+ 	/* Invalidated quota? */
+-	if (!dquot->dq_sb || !sb_dqopt(dquot->dq_sb)->files[type]) {
++	if (!dquot->dq_dqh || !dqh_dqopt(dquot->dq_dqh)->files[type]) {
+ 		printk(KERN_ERR "VFS: Quota invalidated while reading!\n");
+ 		return -EIO;
+ 	}
+@@ -627,7 +631,7 @@ static int v2_read_dquot(struct dquot *d
+ 	}
+ 	else {
+ 		dquot->dq_off = offset;
+-		if ((ret = dquot->dq_sb->s_op->quota_read(dquot->dq_sb, type,
++		if ((ret = dquot->dq_dqh->dqh_sb->s_op->quota_read(dquot->dq_dqh, type,
+ 		    (char *)&ddquot, sizeof(struct v2_disk_dqblk), offset))
+ 		    != sizeof(struct v2_disk_dqblk)) {
+ 			if (ret >= 0)
+Index: linux-2.6.20/fs/read_write.c
+===================================================================
+--- linux-2.6.20.orig/fs/read_write.c
++++ linux-2.6.20/fs/read_write.c
+@@ -701,12 +701,77 @@ sys_writev(unsigned long fd, const struc
+ 	return ret;
+ }
+ 
++ssize_t vfs_sendfile(struct file *out_file, struct file *in_file, loff_t *ppos,
++		     size_t count, loff_t max)
++{
++	struct inode * in_inode, * out_inode;
++	loff_t pos;
++	ssize_t ret;
++
++	/* verify in_file */
++	in_inode = in_file->f_path.dentry->d_inode;
++	if (!in_inode)
++		return -EINVAL;
++	if (!in_file->f_op || !in_file->f_op->sendfile)
++		return -EINVAL;
++
++	if (!ppos)
++		ppos = &in_file->f_pos;
++	else
++		if (!(in_file->f_mode & FMODE_PREAD))
++			return -ESPIPE;
++
++	ret = rw_verify_area(READ, in_file, ppos, count);
++	if (ret < 0)
++		return ret;
++	count = ret;
++
++	/* verify out_file */
++	out_inode = out_file->f_path.dentry->d_inode;
++	if (!out_inode)
++		return -EINVAL;
++	if (!out_file->f_op || !out_file->f_op->sendpage)
++		return -EINVAL;
++
++	ret = rw_verify_area(WRITE, out_file, &out_file->f_pos, count);
++	if (ret < 0)
++		return ret;
++	count = ret;
++
++	ret = security_file_permission (out_file, MAY_WRITE);
++	if (ret)
++		return ret;
++
++	if (!max)
++		max = min(in_inode->i_sb->s_maxbytes, out_inode->i_sb->s_maxbytes);
++
++	pos = *ppos;
++	if (unlikely(pos < 0))
++		return -EINVAL;
++	if (unlikely(pos + count > max)) {
++		if (pos >= max)
++			return -EOVERFLOW;
++		count = max - pos;
++	}
++
++	ret = in_file->f_op->sendfile(in_file, ppos, count, file_send_actor, out_file);
++
++	if (ret > 0) {
++		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;
+ 
+@@ -719,22 +784,6 @@ static ssize_t do_sendfile(int out_fd, i
+ 		goto out;
+ 	if (!(in_file->f_mode & FMODE_READ))
+ 		goto fput_in;
+-	retval = -EINVAL;
+-	in_inode = in_file->f_path.dentry->d_inode;
+-	if (!in_inode)
+-		goto fput_in;
+-	if (!in_file->f_op || !in_file->f_op->sendfile)
+-		goto fput_in;
+-	retval = -ESPIPE;
+-	if (!ppos)
+-		ppos = &in_file->f_pos;
+-	else
+-		if (!(in_file->f_mode & FMODE_PREAD))
+-			goto fput_in;
+-	retval = rw_verify_area(READ, in_file, ppos, count);
+-	if (retval < 0)
+-		goto fput_in;
+-	count = retval;
+ 
+ 	retval = security_file_permission (in_file, MAY_READ);
+ 	if (retval)
+@@ -749,45 +798,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;
+-	}
+ 
+-	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);
+ 
+-	if (retval > 0) {
+-		current->rchar += retval;
+-		current->wchar += retval;
+-	}
+ 	current->syscr++;
+ 	current->syscw++;
+ 
+-	if (*ppos > max)
+-		retval = -EOVERFLOW;
+-
+ fput_out:
+ 	fput_light(out_file, fput_needed_out);
+ fput_in:
+Index: linux-2.6.20/fs/reiserfs/bitmap.c
+===================================================================
+--- linux-2.6.20.orig/fs/reiserfs/bitmap.c
++++ linux-2.6.20/fs/reiserfs/bitmap.c
+@@ -13,6 +13,7 @@
+ #include <linux/reiserfs_fs_sb.h>
+ #include <linux/reiserfs_fs_i.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_dlimit.h>
+ 
+ #define PREALLOCATION_SIZE 9
+ 
+@@ -425,8 +426,10 @@ static void _reiserfs_free_block(struct 
+ 	set_sb_free_blocks(rs, sb_free_blocks(rs) + 1);
+ 
+ 	journal_mark_dirty(th, s, sbh);
+-	if (for_unformatted)
++	if (for_unformatted) {
++		DLIMIT_FREE_BLOCK(inode, 1);
+ 		DQUOT_FREE_BLOCK_NODIRTY(inode, 1);
++	}
+ }
+ 
+ void reiserfs_free_block(struct reiserfs_transaction_handle *th,
+@@ -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;
+ 
+ 	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;
++		}
++
+ 		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;
+ 		}
+@@ -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);
+ 	}
+ 
+ 	return CARRY_ON;
+Index: linux-2.6.20/fs/reiserfs/file.c
+===================================================================
+--- linux-2.6.20.orig/fs/reiserfs/file.c
++++ linux-2.6.20/fs/reiserfs/file.c
+@@ -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,
+ };
+Index: linux-2.6.20/fs/reiserfs/inode.c
+===================================================================
+--- linux-2.6.20.orig/fs/reiserfs/inode.c
++++ linux-2.6.20/fs/reiserfs/inode.c
+@@ -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>
+ 
+ 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);
+ 
+ 		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;
+ 
+ 	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);
++
+ 		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);
++
+ 		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);
+ 	}
+ 
++	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;
+ 
++	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
+ 
+ 	BUG_ON(!th->t_trans_id);
+ 
++	if (DLIMIT_ALLOC_INODE(inode)) {
++		err = -ENOSPC;
++		goto out_bad_dlimit;
++	}
+ 	if (DQUOT_ALLOC_INODE(inode)) {
+ 		err = -EDQUOT;
+ 		goto out_end_trans;
+@@ -1960,6 +1977,9 @@ int reiserfs_new_inode(struct reiserfs_t
+ 	DQUOT_FREE_INODE(inode);
+ 
+       out_end_trans:
++	DLIMIT_FREE_INODE(inode);
++
++      out_bad_dlimit:
+ 	journal_end(th, th->t_super, th->t_blocks_allocated);
+ 	/* Drop can be outside and it needs more credits so it's better to have it outside */
+ 	DQUOT_DROP(inode);
+@@ -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);
+ }
+ 
++int reiserfs_sync_flags(struct inode *inode)
++{
++	u16 oldflags, newflags;
++
++	oldflags = REISERFS_I(inode)->i_attrs;
++	newflags = oldflags;
++	i_attrs_to_sd_attrs(inode, &newflags);
++
++	if (oldflags ^ newflags) {
++		REISERFS_I(inode)->i_attrs = newflags;
++		inode->i_ctime = CURRENT_TIME_SEC;
++		mark_inode_dirty(inode);
++	}
++	return 0;
++}
++
+ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr)
+ {
+ 	struct inode *inode = dentry->d_inode;
+@@ -2949,9 +3001,11 @@ int reiserfs_setattr(struct dentry *dent
+ 	}
+ 
+ 	error = inode_change_ok(inode, attr);
++
+ 	if (!error) {
+ 		if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
+-		    (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {
++		    (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) ||
++		    (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) {
+ 			error = reiserfs_chown_xattrs(inode, attr);
+ 
+ 			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);
+Index: linux-2.6.20/fs/reiserfs/ioctl.c
+===================================================================
+--- linux-2.6.20.orig/fs/reiserfs/ioctl.c
++++ linux-2.6.20/fs/reiserfs/ioctl.c
+@@ -4,6 +4,7 @@
+ 
+ #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;
+ 
+ 	switch (cmd) {
+ 	case REISERFS_IOC_UNPACK:
+@@ -43,12 +44,14 @@ int reiserfs_ioctl(struct inode *inode, 
+ 
+ 		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 (IS_RDONLY(inode))
++			if (IS_RDONLY(inode) ||
++				(filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
+ 				return -EROFS;
+ 
+ 			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;
+ 
+-			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;
+Index: linux-2.6.20/fs/reiserfs/namei.c
+===================================================================
+--- linux-2.6.20.orig/fs/reiserfs/namei.c
++++ linux-2.6.20/fs/reiserfs/namei.c
+@@ -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,
+ 
+ };
+Index: linux-2.6.20/fs/reiserfs/stree.c
+===================================================================
+--- linux-2.6.20.orig/fs/reiserfs/stree.c
++++ linux-2.6.20/fs/reiserfs/stree.c
+@@ -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;
+ }
+Index: linux-2.6.20/fs/reiserfs/super.c
+===================================================================
+--- linux-2.6.20.orig/fs/reiserfs/super.c
++++ linux-2.6.20/fs/reiserfs/super.c
+@@ -137,7 +137,7 @@ static int remove_save_link_only(struct 
+ }
+ 
+ #ifdef CONFIG_QUOTA
+-static int reiserfs_quota_on_mount(struct super_block *, int);
++static int reiserfs_quota_on_mount(struct dqhash *, int);
+ #endif
+ 
+ /* look for uncompleted unlinks and truncates and complete them */
+@@ -177,7 +177,7 @@ static int finish_unfinished(struct supe
+ 	/* Turn on quotas so that they are updated correctly */
+ 	for (i = 0; i < MAXQUOTAS; i++) {
+ 		if (REISERFS_SB(s)->s_qf_names[i]) {
+-			int ret = reiserfs_quota_on_mount(s, i);
++			int ret = reiserfs_quota_on_mount(s->s_dqh, i);
+ 			if (ret < 0)
+ 				reiserfs_warning(s,
+ 						 "reiserfs: cannot turn on journalled quota: error %d",
+@@ -291,8 +291,8 @@ static int finish_unfinished(struct supe
+ #ifdef CONFIG_QUOTA
+ 	/* Turn quotas off */
+ 	for (i = 0; i < MAXQUOTAS; i++) {
+-		if (sb_dqopt(s)->files[i])
+-			vfs_quota_off_mount(s, i);
++		if (dqh_dqopt(s->s_dqh)->files[i])
++			vfs_quota_off_mount(s->s_dqh, i);
+ 	}
+ 	if (ms_active_set)
+ 		/* Restore the flag back */
+@@ -587,9 +587,9 @@ static void reiserfs_clear_inode(struct 
+ #endif
+ 
+ #ifdef CONFIG_QUOTA
+-static ssize_t reiserfs_quota_write(struct super_block *, int, const char *,
++static ssize_t reiserfs_quota_write(struct dqhash *, int, const char *,
+ 				    size_t, loff_t);
+-static ssize_t reiserfs_quota_read(struct super_block *, int, char *, size_t,
++static ssize_t reiserfs_quota_read(struct dqhash *, int, char *, size_t,
+ 				   loff_t);
+ #endif
+ 
+@@ -622,8 +622,8 @@ static int reiserfs_write_dquot(struct d
+ static int reiserfs_acquire_dquot(struct dquot *);
+ static int reiserfs_release_dquot(struct dquot *);
+ static int reiserfs_mark_dquot_dirty(struct dquot *);
+-static int reiserfs_write_info(struct super_block *, int);
+-static int reiserfs_quota_on(struct super_block *, int, int, char *);
++static int reiserfs_write_info(struct dqhash *, int);
++static int reiserfs_quota_on(struct dqhash *, int, int, char *);
+ 
+ static struct dquot_operations reiserfs_quota_operations = {
+ 	.initialize = reiserfs_dquot_initialize,
+@@ -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},
+@@ -981,7 +989,7 @@ static int reiserfs_parse_options(struct
+ 		if (c == 'u' || c == 'g') {
+ 			int qtype = c == 'u' ? USRQUOTA : GRPQUOTA;
+ 
+-			if (sb_any_quota_enabled(s)) {
++			if (dqh_any_quota_enabled(s->s_dqh)) {
+ 				reiserfs_warning(s,
+ 						 "reiserfs_parse_options: cannot change journalled quota options when quota turned on.");
+ 				return 0;
+@@ -1044,7 +1052,7 @@ static int reiserfs_parse_options(struct
+ 	}
+ 	/* This checking is not precise wrt the quota type but for our purposes it is sufficient */
+ 	if (!(*mount_options & (1 << REISERFS_QUOTA))
+-	    && sb_any_quota_enabled(s)) {
++	    && dqh_any_quota_enabled(s->s_dqh)) {
+ 		reiserfs_warning(s,
+ 				 "reiserfs_parse_options: quota options must be present when quota is turned on.");
+ 		return 0;
+@@ -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 */
+@@ -1336,7 +1350,7 @@ static int read_super_block(struct super
+ 	s->s_export_op = &reiserfs_export_ops;
+ #ifdef CONFIG_QUOTA
+ 	s->s_qcop = &reiserfs_qctl_operations;
+-	s->dq_op = &reiserfs_quota_operations;
++	s->s_qop = &reiserfs_quota_operations;
+ #endif
+ 
+ 	/* new format is limited by the 32 bit wide i_blocks field, want to
+@@ -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,
+@@ -1868,16 +1886,16 @@ static int reiserfs_write_dquot(struct d
+ 	struct reiserfs_transaction_handle th;
+ 	int ret, err;
+ 
+-	reiserfs_write_lock(dquot->dq_sb);
++	reiserfs_write_lock(dquot->dq_dqh->dqh_sb);
+ 	ret =
+-	    journal_begin(&th, dquot->dq_sb,
+-			  REISERFS_QUOTA_TRANS_BLOCKS(dquot->dq_sb));
++	    journal_begin(&th, dquot->dq_dqh->dqh_sb,
++		REISERFS_QUOTA_TRANS_BLOCKS(dquot->dq_dqh->dqh_sb));
+ 	if (ret)
+ 		goto out;
+ 	ret = dquot_commit(dquot);
+ 	err =
+-	    journal_end(&th, dquot->dq_sb,
+-			REISERFS_QUOTA_TRANS_BLOCKS(dquot->dq_sb));
++	    journal_end(&th, dquot->dq_dqh->dqh_sb,
++		REISERFS_QUOTA_TRANS_BLOCKS(dquot->dq_dqh->dqh_sb));
+ 	if (!ret && err)
+ 		ret = err;
+       out:
+@@ -1890,20 +1908,20 @@ static int reiserfs_acquire_dquot(struct
+ 	struct reiserfs_transaction_handle th;
+ 	int ret, err;
+ 
+-	reiserfs_write_lock(dquot->dq_sb);
++	reiserfs_write_lock(dquot->dq_dqh->dqh_sb);
+ 	ret =
+-	    journal_begin(&th, dquot->dq_sb,
+-			  REISERFS_QUOTA_INIT_BLOCKS(dquot->dq_sb));
++	    journal_begin(&th, dquot->dq_dqh->dqh_sb,
++		REISERFS_QUOTA_INIT_BLOCKS(dquot->dq_dqh->dqh_sb));
+ 	if (ret)
+ 		goto out;
+ 	ret = dquot_acquire(dquot);
+ 	err =
+-	    journal_end(&th, dquot->dq_sb,
+-			REISERFS_QUOTA_INIT_BLOCKS(dquot->dq_sb));
++	    journal_end(&th, dquot->dq_dqh->dqh_sb,
++		REISERFS_QUOTA_INIT_BLOCKS(dquot->dq_dqh->dqh_sb));
+ 	if (!ret && err)
+ 		ret = err;
+       out:
+-	reiserfs_write_unlock(dquot->dq_sb);
++	reiserfs_write_unlock(dquot->dq_dqh->dqh_sb);
+ 	return ret;
+ }
+ 
+@@ -1912,37 +1930,38 @@ static int reiserfs_release_dquot(struct
+ 	struct reiserfs_transaction_handle th;
+ 	int ret, err;
+ 
+-	reiserfs_write_lock(dquot->dq_sb);
++	reiserfs_write_lock(dquot->dq_dqh->dqh_sb);
+ 	ret =
+-	    journal_begin(&th, dquot->dq_sb,
+-			  REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_sb));
++	    journal_begin(&th, dquot->dq_dqh->dqh_sb,
++		REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_dqh->dqh_sb));
+ 	if (ret)
+ 		goto out;
+ 	ret = dquot_release(dquot);
+ 	err =
+-	    journal_end(&th, dquot->dq_sb,
+-			REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_sb));
++	    journal_end(&th, dquot->dq_dqh->dqh_sb,
++		REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_dqh->dqh_sb));
+ 	if (!ret && err)
+ 		ret = err;
+       out:
+-	reiserfs_write_unlock(dquot->dq_sb);
++	reiserfs_write_unlock(dquot->dq_dqh->dqh_sb);
+ 	return ret;
+ }
+ 
+ static int reiserfs_mark_dquot_dirty(struct dquot *dquot)
+ {
+ 	/* Are we journalling quotas? */
+-	if (REISERFS_SB(dquot->dq_sb)->s_qf_names[USRQUOTA] ||
+-	    REISERFS_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA]) {
++	if (REISERFS_SB(dquot->dq_dqh->dqh_sb)->s_qf_names[USRQUOTA] ||
++	    REISERFS_SB(dquot->dq_dqh->dqh_sb)->s_qf_names[GRPQUOTA]) {
+ 		dquot_mark_dquot_dirty(dquot);
+ 		return reiserfs_write_dquot(dquot);
+ 	} else
+ 		return dquot_mark_dquot_dirty(dquot);
+ }
+ 
+-static int reiserfs_write_info(struct super_block *sb, int type)
++static int reiserfs_write_info(struct dqhash *hash, int type)
+ {
+ 	struct reiserfs_transaction_handle th;
++	struct super_block *sb = hash->dqh_sb;
+ 	int ret, err;
+ 
+ 	/* Data block + inode block */
+@@ -1950,7 +1969,7 @@ static int reiserfs_write_info(struct su
+ 	ret = journal_begin(&th, sb, 2);
+ 	if (ret)
+ 		goto out;
+-	ret = dquot_commit_info(sb, type);
++	ret = dquot_commit_info(hash, type);
+ 	err = journal_end(&th, sb, 2);
+ 	if (!ret && err)
+ 		ret = err;
+@@ -1962,18 +1981,21 @@ static int reiserfs_write_info(struct su
+ /*
+  * Turn on quotas during mount time - we need to find the quota file and such...
+  */
+-static int reiserfs_quota_on_mount(struct super_block *sb, int type)
++static int reiserfs_quota_on_mount(struct dqhash *hash, int type)
+ {
+-	return vfs_quota_on_mount(sb, REISERFS_SB(sb)->s_qf_names[type],
++	struct super_block *sb = hash->dqh_sb;
++
++	return vfs_quota_on_mount(hash, REISERFS_SB(sb)->s_qf_names[type],
+ 				  REISERFS_SB(sb)->s_jquota_fmt, type);
+ }
+ 
+ /*
+  * Standard function to be called on quota_on
+  */
+-static int reiserfs_quota_on(struct super_block *sb, int type, int format_id,
++static int reiserfs_quota_on(struct dqhash *hash, int type, int format_id,
+ 			     char *path)
+ {
++	struct super_block *sb = hash->dqh_sb;
+ 	int err;
+ 	struct nameidata nd;
+ 
+@@ -1998,7 +2020,7 @@ static int reiserfs_quota_on(struct supe
+ 	if (!REISERFS_SB(sb)->s_qf_names[USRQUOTA] &&
+ 	    !REISERFS_SB(sb)->s_qf_names[GRPQUOTA]) {
+ 		path_release(&nd);
+-		return vfs_quota_on(sb, type, format_id, path);
++		return vfs_quota_on(hash, type, format_id, path);
+ 	}
+ 	/* Quotafile not of fs root? */
+ 	if (nd.dentry->d_parent->d_inode != sb->s_root->d_inode)
+@@ -2006,17 +2028,18 @@ static int reiserfs_quota_on(struct supe
+ 				 "reiserfs: Quota file not on filesystem root. "
+ 				 "Journalled quota will not work.");
+ 	path_release(&nd);
+-	return vfs_quota_on(sb, type, format_id, path);
++	return vfs_quota_on(hash, type, format_id, path);
+ }
+ 
+ /* Read data from quotafile - avoid pagecache and such because we cannot afford
+  * acquiring the locks... As quota files are never truncated and quota code
+  * itself serializes the operations (and noone else should touch the files)
+  * we don't have to be afraid of races */
+-static ssize_t reiserfs_quota_read(struct super_block *sb, int type, char *data,
++static ssize_t reiserfs_quota_read(struct dqhash *hash, int type, char *data,
+ 				   size_t len, loff_t off)
+ {
+-	struct inode *inode = sb_dqopt(sb)->files[type];
++	struct inode *inode = dqh_dqopt(hash)->files[type];
++	struct super_block *sb = hash->dqh_sb;
+ 	unsigned long blk = off >> sb->s_blocksize_bits;
+ 	int err = 0, offset = off & (sb->s_blocksize - 1), tocopy;
+ 	size_t toread;
+@@ -2058,10 +2081,11 @@ static ssize_t reiserfs_quota_read(struc
+ 
+ /* Write to quotafile (we know the transaction is already started and has
+  * enough credits) */
+-static ssize_t reiserfs_quota_write(struct super_block *sb, int type,
++static ssize_t reiserfs_quota_write(struct dqhash *hash, int type,
+ 				    const char *data, size_t len, loff_t off)
+ {
+-	struct inode *inode = sb_dqopt(sb)->files[type];
++	struct inode *inode = dqh_dqopt(hash)->files[type];
++	struct super_block *sb = hash->dqh_sb;
+ 	unsigned long blk = off >> sb->s_blocksize_bits;
+ 	int err = 0, offset = off & (sb->s_blocksize - 1), tocopy;
+ 	int journal_quota = REISERFS_SB(sb)->s_qf_names[type] != NULL;
+Index: linux-2.6.20/fs/reiserfs/xattr.c
+===================================================================
+--- linux-2.6.20.orig/fs/reiserfs/xattr.c
++++ linux-2.6.20/fs/reiserfs/xattr.c
+@@ -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 {
+Index: linux-2.6.20/fs/stat.c
+===================================================================
+--- linux-2.6.20.orig/fs/stat.c
++++ linux-2.6.20/fs/stat.c
+@@ -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;
+Index: linux-2.6.20/fs/super.c
+===================================================================
+--- linux-2.6.20.orig/fs/super.c
++++ linux-2.6.20/fs/super.c
+@@ -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>
+ 
+ 
+@@ -84,15 +87,14 @@ static struct super_block *alloc_super(s
+ 		s->s_count = S_BIAS;
+ 		atomic_set(&s->s_active, 1);
+ 		mutex_init(&s->s_vfs_rename_mutex);
+-		mutex_init(&s->s_dquot.dqio_mutex);
+-		mutex_init(&s->s_dquot.dqonoff_mutex);
+-		init_rwsem(&s->s_dquot.dqptr_sem);
+ 		init_waitqueue_head(&s->s_wait_unfrozen);
+ 		s->s_maxbytes = MAX_NON_LFS;
+-		s->dq_op = sb_dquot_ops;
++		s->s_qop = sb_dquot_ops;
+ 		s->s_qcop = sb_quotactl_ops;
+ 		s->s_op = &default_op;
+ 		s->s_time_gran = 1000000000;
++		/* quick hack to make dqhash id unique, sufficient for now */
++		s->s_dqh = new_dqhash(s, (unsigned long)s);
+ 	}
+ out:
+ 	return s;
+@@ -107,6 +109,7 @@ out:
+ static inline void destroy_super(struct super_block *s)
+ {
+ 	security_sb_free(s);
++	dqhput(s->s_dqh);
+ 	kfree(s);
+ }
+ 
+@@ -178,7 +181,7 @@ void deactivate_super(struct super_block
+ 	if (atomic_dec_and_lock(&s->s_active, &sb_lock)) {
+ 		s->s_count -= S_BIAS-1;
+ 		spin_unlock(&sb_lock);
+-		DQUOT_OFF(s);
++		DQUOT_OFF(s->s_dqh);
+ 		down_write(&s->s_umount);
+ 		fs->kill_sb(s);
+ 		put_filesystem(fs);
+@@ -247,7 +250,7 @@ EXPORT_SYMBOL(unlock_super);
+ void __fsync_super(struct super_block *sb)
+ {
+ 	sync_inodes_sb(sb, 0);
+-	DQUOT_SYNC(sb);
++	DQUOT_SYNC(sb->s_dqh);
+ 	lock_super(sb);
+ 	if (sb->s_dirt && sb->s_op->write_super)
+ 		sb->s_op->write_super(sb);
+@@ -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;
+ }
+Index: linux-2.6.20/fs/sysfs/mount.c
+===================================================================
+--- linux-2.6.20.orig/fs/sysfs/mount.c
++++ linux-2.6.20/fs/sysfs/mount.c
+@@ -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;
+Index: linux-2.6.20/fs/udf/super.c
+===================================================================
+--- linux-2.6.20.orig/fs/udf/super.c
++++ linux-2.6.20/fs/udf/super.c
+@@ -1576,7 +1576,7 @@ static int udf_fill_super(struct super_b
+ 
+ 	/* Fill in the rest of the superblock */
+ 	sb->s_op = &udf_sb_ops;
+-	sb->dq_op = NULL;
++	sb->s_qop = NULL;
+ 	sb->s_dirt = 0;
+ 	sb->s_magic = UDF_SUPER_MAGIC;
+ 	sb->s_time_gran = 1000;
+Index: linux-2.6.20/fs/ufs/super.c
+===================================================================
+--- linux-2.6.20.orig/fs/ufs/super.c
++++ linux-2.6.20/fs/ufs/super.c
+@@ -930,7 +930,7 @@ magic_found:
+ 	 * Read ufs_super_block into internal data structures
+ 	 */
+ 	sb->s_op = &ufs_super_ops;
+-	sb->dq_op = NULL; /***/
++	sb->s_qop = NULL; /***/
+ 	sb->s_magic = fs32_to_cpu(sb, usb3->fs_magic);
+ 
+ 	uspi->s_sblkno = fs32_to_cpu(sb, usb1->fs_sblkno);
+@@ -1248,8 +1248,8 @@ static void destroy_inodecache(void)
+ }
+ 
+ #ifdef CONFIG_QUOTA
+-static ssize_t ufs_quota_read(struct super_block *, int, char *,size_t, loff_t);
+-static ssize_t ufs_quota_write(struct super_block *, int, const char *, size_t, loff_t);
++static ssize_t ufs_quota_read(struct dqhash *, int, char *,size_t, loff_t);
++static ssize_t ufs_quota_write(struct dqhash *, int, const char *, size_t, loff_t);
+ #endif
+ 
+ static struct super_operations ufs_super_ops = {
+@@ -1274,10 +1274,11 @@ static struct super_operations ufs_super
+  * acquiring the locks... As quota files are never truncated and quota code
+  * itself serializes the operations (and noone else should touch the files)
+  * we don't have to be afraid of races */
+-static ssize_t ufs_quota_read(struct super_block *sb, int type, char *data,
++static ssize_t ufs_quota_read(struct dqhash *hash, int type, char *data,
+ 			       size_t len, loff_t off)
+ {
+-	struct inode *inode = sb_dqopt(sb)->files[type];
++	struct inode *inode = dqh_dqopt(hash)->files[type];
++	struct super_block *sb = hash->dqh_sb;
+ 	sector_t blk = off >> sb->s_blocksize_bits;
+ 	int err = 0;
+ 	int offset = off & (sb->s_blocksize - 1);
+@@ -1313,10 +1314,11 @@ static ssize_t ufs_quota_read(struct sup
+ }
+ 
+ /* Write to quotafile */
+-static ssize_t ufs_quota_write(struct super_block *sb, int type,
++static ssize_t ufs_quota_write(struct dqhash *hash, int type,
+ 				const char *data, size_t len, loff_t off)
+ {
+-	struct inode *inode = sb_dqopt(sb)->files[type];
++	struct inode *inode = dqh_dqopt(hash)->files[type];
++	struct super_block *sb = hash->dqh_sb;
+ 	sector_t blk = off >> sb->s_blocksize_bits;
+ 	int err = 0;
+ 	int offset = off & (sb->s_blocksize - 1);
+Index: linux-2.6.20/fs/utimes.c
+===================================================================
+--- linux-2.6.20.orig/fs/utimes.c
++++ linux-2.6.20/fs/utimes.c
+@@ -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;
+Index: linux-2.6.20/fs/xattr.c
+===================================================================
+--- linux-2.6.20.orig/fs/xattr.c
++++ linux-2.6.20/fs/xattr.c
+@@ -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;
+ }
+Index: linux-2.6.20/fs/xfs/linux-2.6/xfs_file.c
+===================================================================
+--- linux-2.6.20.orig/fs/xfs/linux-2.6/xfs_file.c
++++ linux-2.6.20/fs/xfs/linux-2.6/xfs_file.c
+@@ -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,
+Index: linux-2.6.20/fs/xfs/linux-2.6/xfs_ioctl.c
+===================================================================
+--- linux-2.6.20.orig/fs/xfs/linux-2.6/xfs_ioctl.c
++++ linux-2.6.20/fs/xfs/linux-2.6/xfs_ioctl.c
+@@ -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)
+Index: linux-2.6.20/fs/xfs/linux-2.6/xfs_iops.c
+===================================================================
+--- linux-2.6.20.orig/fs/xfs/linux-2.6/xfs_iops.c
++++ linux-2.6.20/fs/xfs/linux-2.6/xfs_iops.c
+@@ -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,
+ };
+Index: linux-2.6.20/fs/xfs/linux-2.6/xfs_linux.h
+===================================================================
+--- linux-2.6.20.orig/fs/xfs/linux-2.6/xfs_linux.h
++++ linux-2.6.20/fs/xfs/linux-2.6/xfs_linux.h
+@@ -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))
+Index: linux-2.6.20/fs/xfs/linux-2.6/xfs_super.c
+===================================================================
+--- linux-2.6.20.orig/fs/xfs/linux-2.6/xfs_super.c
++++ linux-2.6.20/fs/xfs/linux-2.6/xfs_super.c
+@@ -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));
+@@ -732,36 +747,40 @@ xfs_fs_show_options(
+ 
+ STATIC int
+ xfs_fs_quotasync(
+-	struct super_block	*sb,
++	struct dqhash		*hash,
+ 	int			type)
+ {
++	struct super_block	*sb = hash->dqh_sb;
+ 	return -bhv_vfs_quotactl(vfs_from_sb(sb), Q_XQUOTASYNC, 0, NULL);
+ }
+ 
+ STATIC int
+ xfs_fs_getxstate(
+-	struct super_block	*sb,
++	struct dqhash		*hash,
+ 	struct fs_quota_stat	*fqs)
+ {
++	struct super_block	*sb = hash->dqh_sb;
+ 	return -bhv_vfs_quotactl(vfs_from_sb(sb), Q_XGETQSTAT, 0, (caddr_t)fqs);
+ }
+ 
+ STATIC int
+ xfs_fs_setxstate(
+-	struct super_block	*sb,
++	struct dqhash		*hash,
+ 	unsigned int		flags,
+ 	int			op)
+ {
++	struct super_block	*sb = hash->dqh_sb;
+ 	return -bhv_vfs_quotactl(vfs_from_sb(sb), op, 0, (caddr_t)&flags);
+ }
+ 
+ STATIC int
+ xfs_fs_getxquota(
+-	struct super_block	*sb,
++	struct dqhash		*hash,
+ 	int			type,
+ 	qid_t			id,
+ 	struct fs_disk_quota	*fdq)
+ {
++	struct super_block	*sb = hash->dqh_sb;
+ 	return -bhv_vfs_quotactl(vfs_from_sb(sb),
+ 				 (type == USRQUOTA) ? Q_XGETQUOTA :
+ 				  ((type == GRPQUOTA) ? Q_XGETGQUOTA :
+@@ -770,11 +789,12 @@ xfs_fs_getxquota(
+ 
+ STATIC int
+ xfs_fs_setxquota(
+-	struct super_block	*sb,
++	struct dqhash		*hash,
+ 	int			type,
+ 	qid_t			id,
+ 	struct fs_disk_quota	*fdq)
+ {
++	struct super_block	*sb = hash->dqh_sb;
+ 	return -bhv_vfs_quotactl(vfs_from_sb(sb),
+ 				 (type == USRQUOTA) ? Q_XSETQLIM :
+ 				  ((type == GRPQUOTA) ? Q_XSETGQLIM :
+@@ -804,6 +824,9 @@ xfs_fs_fill_super(
+ 	sb_min_blocksize(sb, BBSIZE);
+ 	sb->s_export_op = &xfs_export_operations;
+ 	sb->s_qcop = &xfs_quotactl_operations;
++#ifdef CONFIG_QUOTACTL
++	sb->s_dqh->dqh_qcop = &xfs_quotactl_operations;
++#endif
+ 	sb->s_op = &xfs_super_operations;
+ 
+ 	error = bhv_vfs_mount(vfsp, args, NULL);
+Index: linux-2.6.20/fs/xfs/linux-2.6/xfs_sysctl.c
+===================================================================
+--- linux-2.6.20.orig/fs/xfs/linux-2.6/xfs_sysctl.c
++++ linux-2.6.20/fs/xfs/linux-2.6/xfs_sysctl.c
+@@ -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 */
+ 
+Index: linux-2.6.20/fs/xfs/linux-2.6/xfs_vnode.c
+===================================================================
+--- linux-2.6.20.orig/fs/xfs/linux-2.6/xfs_vnode.c
++++ linux-2.6.20/fs/xfs/linux-2.6/xfs_vnode.c
+@@ -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
+Index: linux-2.6.20/fs/xfs/linux-2.6/xfs_vnode.h
+===================================================================
+--- linux-2.6.20.orig/fs/xfs/linux-2.6/xfs_vnode.h
++++ linux-2.6.20/fs/xfs/linux-2.6/xfs_vnode.h
+@@ -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|\
+Index: linux-2.6.20/fs/xfs/quota/xfs_qm_syscalls.c
+===================================================================
+--- linux-2.6.20.orig/fs/xfs/quota/xfs_qm_syscalls.c
++++ linux-2.6.20/fs/xfs/quota/xfs_qm_syscalls.c
+@@ -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 &
+Index: linux-2.6.20/fs/xfs/xfs_clnt.h
+===================================================================
+--- linux-2.6.20.orig/fs/xfs/xfs_clnt.h
++++ linux-2.6.20/fs/xfs/xfs_clnt.h
+@@ -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__ */
+Index: linux-2.6.20/fs/xfs/xfs_dinode.h
+===================================================================
+--- linux-2.6.20.orig/fs/xfs/xfs_dinode.h
++++ linux-2.6.20/fs/xfs/xfs_dinode.h
+@@ -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__ */
+Index: linux-2.6.20/fs/xfs/xfs_fs.h
+===================================================================
+--- linux-2.6.20.orig/fs/xfs/xfs_fs.h
++++ linux-2.6.20/fs/xfs/xfs_fs.h
+@@ -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	*/
+Index: linux-2.6.20/fs/xfs/xfs_inode.c
+===================================================================
+--- linux-2.6.20.orig/fs/xfs/xfs_inode.c
++++ linux-2.6.20/fs/xfs/xfs_inode.c
+@@ -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));
+ 
+Index: linux-2.6.20/fs/xfs/xfs_itable.c
+===================================================================
+--- linux-2.6.20.orig/fs/xfs/xfs_itable.c
++++ linux-2.6.20/fs/xfs/xfs_itable.c
+@@ -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);
+Index: linux-2.6.20/fs/xfs/xfs_mount.h
+===================================================================
+--- linux-2.6.20.orig/fs/xfs/xfs_mount.h
++++ linux-2.6.20/fs/xfs/xfs_mount.h
+@@ -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.
+Index: linux-2.6.20/fs/xfs/xfs_vfsops.c
+===================================================================
+--- linux-2.6.20.orig/fs/xfs/xfs_vfsops.c
++++ linux-2.6.20/fs/xfs/xfs_vfsops.c
+@@ -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,
+Index: linux-2.6.20/fs/xfs/xfs_vnodeops.c
+===================================================================
+--- linux-2.6.20.orig/fs/xfs/xfs_vnodeops.c
++++ linux-2.6.20/fs/xfs/xfs_vnodeops.c
+@@ -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;
+ 
++		/* TODO: 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)) {
++		/* TODO: 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)) {
++			/* TODO: 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,12 @@ xfs_setattr(
+ 		 * Change the ownerships and register quota modifications
+ 		 * in the transaction.
+ 		 */
++		if (itag != tag) {
++			if (XFS_IS_GQUOTA_ON(mp)) {
++				/* FIXME: handle tag quota? */
++			}
++			ip->i_d.di_tag = tag;
++		}
+ 		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)
+Index: linux-2.6.20/include/asm-alpha/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-alpha/socket.h
++++ linux-2.6.20/include/asm-alpha/socket.h
+@@ -52,6 +52,7 @@
+ 
+ #define SO_PEERSEC		30
+ #define SO_PASSSEC		34
++#define SO_PEERTAG		35
+ 
+ /* Security levels - as per NRL IPv6 - don't actually do anything */
+ #define SO_SECURITY_AUTHENTICATION		19
+Index: linux-2.6.20/include/asm-arm/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-arm/socket.h
++++ linux-2.6.20/include/asm-arm/socket.h
+@@ -49,5 +49,6 @@
+ 
+ #define SO_PEERSEC		31
+ #define SO_PASSSEC		34
++#define SO_PEERTAG		35
+ 
+ #endif /* _ASM_SOCKET_H */
+Index: linux-2.6.20/include/asm-arm/tlb.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-arm/tlb.h
++++ linux-2.6.20/include/asm-arm/tlb.h
+@@ -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
+Index: linux-2.6.20/include/asm-arm26/tlb.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-arm26/tlb.h
++++ linux-2.6.20/include/asm-arm26/tlb.h
+@@ -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
+Index: linux-2.6.20/include/asm-arm26/unistd.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-arm26/unistd.h
++++ linux-2.6.20/include/asm-arm26/unistd.h
+@@ -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
+  */
+Index: linux-2.6.20/include/asm-cris/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-cris/socket.h
++++ linux-2.6.20/include/asm-cris/socket.h
+@@ -51,6 +51,7 @@
+ 
+ #define SO_PEERSEC             31
+ #define SO_PASSSEC		34
++#define SO_PEERTAG		35
+ 
+ #endif /* _ASM_SOCKET_H */
+ 
+Index: linux-2.6.20/include/asm-frv/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-frv/socket.h
++++ linux-2.6.20/include/asm-frv/socket.h
+@@ -49,6 +49,7 @@
+ 
+ #define SO_PEERSEC		31
+ #define SO_PASSSEC		34
++#define SO_PEERTAG		35
+ 
+ #endif /* _ASM_SOCKET_H */
+ 
+Index: linux-2.6.20/include/asm-generic/tlb.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-generic/tlb.h
++++ linux-2.6.20/include/asm-generic/tlb.h
+@@ -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>
+ 
+Index: linux-2.6.20/include/asm-h8300/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-h8300/socket.h
++++ linux-2.6.20/include/asm-h8300/socket.h
+@@ -49,5 +49,6 @@
+ 
+ #define SO_PEERSEC		31
+ #define SO_PASSSEC		34
++#define SO_PEERTAG		35
+ 
+ #endif /* _ASM_SOCKET_H */
+Index: linux-2.6.20/include/asm-i386/elf.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-i386/elf.h
++++ linux-2.6.20/include/asm-i386/elf.h
+@@ -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) */
+Index: linux-2.6.20/include/asm-i386/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-i386/socket.h
++++ linux-2.6.20/include/asm-i386/socket.h
+@@ -49,5 +49,6 @@
+ 
+ #define SO_PEERSEC		31
+ #define SO_PASSSEC		34
++#define SO_PEERTAG		35
+ 
+ #endif /* _ASM_SOCKET_H */
+Index: linux-2.6.20/include/asm-ia64/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-ia64/socket.h
++++ linux-2.6.20/include/asm-ia64/socket.h
+@@ -58,5 +58,6 @@
+ 
+ #define SO_PEERSEC             31
+ #define SO_PASSSEC		34
++#define SO_PEERTAG		35
+ 
+ #endif /* _ASM_IA64_SOCKET_H */
+Index: linux-2.6.20/include/asm-ia64/tlb.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-ia64/tlb.h
++++ linux-2.6.20/include/asm-ia64/tlb.h
+@@ -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>
+Index: linux-2.6.20/include/asm-m32r/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-m32r/socket.h
++++ linux-2.6.20/include/asm-m32r/socket.h
+@@ -49,5 +49,6 @@
+ 
+ #define SO_PEERSEC		31
+ #define SO_PASSSEC		34
++#define SO_PEERTAG		35
+ 
+ #endif /* _ASM_M32R_SOCKET_H */
+Index: linux-2.6.20/include/asm-mips/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-mips/socket.h
++++ linux-2.6.20/include/asm-mips/socket.h
+@@ -70,6 +70,7 @@ To add: #define SO_REUSEPORT 0x0200	/* A
+ #define SO_SNDBUFFORCE		31
+ #define SO_RCVBUFFORCE		33
+ #define SO_PASSSEC		34
++#define SO_PEERTAG		35
+ 
+ #ifdef __KERNEL__
+ 
+Index: linux-2.6.20/include/asm-parisc/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-parisc/socket.h
++++ linux-2.6.20/include/asm-parisc/socket.h
+@@ -49,5 +49,6 @@
+ 
+ #define SO_PEERSEC		0x401d
+ #define SO_PASSSEC		0x401e
++#define SO_PEERTAG		0x401f
+ 
+ #endif /* _ASM_SOCKET_H */
+Index: linux-2.6.20/include/asm-powerpc/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-powerpc/socket.h
++++ linux-2.6.20/include/asm-powerpc/socket.h
+@@ -56,5 +56,6 @@
+ 
+ #define SO_PEERSEC		31
+ #define SO_PASSSEC		34
++#define SO_PEERTAG		35
+ 
+ #endif	/* _ASM_POWERPC_SOCKET_H */
+Index: linux-2.6.20/include/asm-powerpc/systbl.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-powerpc/systbl.h
++++ linux-2.6.20/include/asm-powerpc/systbl.h
+@@ -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)
+Index: linux-2.6.20/include/asm-powerpc/unistd.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-powerpc/unistd.h
++++ linux-2.6.20/include/asm-powerpc/unistd.h
+@@ -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
+Index: linux-2.6.20/include/asm-s390/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-s390/socket.h
++++ linux-2.6.20/include/asm-s390/socket.h
+@@ -57,5 +57,6 @@
+ 
+ #define SO_PEERSEC		31
+ #define SO_PASSSEC		34
++#define SO_PEERTAG		35
+ 
+ #endif /* _ASM_SOCKET_H */
+Index: linux-2.6.20/include/asm-s390/unistd.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-s390/unistd.h
++++ linux-2.6.20/include/asm-s390/unistd.h
+@@ -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
+Index: linux-2.6.20/include/asm-sh/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-sh/socket.h
++++ linux-2.6.20/include/asm-sh/socket.h
+@@ -49,5 +49,6 @@
+ 
+ #define SO_PEERSEC		31
+ #define SO_PASSSEC		34
++#define SO_PEERTAG		35
+ 
+ #endif /* __ASM_SH_SOCKET_H */
+Index: linux-2.6.20/include/asm-sparc/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-sparc/socket.h
++++ linux-2.6.20/include/asm-sparc/socket.h
+@@ -49,6 +49,7 @@
+ 
+ #define SO_PEERSEC		0x001e
+ #define SO_PASSSEC		0x001f
++#define SO_PEERTAG		0x0200
+ 
+ /* Security levels - as per NRL IPv6 - don't actually do anything */
+ #define SO_SECURITY_AUTHENTICATION		0x5001
+Index: linux-2.6.20/include/asm-sparc/unistd.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-sparc/unistd.h
++++ linux-2.6.20/include/asm-sparc/unistd.h
+@@ -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
+Index: linux-2.6.20/include/asm-sparc64/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-sparc64/socket.h
++++ linux-2.6.20/include/asm-sparc64/socket.h
+@@ -49,6 +49,7 @@
+ 
+ #define SO_PEERSEC		0x001e
+ #define SO_PASSSEC		0x001f
++#define SO_PEERTAG		0x0200
+ 
+ /* Security levels - as per NRL IPv6 - don't actually do anything */
+ #define SO_SECURITY_AUTHENTICATION		0x5001
+Index: linux-2.6.20/include/asm-sparc64/tlb.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-sparc64/tlb.h
++++ linux-2.6.20/include/asm-sparc64/tlb.h
+@@ -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>
+Index: linux-2.6.20/include/asm-sparc64/unistd.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-sparc64/unistd.h
++++ linux-2.6.20/include/asm-sparc64/unistd.h
+@@ -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
+Index: linux-2.6.20/include/asm-v850/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-v850/socket.h
++++ linux-2.6.20/include/asm-v850/socket.h
+@@ -49,5 +49,6 @@
+ 
+ #define SO_PEERSEC		31
+ #define SO_PASSSEC		34
++#define SO_PEERTAG		35
+ 
+ #endif /* __V850_SOCKET_H__ */
+Index: linux-2.6.20/include/asm-x86_64/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-x86_64/socket.h
++++ linux-2.6.20/include/asm-x86_64/socket.h
+@@ -49,5 +49,6 @@
+ 
+ #define SO_PEERSEC             31
+ #define SO_PASSSEC		34
++#define SO_PEERTAG		35
+ 
+ #endif /* _ASM_SOCKET_H */
+Index: linux-2.6.20/include/asm-x86_64/unistd.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-x86_64/unistd.h
++++ linux-2.6.20/include/asm-x86_64/unistd.h
+@@ -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
+Index: linux-2.6.20/include/asm-xtensa/socket.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-xtensa/socket.h
++++ linux-2.6.20/include/asm-xtensa/socket.h
+@@ -60,5 +60,6 @@
+ #define SO_ACCEPTCONN		30
+ #define SO_PEERSEC		31
+ #define SO_PASSSEC		34
++#define SO_PEERTAG		35
+ 
+ #endif	/* _XTENSA_SOCKET_H */
+Index: linux-2.6.20/include/linux/Kbuild
+===================================================================
+--- linux-2.6.20.orig/include/linux/Kbuild
++++ linux-2.6.20/include/linux/Kbuild
+@@ -339,3 +339,6 @@ unifdef-y += wireless.h
+ unifdef-y += xfrm.h
+ 
+ objhdr-y += version.h
++
++header-y += vserver/
++
+Index: linux-2.6.20/include/linux/capability.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/capability.h
++++ linux-2.6.20/include/linux/capability.h
+@@ -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
+Index: linux-2.6.20/include/linux/devpts_fs.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/devpts_fs.h
++++ linux-2.6.20/include/linux/devpts_fs.h
+@@ -30,5 +30,7 @@ static inline void devpts_pty_kill(int n
+ 
+ #endif
+ 
++#define DEVPTS_SUPER_MAGIC	0x00001cd1
++
+ 
+ #endif /* _LINUX_DEVPTS_FS_H */
+Index: linux-2.6.20/include/linux/ext2_fs.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/ext2_fs.h
++++ linux-2.6.20/include/linux/ext2_fs.h
+@@ -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
+Index: linux-2.6.20/include/linux/ext3_fs.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/ext3_fs.h
++++ linux-2.6.20/include/linux/ext3_fs.h
+@@ -177,6 +177,8 @@ 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 */
+ 
+ #define EXT3_FL_USER_VISIBLE		0x0003DFFF /* User visible flags */
+@@ -296,7 +298,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 +332,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 +387,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 +816,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);
+Index: linux-2.6.20/include/linux/ext3_jbd.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/ext3_jbd.h
++++ linux-2.6.20/include/linux/ext3_jbd.h
+@@ -77,10 +77,10 @@
+ #define EXT3_QUOTA_TRANS_BLOCKS(sb) (test_opt(sb, QUOTA) ? 2 : 0)
+ /* Amount of blocks needed for quota insert/delete - we do some block writes
+  * but inode, sb and group updates are done only once */
+-#define EXT3_QUOTA_INIT_BLOCKS(sb) (test_opt(sb, QUOTA) ? (DQUOT_INIT_ALLOC*\
+-		(EXT3_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_INIT_REWRITE) : 0)
+-#define EXT3_QUOTA_DEL_BLOCKS(sb) (test_opt(sb, QUOTA) ? (DQUOT_DEL_ALLOC*\
+-		(EXT3_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_DEL_REWRITE) : 0)
++#define EXT3_QUOTA_INIT_BLOCKS(sb) (test_opt(sb, QUOTA) ? \
++	(DQUOT_INIT_ALLOC*(EXT3_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_INIT_REWRITE) : 0)
++#define EXT3_QUOTA_DEL_BLOCKS(sb) (test_opt(sb, QUOTA) ? \
++	(DQUOT_DEL_ALLOC*(EXT3_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_DEL_REWRITE) : 0)
+ #else
+ #define EXT3_QUOTA_TRANS_BLOCKS(sb) 0
+ #define EXT3_QUOTA_INIT_BLOCKS(sb) 0
+Index: linux-2.6.20/include/linux/ext4_fs.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/ext4_fs.h
++++ linux-2.6.20/include/linux/ext4_fs.h
+@@ -189,8 +189,10 @@ 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 */
+ 
+ #define EXT4_FL_USER_VISIBLE		0x000BDFFF /* User visible flags */
+ #define EXT4_FL_USER_MODIFIABLE		0x000380FF /* User modifiable flags */
+@@ -312,7 +314,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 +347,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 +404,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 +848,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);
+Index: linux-2.6.20/include/linux/fs.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/fs.h
++++ linux-2.6.20/include/linux/fs.h
+@@ -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,12 +269,13 @@ 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 */
+ 
+ #define FS_FL_USER_VISIBLE		0x0003DFFF /* User visible flags */
+ #define FS_FL_USER_MODIFIABLE		0x000380FF /* User modifiable flags */
+ 
+-
+ #define SYNC_FILE_RANGE_WAIT_BEFORE	1
+ #define SYNC_FILE_RANGE_WRITE		2
+ #define SYNC_FILE_RANGE_WAIT_AFTER	4
+@@ -324,6 +341,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 +357,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 +371,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 +556,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;
+@@ -556,6 +579,9 @@ struct inode {
+ 	struct file_lock	*i_flock;
+ 	struct address_space	*i_mapping;
+ 	struct address_space	i_data;
++#ifdef CONFIG_QUOTACTL
++	struct dqhash		*i_dqh;
++#endif
+ #ifdef CONFIG_QUOTA
+ 	struct dquot		*i_dquot[MAXQUOTAS];
+ #endif
+@@ -724,6 +750,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 +833,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 */
+@@ -907,7 +935,7 @@ struct super_block {
+ 	unsigned long long	s_maxbytes;	/* Max file size */
+ 	struct file_system_type	*s_type;
+ 	struct super_operations	*s_op;
+-	struct dquot_operations	*dq_op;
++	struct dquot_operations	*s_qop;
+  	struct quotactl_ops	*s_qcop;
+ 	struct export_operations *s_export_op;
+ 	unsigned long		s_flags;
+@@ -932,7 +960,7 @@ struct super_block {
+ 
+ 	struct block_device	*s_bdev;
+ 	struct list_head	s_instances;
+-	struct quota_info	s_dquot;	/* Diskquota specific options */
++	struct dqhash		*s_dqh;		/* Diskquota hash */
+ 
+ 	int			s_frozen;
+ 	wait_queue_head_t	s_wait_unfrozen;
+@@ -979,12 +1007,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 +1152,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 +1168,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
+@@ -1168,8 +1198,8 @@ struct super_operations {
+ 	int (*show_options)(struct seq_file *, struct vfsmount *);
+ 	int (*show_stats)(struct seq_file *, struct vfsmount *);
+ #ifdef CONFIG_QUOTA
+-	ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);
+-	ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
++	ssize_t (*quota_read)(struct dqhash *, int, char *, size_t, loff_t);
++	ssize_t (*quota_write)(struct dqhash *, int, const char *, size_t, loff_t);
+ #endif
+ };
+ 
+@@ -1681,7 +1711,7 @@ extern struct inode *new_inode(struct su
+ extern int __remove_suid(struct dentry *, int);
+ extern int should_remove_suid(struct dentry *);
+ extern int remove_suid(struct dentry *);
+-extern void remove_dquot_ref(struct super_block *, int, struct list_head *);
++extern void remove_dquot_ref(struct dqhash *, int, struct list_head *);
+ 
+ extern void __insert_inode_hash(struct inode *, unsigned long hashval);
+ extern void remove_inode_hash(struct inode *);
+@@ -1717,6 +1747,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 +1881,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 *);
+Index: linux-2.6.20/include/linux/init_task.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/init_task.h
++++ linux-2.6.20/include/linux/init_task.h
+@@ -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,						\
+ }
+ 
+ 
+Index: linux-2.6.20/include/linux/ipc.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/ipc.h
++++ linux-2.6.20/include/linux/ipc.h
+@@ -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; 
+Index: linux-2.6.20/include/linux/jffs2.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/jffs2.h
++++ linux-2.6.20/include/linux/jffs2.h
+@@ -82,12 +82,36 @@
+ //#define JFFS2_NODETYPE_OPTIONS (JFFS2_FEATURE_RWCOMPAT_COPY | JFFS2_NODE_ACCURATE | 4)
+ 
+ 
+-#define JFFS2_INO_FLAG_PREREAD	  1	/* Do read_inode() for this one at
++#define JFFS2_INO_FLAG_PREREAD	  0x01	/* Do read_inode() for this one at
+ 					   mount time, don't wait for it to
+ 					   happen later */
+-#define JFFS2_INO_FLAG_USERCOMPR  2	/* User has requested a specific
++#define JFFS2_INO_FLAG_USERCOMPR  0x02	/* User has requested a specific
+ 					   compression type */
+ 
++#define JFFS2_INO_FLAG_IMMUTABLE  0x10	/* immutable node */
++#define JFFS2_INO_FLAG_IUNLINK	  0x20	/* immutable unlink */
++#define JFFS2_INO_FLAG_BARRIER	  0x40	/* barrier */
++
++#define	JFFS2_USER_VISIBLE	  0x10
++#define	JFFS2_USER_MODIFIABLE	  0x10
++
++/*
++ * Mount flags
++ */
++#define JFFS2_MOUNT_TAGGED	(1<<24)	  /* Enable Context Tags */
++
++#define clear_opt(o, opt)	o &= ~JFFS2_MOUNT_##opt
++#define set_opt(o, opt)		o |= JFFS2_MOUNT_##opt
++
++/*
++ * Maximal mount counts between two filesystem checks
++ */
++#define EXT2_DFL_MAX_MNT_COUNT		20	/* Allow 20 mounts */
++#define EXT2_DFL_CHECKINTERVAL		0	/* Don't use interval check */
++
++/*
++ * Behaviour when detecting errors
++ */
+ 
+ /* These can go once we've made sure we've caught all uses without
+    byteswapping */
+@@ -97,7 +121,7 @@ typedef struct {
+ } __attribute__((packed)) jint32_t;
+ 
+ typedef struct {
+-	uint32_t m;
++	uint16_t m;
+ } __attribute__((packed)) jmode_t;
+ 
+ typedef struct {
+@@ -145,7 +169,8 @@ struct jffs2_raw_inode
+ 	jint32_t hdr_crc;
+ 	jint32_t ino;        /* Inode number.  */
+ 	jint32_t version;    /* Version number.  */
+-	jmode_t mode;       /* The file's type or mode.  */
++	jmode_t mode;        /* The file's type or mode.  */
++	jint16_t tag;	     /* context tagging */
+ 	jint16_t uid;        /* The file's owner.  */
+ 	jint16_t gid;        /* The file's group.  */
+ 	jint32_t isize;      /* Total resultant size of this inode (used for truncations)  */
+Index: linux-2.6.20/include/linux/loop.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/loop.h
++++ linux-2.6.20/include/linux/loop.h
+@@ -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); 
+ 
+Index: linux-2.6.20/include/linux/major.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/major.h
++++ linux-2.6.20/include/linux/major.h
+@@ -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
+Index: linux-2.6.20/include/linux/mount.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/mount.h
++++ linux-2.6.20/include/linux/mount.h
+@@ -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)
+Index: linux-2.6.20/include/linux/net.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/net.h
++++ linux-2.6.20/include/linux/net.h
+@@ -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
+ /**
+Index: linux-2.6.20/include/linux/nfs_mount.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/nfs_mount.h
++++ linux-2.6.20/include/linux/nfs_mount.h
+@@ -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
+Index: linux-2.6.20/include/linux/nsproxy.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/nsproxy.h
++++ linux-2.6.20/include/linux/nsproxy.h
+@@ -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)) {
+Index: linux-2.6.20/include/linux/percpu.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/percpu.h
++++ linux-2.6.20/include/linux/percpu.h
+@@ -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
+ 
+ /*
+Index: linux-2.6.20/include/linux/pid.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/pid.h
++++ linux-2.6.20/include/linux/pid.h
+@@ -8,7 +8,8 @@ enum pid_type
+ 	PIDTYPE_PID,
+ 	PIDTYPE_PGID,
+ 	PIDTYPE_SID,
+-	PIDTYPE_MAX
++	PIDTYPE_MAX,
++	PIDTYPE_REALPID
+ };
+ 
+ /*
+@@ -112,7 +113,8 @@ static inline pid_t pid_nr(struct pid *p
+ 		struct pid *pid___ = find_pid(who);			\
+ 		if (pid___ != NULL)					\
+ 			hlist_for_each_entry_rcu((task), pos___,	\
+-				&pid___->tasks[type], pids[type].node) {
++				&pid___->tasks[type], pids[type].node)	\
++			if (vx_check((task)->xid, VS_ADMIN_P|VS_IDENT)) {
+ 
+ #define while_each_task_pid(who, type, task)				\
+ 			}						\
+@@ -124,7 +126,8 @@ static inline pid_t pid_nr(struct pid *p
+ 		struct hlist_node *pos___;				\
+ 		if (pid != NULL)					\
+ 			hlist_for_each_entry_rcu((task), pos___,	\
+-				&pid->tasks[type], pids[type].node) {
++				&pid->tasks[type], pids[type].node)	\
++			if (vx_check((task)->xid, VS_ADMIN_P|VS_IDENT)) {
+ 
+ #define while_each_pid_task(pid, type, task)				\
+ 			}						\
+Index: linux-2.6.20/include/linux/proc_fs.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/proc_fs.h
++++ linux-2.6.20/include/linux/proc_fs.h
+@@ -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;
+Index: linux-2.6.20/include/linux/quota.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/quota.h
++++ linux-2.6.20/include/linux/quota.h
+@@ -55,6 +55,13 @@ extern spinlock_t dq_data_lock;
+ #define kb2qb(x) ((x) >> (QUOTABLOCK_BITS-10))
+ #define toqb(x) (((x) + QUOTABLOCK_SIZE - 1) >> QUOTABLOCK_BITS)
+ 
++/* are NULL dqhash ptrs valid? */
++#ifdef HANDLE_DQHASH_NULL
++#define	dqhash_valid(hash)      ((hash) != NULL)
++#else
++#define	dqhash_valid(hash)      (0 == 0)
++#endif
++
+ #define MAXQUOTAS 2
+ #define USRQUOTA  0		/* element used for user quotas */
+ #define GRPQUOTA  1		/* element used for group quotas */
+@@ -176,19 +183,20 @@ struct mem_dqinfo {
+ 	} u;
+ };
+ 
+-struct super_block;
++struct dqhash;
+ 
+ #define DQF_MASK 0xffff		/* Mask for format specific flags */
+ #define DQF_INFO_DIRTY_B 16
+ #define DQF_INFO_DIRTY (1 << DQF_INFO_DIRTY_B)	/* Is info dirty? */
+ 
+-extern void mark_info_dirty(struct super_block *sb, int type);
++extern void mark_info_dirty(struct dqhash *hash, int type);
++
+ #define info_dirty(info) test_bit(DQF_INFO_DIRTY_B, &(info)->dqi_flags)
+ #define info_any_dquot_dirty(info) (!list_empty(&(info)->dqi_dirty_list))
+ #define info_any_dirty(info) (info_dirty(info) || info_any_dquot_dirty(info))
+ 
+-#define sb_dqopt(sb) (&(sb)->s_dquot)
+-#define sb_dqinfo(sb, type) (sb_dqopt(sb)->info+(type))
++#define dqh_dqopt(hash) (&(hash)->dqh_dqopt)
++#define dqh_dqinfo(hash, type) (dqh_dqopt(hash)->info+(type))
+ 
+ struct dqstats {
+ 	int lookups;
+@@ -218,7 +226,7 @@ struct dquot {
+ 	struct mutex dq_lock;		/* dquot IO lock */
+ 	atomic_t dq_count;		/* Use count */
+ 	wait_queue_head_t dq_wait_unused;	/* Wait queue for dquot to become unused */
+-	struct super_block *dq_sb;	/* superblock this applies to */
++	struct dqhash *dq_dqh;		/* quota hash backpointer */
+ 	unsigned int dq_id;		/* ID this applies to (uid, gid) */
+ 	loff_t dq_off;			/* Offset of dquot on disk */
+ 	unsigned long dq_flags;		/* See DQ_* */
+@@ -233,13 +241,14 @@ struct dquot {
+ 
+ /* Operations which must be implemented by each quota format */
+ struct quota_format_ops {
+-	int (*check_quota_file)(struct super_block *sb, int type);	/* Detect whether file is in our format */
+-	int (*read_file_info)(struct super_block *sb, int type);	/* Read main info about file - called on quotaon() */
+-	int (*write_file_info)(struct super_block *sb, int type);	/* Write main info about file */
+-	int (*free_file_info)(struct super_block *sb, int type);	/* Called on quotaoff() */
+-	int (*read_dqblk)(struct dquot *dquot);		/* Read structure for one user */
+-	int (*commit_dqblk)(struct dquot *dquot);	/* Write structure for one user */
+-	int (*release_dqblk)(struct dquot *dquot);	/* Called when last reference to dquot is being dropped */
++	int (*check_quota_file)(struct dqhash *, int);	/* Detect whether file is in our format */
++	int (*read_file_info)(struct dqhash *, int);	/* Read main info about file - called on quotaon() */
++	int (*write_file_info)(struct dqhash *, int);	/* Write main info about file */
++	int (*free_file_info)(struct dqhash *, int);	/* Called on quotaoff() */
++
++	int (*read_dqblk)(struct dquot *);	/* Read structure for one user */
++	int (*commit_dqblk)(struct dquot *);	/* Write structure for one user */
++	int (*release_dqblk)(struct dquot *);	/* Called when last reference to dquot is being dropped */
+ };
+ 
+ /* Operations working with dquots */
+@@ -255,22 +264,22 @@ struct dquot_operations {
+ 	int (*acquire_dquot) (struct dquot *);		/* Quota is going to be created on disk */
+ 	int (*release_dquot) (struct dquot *);		/* Quota is going to be deleted from disk */
+ 	int (*mark_dirty) (struct dquot *);		/* Dquot is marked dirty */
+-	int (*write_info) (struct super_block *, int);	/* Write of quota "superblock" */
++	int (*write_info) (struct dqhash *, int);	/* Write of quota "superblock" */
+ };
+ 
+ /* Operations handling requests from userspace */
+ struct quotactl_ops {
+-	int (*quota_on)(struct super_block *, int, int, char *);
+-	int (*quota_off)(struct super_block *, int);
+-	int (*quota_sync)(struct super_block *, int);
+-	int (*get_info)(struct super_block *, int, struct if_dqinfo *);
+-	int (*set_info)(struct super_block *, int, struct if_dqinfo *);
+-	int (*get_dqblk)(struct super_block *, int, qid_t, struct if_dqblk *);
+-	int (*set_dqblk)(struct super_block *, int, qid_t, struct if_dqblk *);
+-	int (*get_xstate)(struct super_block *, struct fs_quota_stat *);
+-	int (*set_xstate)(struct super_block *, unsigned int, int);
+-	int (*get_xquota)(struct super_block *, int, qid_t, struct fs_disk_quota *);
+-	int (*set_xquota)(struct super_block *, int, qid_t, struct fs_disk_quota *);
++	int (*quota_on)(struct dqhash *, int, int, char *);
++	int (*quota_off)(struct dqhash *, int);
++	int (*quota_sync)(struct dqhash *, int);
++	int (*get_info)(struct dqhash *, int, struct if_dqinfo *);
++	int (*set_info)(struct dqhash *, int, struct if_dqinfo *);
++	int (*get_dqblk)(struct dqhash *, int, qid_t, struct if_dqblk *);
++	int (*set_dqblk)(struct dqhash *, int, qid_t, struct if_dqblk *);
++	int (*get_xstate)(struct dqhash *, struct fs_quota_stat *);
++	int (*set_xstate)(struct dqhash *, unsigned int, int);
++	int (*get_xquota)(struct dqhash *, int, qid_t, struct fs_disk_quota *);
++	int (*set_xquota)(struct dqhash *, int, qid_t, struct fs_disk_quota *);
+ };
+ 
+ struct quota_format_type {
+@@ -293,16 +302,15 @@ struct quota_info {
+ 	struct quota_format_ops *ops[MAXQUOTAS];	/* Operations for each type */
+ };
+ 
+-/* Inline would be better but we need to dereference super_block which is not defined yet */
+-int mark_dquot_dirty(struct dquot *dquot);
+ 
+ #define dquot_dirty(dquot) test_bit(DQ_MOD_B, &(dquot)->dq_flags)
+ 
+-#define sb_has_quota_enabled(sb, type) ((type)==USRQUOTA ? \
+-	(sb_dqopt(sb)->flags & DQUOT_USR_ENABLED) : (sb_dqopt(sb)->flags & DQUOT_GRP_ENABLED))
++#define dqh_has_quota_enabled(hash, type) (dqhash_valid(hash) && ((type)==USRQUOTA ? \
++	(dqh_dqopt(hash)->flags & DQUOT_USR_ENABLED) : (dqh_dqopt(hash)->flags & DQUOT_GRP_ENABLED)))
++
++#define dqh_any_quota_enabled(hash) (dqhash_valid(hash) && \
++	(dqh_has_quota_enabled(hash, USRQUOTA) || dqh_has_quota_enabled(hash, GRPQUOTA)))
+ 
+-#define sb_any_quota_enabled(sb) (sb_has_quota_enabled(sb, USRQUOTA) | \
+-				  sb_has_quota_enabled(sb, GRPQUOTA))
+ 
+ int register_quota_format(struct quota_format_type *fmt);
+ void unregister_quota_format(struct quota_format_type *fmt);
+@@ -317,6 +325,50 @@ struct quota_module_name {
+ 	{QFMT_VFS_V0, "quota_v2"},\
+ 	{0, NULL}}
+ 
++struct dqhash {
++	struct list_head dqh_list;	/* List of all quota hashes */
++	unsigned int dqh_id;		/* ID for hash */
++	atomic_t dqh_count;		/* Use count */
++	struct quota_info dqh_dqopt;	/* Diskquota specific options */
++	struct dquot_operations	*dqh_qop;
++	struct quotactl_ops *dqh_qcop;
++	struct super_block *dqh_sb;	/* super block */
++	unsigned int dqh_hash_bits;
++	unsigned int dqh_hash_mask;
++	struct hlist_head *dqh_hash;
++};
++
++#ifdef CONFIG_QUOTACTL
++
++struct dqhash *new_dqhash(struct super_block *, unsigned int);
++void destroy_dqhash(struct dqhash *);
++struct dqhash *find_dqhash(unsigned int);
++
++static inline void dqhput(struct dqhash *hash)
++{
++	if (dqhash_valid(hash))
++		if (atomic_dec_and_test(&hash->dqh_count))
++			destroy_dqhash(hash);
++}
++
++static inline struct dqhash *dqhget(struct dqhash *hash)
++{
++	if (dqhash_valid(hash))
++		atomic_inc(&hash->dqh_count);
++	return hash;
++}
++
++#else /* CONFIG_QUOTACTL */
++
++#define new_dqhash(sb, dqdom)		(0)
++#define find_dqhash(dqdom)		(0)
++#define destroy_dqhash(hash)		do { } while(0)
++
++#define dqhput(hash)			do { } while(0)
++#define dqhget(hash)			(hash)
++
++#endif /* CONFIG_QUOTACTL */
++
+ #else
+ 
+ # /* nodep */ include <sys/cdefs.h>
+Index: linux-2.6.20/include/linux/quotaops.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/quotaops.h
++++ linux-2.6.20/include/linux/quotaops.h
+@@ -19,7 +19,7 @@
+ /*
+  * declaration of quota_function calls in kernel.
+  */
+-extern void sync_dquots(struct super_block *sb, int type);
++extern void sync_dquots(struct dqhash *hash, int type);
+ 
+ extern int dquot_initialize(struct inode *inode, int type);
+ extern int dquot_drop(struct inode *inode);
+@@ -34,22 +34,22 @@ extern int dquot_transfer(struct inode *
+ extern int dquot_commit(struct dquot *dquot);
+ extern int dquot_acquire(struct dquot *dquot);
+ extern int dquot_release(struct dquot *dquot);
+-extern int dquot_commit_info(struct super_block *sb, int type);
++extern int dquot_commit_info(struct dqhash *hash, int type);
+ extern int dquot_mark_dquot_dirty(struct dquot *dquot);
+ 
+ int remove_inode_dquot_ref(struct inode *inode, int type,
+ 			   struct list_head *tofree_head);
+ 
+-extern int vfs_quota_on(struct super_block *sb, int type, int format_id, char *path);
+-extern int vfs_quota_on_mount(struct super_block *sb, char *qf_name,
++extern int vfs_quota_on(struct dqhash *hash, int type, int format_id, char *path);
++extern int vfs_quota_on_mount(struct dqhash *hash, char *qf_name,
+ 		int format_id, int type);
+-extern int vfs_quota_off(struct super_block *sb, int type);
+-#define vfs_quota_off_mount(sb, type) vfs_quota_off(sb, type)
+-extern int vfs_quota_sync(struct super_block *sb, int type);
+-extern int vfs_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii);
+-extern int vfs_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii);
+-extern int vfs_get_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di);
+-extern int vfs_set_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di);
++extern int vfs_quota_off(struct dqhash *hash, int type);
++#define vfs_quota_off_mount(dqh, type) vfs_quota_off(dqh, type)
++extern int vfs_quota_sync(struct dqhash *hash, int type);
++extern int vfs_get_dqinfo(struct dqhash *hash, int type, struct if_dqinfo *ii);
++extern int vfs_set_dqinfo(struct dqhash *hash, int type, struct if_dqinfo *ii);
++extern int vfs_get_dqblk(struct dqhash *hash, int type, qid_t id, struct if_dqblk *di);
++extern int vfs_set_dqblk(struct dqhash *hash, int type, qid_t id, struct if_dqblk *di);
+ 
+ /*
+  * Operations supported for diskquotas.
+@@ -64,9 +64,12 @@ extern struct quotactl_ops vfs_quotactl_
+  * need a lot of space in journal for dquot structure allocation. */
+ static __inline__ void DQUOT_INIT(struct inode *inode)
+ {
+-	BUG_ON(!inode->i_sb);
+-	if (sb_any_quota_enabled(inode->i_sb) && !IS_NOQUOTA(inode))
+-		inode->i_sb->dq_op->initialize(inode, -1);
++	if (!dqhash_valid(inode->i_dqh))
++		return;
++	BUG_ON(!inode->i_dqh);
++	// printk("DQUOT_INIT(%p,%p,%d)\n", inode, inode->i_dqh, dqh_any_quota_enabled(inode->i_dqh));
++	if (dqh_any_quota_enabled(inode->i_dqh) && !IS_NOQUOTA(inode))
++		inode->i_dqh->dqh_qop->initialize(inode, -1);
+ }
+ 
+ /* The same as with DQUOT_INIT */
+@@ -75,8 +78,8 @@ static __inline__ void DQUOT_DROP(struct
+ 	/* Here we can get arbitrary inode from clear_inode() so we have
+ 	 * to be careful. OTOH we don't need locking as quota operations
+ 	 * are allowed to change only at mount time */
+-	if (!IS_NOQUOTA(inode) && inode->i_sb && inode->i_sb->dq_op
+-	    && inode->i_sb->dq_op->drop) {
++	if (!IS_NOQUOTA(inode) && inode->i_dqh && inode->i_dqh->dqh_qop
++	    && inode->i_dqh->dqh_qop->drop) {
+ 		int cnt;
+ 		/* Test before calling to rule out calls from proc and such
+                  * where we are not allowed to block. Note that this is
+@@ -87,7 +90,7 @@ static __inline__ void DQUOT_DROP(struct
+ 			if (inode->i_dquot[cnt] != NODQUOT)
+ 				break;
+ 		if (cnt < MAXQUOTAS)
+-			inode->i_sb->dq_op->drop(inode);
++			inode->i_dqh->dqh_qop->drop(inode);
+ 	}
+ }
+ 
+@@ -95,9 +98,9 @@ static __inline__ void DQUOT_DROP(struct
+  * a transaction (deadlocks possible otherwise) */
+ static __inline__ int DQUOT_PREALLOC_SPACE_NODIRTY(struct inode *inode, qsize_t nr)
+ {
+-	if (sb_any_quota_enabled(inode->i_sb)) {
++	if (dqh_any_quota_enabled(inode->i_dqh)) {
+ 		/* Used space is updated in alloc_space() */
+-		if (inode->i_sb->dq_op->alloc_space(inode, nr, 1) == NO_QUOTA)
++		if (inode->i_dqh->dqh_qop->alloc_space(inode, nr, 1) == NO_QUOTA)
+ 			return 1;
+ 	}
+ 	else
+@@ -115,9 +118,9 @@ static __inline__ int DQUOT_PREALLOC_SPA
+ 
+ static __inline__ int DQUOT_ALLOC_SPACE_NODIRTY(struct inode *inode, qsize_t nr)
+ {
+-	if (sb_any_quota_enabled(inode->i_sb)) {
++	if (dqh_any_quota_enabled(inode->i_dqh)) {
+ 		/* Used space is updated in alloc_space() */
+-		if (inode->i_sb->dq_op->alloc_space(inode, nr, 0) == NO_QUOTA)
++		if (inode->i_dqh->dqh_qop->alloc_space(inode, nr, 0) == NO_QUOTA)
+ 			return 1;
+ 	}
+ 	else
+@@ -135,9 +138,9 @@ static __inline__ int DQUOT_ALLOC_SPACE(
+ 
+ static __inline__ int DQUOT_ALLOC_INODE(struct inode *inode)
+ {
+-	if (sb_any_quota_enabled(inode->i_sb)) {
++	if (dqh_any_quota_enabled(inode->i_dqh)) {
+ 		DQUOT_INIT(inode);
+-		if (inode->i_sb->dq_op->alloc_inode(inode, 1) == NO_QUOTA)
++		if (inode->i_dqh->dqh_qop->alloc_inode(inode, 1) == NO_QUOTA)
+ 			return 1;
+ 	}
+ 	return 0;
+@@ -145,8 +148,8 @@ static __inline__ int DQUOT_ALLOC_INODE(
+ 
+ static __inline__ void DQUOT_FREE_SPACE_NODIRTY(struct inode *inode, qsize_t nr)
+ {
+-	if (sb_any_quota_enabled(inode->i_sb))
+-		inode->i_sb->dq_op->free_space(inode, nr);
++	if (dqh_any_quota_enabled(inode->i_dqh))
++		inode->i_dqh->dqh_qop->free_space(inode, nr);
+ 	else
+ 		inode_sub_bytes(inode, nr);
+ }
+@@ -159,29 +162,30 @@ static __inline__ void DQUOT_FREE_SPACE(
+ 
+ static __inline__ void DQUOT_FREE_INODE(struct inode *inode)
+ {
+-	if (sb_any_quota_enabled(inode->i_sb))
+-		inode->i_sb->dq_op->free_inode(inode, 1);
++	if (dqh_any_quota_enabled(inode->i_dqh))
++		inode->i_dqh->dqh_qop->free_inode(inode, 1);
+ }
+ 
+ static __inline__ int DQUOT_TRANSFER(struct inode *inode, struct iattr *iattr)
+ {
+-	if (sb_any_quota_enabled(inode->i_sb) && !IS_NOQUOTA(inode)) {
++	if (dqh_any_quota_enabled(inode->i_dqh) && !IS_NOQUOTA(inode)) {
+ 		DQUOT_INIT(inode);
+-		if (inode->i_sb->dq_op->transfer(inode, iattr) == NO_QUOTA)
++		if (inode->i_dqh->dqh_qop->transfer(inode, iattr) == NO_QUOTA)
+ 			return 1;
+ 	}
+ 	return 0;
+ }
+ 
+ /* The following two functions cannot be called inside a transaction */
+-#define DQUOT_SYNC(sb)	sync_dquots(sb, -1)
++#define DQUOT_SYNC(hash)	sync_dquots(hash, -1)
+ 
+-static __inline__ int DQUOT_OFF(struct super_block *sb)
++static __inline__ int DQUOT_OFF(struct dqhash *hash)
+ {
+ 	int ret = -ENOSYS;
+ 
+-	if (sb_any_quota_enabled(sb) && sb->s_qcop && sb->s_qcop->quota_off)
+-		ret = sb->s_qcop->quota_off(sb, -1);
++	if (dqh_any_quota_enabled(hash) && hash->dqh_qcop &&
++		hash->dqh_qcop->quota_off)
++		ret = hash->dqh_qcop->quota_off(hash, -1);
+ 	return ret;
+ }
+ 
+@@ -196,8 +200,8 @@ static __inline__ int DQUOT_OFF(struct s
+ #define DQUOT_DROP(inode)			do { } while(0)
+ #define DQUOT_ALLOC_INODE(inode)		(0)
+ #define DQUOT_FREE_INODE(inode)			do { } while(0)
+-#define DQUOT_SYNC(sb)				do { } while(0)
+-#define DQUOT_OFF(sb)				do { } while(0)
++#define DQUOT_SYNC(hash)			do { } while(0)
++#define DQUOT_OFF(hash)				do { } while(0)
+ #define DQUOT_TRANSFER(inode, iattr)		(0)
+ static inline int DQUOT_PREALLOC_SPACE_NODIRTY(struct inode *inode, qsize_t nr)
+ {
+Index: linux-2.6.20/include/linux/reiserfs_fs.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/reiserfs_fs.h
++++ linux-2.6.20/include/linux/reiserfs_fs.h
+@@ -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,9 @@ struct stat_data_v1 {
+ 				REISERFS_COMPR_FL |	\
+ 				REISERFS_NOTAIL_FL )
+ 
++#define REISERFS_FL_USER_VISIBLE	0x80FF
++#define REISERFS_FL_USER_MODIFIABLE	0x80FF
++
+ /* Stat Data on disk (reiserfs version of UFS disk inode minus the
+    address blocks) */
+ struct stat_data {
+@@ -1901,6 +1908,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);
+Index: linux-2.6.20/include/linux/reiserfs_fs_sb.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/reiserfs_fs_sb.h
++++ linux-2.6.20/include/linux/reiserfs_fs_sb.h
+@@ -457,6 +457,7 @@ enum reiserfs_mount_options {
+ 	REISERFS_POSIXACL,
+ 	REISERFS_BARRIER_NONE,
+ 	REISERFS_BARRIER_FLUSH,
++	REISERFS_TAGGED,
+ 
+ 	/* Actions on error */
+ 	REISERFS_ERROR_PANIC,
+Index: linux-2.6.20/include/linux/sched.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/sched.h
++++ linux-2.6.20/include/linux/sched.h
+@@ -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);
+Index: linux-2.6.20/include/linux/security.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/security.h
++++ linux-2.6.20/include/linux/security.h
+@@ -1164,7 +1164,7 @@ struct security_operations {
+ 	int (*capable) (struct task_struct * tsk, int cap);
+ 	int (*acct) (struct file * file);
+ 	int (*sysctl) (struct ctl_table * table, int op);
+-	int (*quotactl) (int cmds, int type, int id, struct super_block * sb);
++	int (*quotactl) (int cmds, int type, int id, struct dqhash *);
+ 	int (*quota_on) (struct dentry * dentry);
+ 	int (*syslog) (int type);
+ 	int (*settime) (struct timespec *ts, struct timezone *tz);
+@@ -1447,9 +1447,9 @@ static inline int security_sysctl(struct
+ }
+ 
+ static inline int security_quotactl (int cmds, int type, int id,
+-				     struct super_block *sb)
++				     struct dqhash *hash)
+ {
+-	return security_ops->quotactl (cmds, type, id, sb);
++	return security_ops->quotactl (cmds, type, id, hash);
+ }
+ 
+ static inline int security_quota_on (struct dentry * dentry)
+@@ -2192,7 +2192,7 @@ static inline int security_sysctl(struct
+ }
+ 
+ static inline int security_quotactl (int cmds, int type, int id,
+-				     struct super_block * sb)
++				     struct dqhash * hash)
+ {
+ 	return 0;
+ }
+Index: linux-2.6.20/include/linux/shmem_fs.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/shmem_fs.h
++++ linux-2.6.20/include/linux/shmem_fs.h
+@@ -8,6 +8,9 @@
+ 
+ #define SHMEM_NR_DIRECT 16
+ 
++#define TMPFS_SUPER_MAGIC	0x01021994
++
++
+ struct shmem_inode_info {
+ 	spinlock_t		lock;
+ 	unsigned long		flags;
+Index: linux-2.6.20/include/linux/stat.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/stat.h
++++ linux-2.6.20/include/linux/stat.h
+@@ -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;
+Index: linux-2.6.20/include/linux/sunrpc/auth.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/sunrpc/auth.h
++++ linux-2.6.20/include/linux/sunrpc/auth.h
+@@ -24,6 +24,7 @@
+ struct auth_cred {
+ 	uid_t	uid;
+ 	gid_t	gid;
++	tag_t	tag;
+ 	struct group_info *group_info;
+ };
+ 
+Index: linux-2.6.20/include/linux/sunrpc/clnt.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/sunrpc/clnt.h
++++ linux-2.6.20/include/linux/sunrpc/clnt.h
+@@ -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 */
+ 
+Index: linux-2.6.20/include/linux/syscalls.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/syscalls.h
++++ linux-2.6.20/include/linux/syscalls.h
+@@ -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);
+ 
+Index: linux-2.6.20/include/linux/sysctl.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/sysctl.h
++++ linux-2.6.20/include/linux/sysctl.h
+@@ -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 */
+@@ -938,6 +939,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 *,
+@@ -1022,6 +1026,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;
+Index: linux-2.6.20/include/linux/sysfs.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/sysfs.h
++++ linux-2.6.20/include/linux/sysfs.h
+@@ -13,6 +13,8 @@
+ #include <linux/compiler.h>
+ #include <asm/atomic.h>
+ 
++#define SYSFS_SUPER_MAGIC	0x62656572
++
+ struct kobject;
+ struct module;
+ 
+Index: linux-2.6.20/include/linux/time.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/time.h
++++ linux-2.6.20/include/linux/time.h
+@@ -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
+Index: linux-2.6.20/include/linux/types.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/types.h
++++ linux-2.6.20/include/linux/types.h
+@@ -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 */
+Index: linux-2.6.20/include/linux/vroot.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vroot.h
+@@ -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.
++ */
++
++#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 */
+Index: linux-2.6.20/include/linux/vs_base.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vs_base.h
+@@ -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
+Index: linux-2.6.20/include/linux/vs_context.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vs_context.h
+@@ -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(&current->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(&current->vx_info, vxis->vxi);
++	current->xid = vxis->xid;
++}
++
++
++static inline void __enter_vx_admin(struct vx_info_save *vxis)
++{
++	vxis->vxi = xchg(&current->vx_info, NULL);
++	vxis->xid = xchg(&current->xid, (xid_t)0);
++}
++
++static inline void __leave_vx_admin(struct vx_info_save *vxis)
++{
++	(void)xchg(&current->xid, vxis->xid);
++	(void)xchg(&current->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
+Index: linux-2.6.20/include/linux/vs_cowbl.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vs_cowbl.h
+@@ -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
+Index: linux-2.6.20/include/linux/vs_cvirt.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vs_cvirt.h
+@@ -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
+Index: linux-2.6.20/include/linux/vs_dlimit.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vs_dlimit.h
+@@ -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
+Index: linux-2.6.20/include/linux/vs_inet.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vs_inet.h
+@@ -0,0 +1,155 @@
++#ifndef _VS_INET_H
++#define _VS_INET_H
++
++#include <linux/vs_network.h>
++
++#define IPI_LOOPBACK	htonl(INADDR_LOOPBACK)
++
++
++static inline int addr_in_nx_info(struct nx_info *nxi, uint32_t addr)
++{
++	int n,i;
++
++	if (!nxi)
++		return 1;
++
++	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;
++}
++
++
++/*
++ *	Check if a given address matches for a socket
++ *
++ *	nxi:		the socket's nx_info if any
++ *	addr:		to be verified address
++ *	saddr/baddr:	socket addresses
++ */
++static inline int raw_addr_match (
++	struct nx_info *nxi,
++	uint32_t addr,
++	uint32_t saddr,
++	uint32_t baddr)
++{
++	if (addr && (saddr == addr || baddr == addr))
++		return 1;
++	if (!saddr)
++		return addr_in_nx_info(nxi, addr);
++	return 0;
++}
++
++
++/* inet related checks and helpers */
++
++
++struct in_ifaddr;
++struct net_device;
++struct sock;
++
++#ifdef CONFIG_INET
++
++#include <linux/netdevice.h>
++#include <linux/inetdevice.h>
++#include <net/inet_timewait_sock.h>
++
++
++int dev_in_nx_info(struct net_device *, struct nx_info *);
++int nx_addr_conflict(struct nx_info *, uint32_t, const struct sock *);
++
++
++/*
++ *	check if address is covered by socket
++ *
++ *	sk:	the socket to check against
++ *	addr:	the address in question (must be != 0)
++ */
++
++static inline
++int __addr_in_socket(const struct sock *sk, uint32_t addr)
++{
++	struct nx_info *nxi = sk->sk_nx_info;
++	uint32_t saddr = inet_rcv_saddr(sk);
++
++	vxdprintk(VXD_CBIT(net, 5),
++		"__addr_in_socket(%p,%d.%d.%d.%d) %p:%d.%d.%d.%d %p;%lx",
++		sk, VXD_QUAD(addr), nxi, VXD_QUAD(saddr), sk->sk_socket,
++		(sk->sk_socket?sk->sk_socket->flags:0));
++
++	if (saddr) {
++		/* direct address match */
++		return (saddr == addr);
++	} else if (nxi) {
++		/* match against nx_info */
++		return addr_in_nx_info(nxi, addr);
++	} else {
++		/* unrestricted any socket */
++		return 1;
++	}
++}
++
++
++
++static inline
++int nx_dev_visible(struct nx_info *nxi, struct net_device *dev)
++{
++	if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++		return 1;
++	if (dev_in_nx_info(dev, nxi))
++		return 1;
++	return 0;
++}
++
++
++static inline
++int ifa_in_nx_info(struct in_ifaddr *ifa, struct nx_info *nxi)
++{
++	if (!nxi)
++		return 1;
++	if (!ifa)
++		return 0;
++	return addr_in_nx_info(nxi, ifa->ifa_local);
++}
++
++static inline
++int nx_ifa_visible(struct nx_info *nxi, struct in_ifaddr *ifa)
++{
++	if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++		return 1;
++	if (ifa_in_nx_info(ifa, nxi))
++		return 1;
++	return 0;
++}
++
++#else /* CONFIG_INET */
++
++static inline
++int nx_dev_visible(struct nx_info *n, struct net_device *d)
++{
++	return 1;
++}
++
++
++static inline
++int nx_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
++{
++	return 1;
++}
++
++static inline
++int ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
++{
++	return 1;
++}
++
++#endif /* CONFIG_INET */
++
++
++#else
++#warning duplicate inclusion
++#endif
+Index: linux-2.6.20/include/linux/vs_limit.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vs_limit.h
+@@ -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)
++
++
++/* process and file limits */
++
++#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)
++
++#define vx_files_inc(f) \
++	vx_acc_cres_cond((f)->f_xid, 1, f, RLIMIT_NOFILE)
++
++#define vx_files_dec(f) \
++	vx_acc_cres_cond((f)->f_xid,-1, f, RLIMIT_NOFILE)
++
++#define vx_locks_inc(l) \
++	vx_acc_cres_cond((l)->fl_xid, 1, l, RLIMIT_LOCKS)
++
++#define vx_locks_dec(l) \
++	vx_acc_cres_cond((l)->fl_xid,-1, l, RLIMIT_LOCKS)
++
++#define vx_openfd_inc(f) \
++	vx_acc_cres(current->vx_info, 1, (void *)(long)(f), VLIMIT_OPENFD)
++
++#define vx_openfd_dec(f) \
++	vx_acc_cres(current->vx_info,-1, (void *)(long)(f), VLIMIT_OPENFD)
++
++
++#define vx_cres_avail(v,n,r) \
++	__vx_cres_avail(v, r, n, __FILE__, __LINE__)
++
++
++#define vx_nproc_avail(n) \
++	vx_cres_avail(current->vx_info, n, RLIMIT_NPROC)
++
++#define vx_files_avail(n) \
++	vx_cres_avail(current->vx_info, n, RLIMIT_NOFILE)
++
++#define vx_locks_avail(n) \
++	vx_cres_avail(current->vx_info, n, RLIMIT_LOCKS)
++
++#define vx_openfd_avail(n) \
++	vx_cres_avail(current->vx_info, n, VLIMIT_OPENFD)
++
++
++/* dentry limits */
++
++#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_dentry_avail(n) \
++	vx_cres_avail(current->vx_info, n, VLIMIT_DENTRY)
++
++
++/* socket limits */
++
++#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_sock_avail(n) \
++	vx_cres_avail(current->vx_info, n, VLIMIT_NSOCK)
++
++
++/* ipc resource limits */
++
++#define vx_ipcmsg_add(v,u,a) \
++	vx_add_cres(v, a, u, RLIMIT_MSGQUEUE)
++
++#define vx_ipcmsg_sub(v,u,a) \
++	vx_sub_cres(v, a, u, RLIMIT_MSGQUEUE)
++
++#define vx_ipcmsg_avail(v,a) \
++	vx_cres_avail(v, a, RLIMIT_MSGQUEUE)
++
++
++#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 vx_ipcshm_avail(v,a) \
++	vx_cres_avail(v, a, VLIMIT_SHMEM)
++
++
++#define vx_semary_inc(a) \
++	vx_acc_cres(current->vx_info, 1, a, VLIMIT_SEMARY)
++
++#define vx_semary_dec(a) \
++	vx_acc_cres(current->vx_info,-1, a, VLIMIT_SEMARY)
++
++
++#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)
++
++
++#else
++#warning duplicate inclusion
++#endif
+Index: linux-2.6.20/include/linux/vs_memory.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vs_memory.h
+@@ -0,0 +1,159 @@
++#ifndef _VS_MEMORY_H
++#define _VS_MEMORY_H
++
++#include "vserver/limit.h"
++#include "vserver/base.h"
++#include "vserver/context.h"
++#include "vserver/debug.h"
++#include "vserver/context.h"
++#include "vserver/limit_int.h"
++
++
++#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_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_acc_pages(m,p,v,r) do {					\
++	unsigned long __p = (p);					\
++	__acc_add_long(__p, &(m->v));					\
++	__vx_add_cres(m->mm_vx_info, r, __p, m, __FILE__, __LINE__);	\
++} while (0)
++
++#define vx_acc_pages_atomic(m,p,v,r) do {				\
++	unsigned long __p = (p);					\
++	__acc_add_atomic(__p, &(m->v));					\
++	__vx_add_cres(m->mm_vx_info, r, __p, m, __FILE__, __LINE__);	\
++} while (0)
++
++
++
++#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
+Index: linux-2.6.20/include/linux/vs_network.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vs_network.h
+@@ -0,0 +1,165 @@
++#ifndef _NX_VS_NETWORK_H
++#define _NX_VS_NETWORK_H
++
++#include "vserver/context.h"
++#include "vserver/network.h"
++#include "vserver/base.h"
++#include "vserver/debug.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;
++
++	vxlprintk(VXD_CBIT(nid, 2), "get_nx_info(%p[#%d.%d])",
++		nxi, nxi?nxi->nx_id:0, nxi?atomic_read(&nxi->nx_usecnt):0,
++		_file, _line);
++
++	atomic_inc(&nxi->nx_usecnt);
++	return nxi;
++}
++
++
++extern void free_nx_info(struct nx_info *);
++
++#define put_nx_info(i)	__put_nx_info(i,__FILE__,__LINE__)
++
++static inline void __put_nx_info(struct nx_info *nxi, const char *_file, int _line)
++{
++	if (!nxi)
++		return;
++
++	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);
++
++	if (atomic_dec_and_test(&nxi->nx_usecnt))
++		free_nx_info(nxi);
++}
++
++
++#define init_nx_info(p,i) __init_nx_info(p,i,__FILE__,__LINE__)
++
++static inline void __init_nx_info(struct nx_info **nxp, struct nx_info *nxi,
++		const char *_file, int _line)
++{
++	if (nxi) {
++		vxlprintk(VXD_CBIT(nid, 3),
++			"init_nx_info(%p[#%d.%d])",
++			nxi, nxi?nxi->nx_id:0,
++			nxi?atomic_read(&nxi->nx_usecnt):0,
++			_file, _line);
++
++		atomic_inc(&nxi->nx_usecnt);
++	}
++	*nxp = nxi;
++}
++
++
++#define set_nx_info(p,i) __set_nx_info(p,i,__FILE__,__LINE__)
++
++static inline void __set_nx_info(struct nx_info **nxp, struct nx_info *nxi,
++	const char *_file, int _line)
++{
++	struct nx_info *nxo;
++
++	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);
++
++	atomic_inc(&nxi->nx_usecnt);
++	nxo = xchg(nxp, nxi);
++	BUG_ON(nxo);
++}
++
++#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;
++
++	nxo = xchg(nxp, NULL);
++	if (!nxo)
++		return;
++
++	vxlprintk(VXD_CBIT(nid, 3), "clr_nx_info(%p[#%d.%d])",
++		nxo, nxo?nxo->nx_id:0,
++		nxo?atomic_read(&nxo->nx_usecnt):0,
++		_file, _line);
++
++	if (atomic_dec_and_test(&nxo->nx_usecnt))
++		free_nx_info(nxo);
++}
++
++
++#define claim_nx_info(v,p) __claim_nx_info(v,p,__FILE__,__LINE__)
++
++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);
++}
++
++
++extern void unhash_nx_info(struct nx_info *);
++
++#define release_nx_info(v,p) __release_nx_info(v,p,__FILE__,__LINE__)
++
++static inline void __release_nx_info(struct nx_info *nxi,
++	struct task_struct *task, const char *_file, int _line)
++{
++	vxlprintk(VXD_CBIT(nid, 3), "release_nx_info(%p[#%d.%d.%d]) %p",
++		nxi, nxi?nxi->nx_id:0,
++		nxi?atomic_read(&nxi->nx_usecnt):0,
++		nxi?atomic_read(&nxi->nx_tasks):0,
++		task, _file, _line);
++
++	might_sleep();
++
++	if (atomic_dec_and_test(&nxi->nx_tasks))
++		unhash_nx_info(nxi);
++}
++
++
++#define task_get_nx_info(i)	__task_get_nx_info(i,__FILE__,__LINE__)
++
++static __inline__ struct nx_info *__task_get_nx_info(struct task_struct *p,
++	const char *_file, int _line)
++{
++	struct nx_info *nxi;
++
++	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;
++}
++
++
++
++static inline void exit_nx_info(struct task_struct *p)
++{
++	if (p->nx_info)
++		release_nx_info(p->nx_info, p);
++}
++
++
++#else
++#warning duplicate inclusion
++#endif
+Index: linux-2.6.20/include/linux/vs_pid.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vs_pid.h
+@@ -0,0 +1,133 @@
++#ifndef _VS_PID_H
++#define _VS_PID_H
++
++#include "vserver/base.h"
++#include "vserver/context.h"
++#include "vserver/debug.h"
++#include <linux/pid_namespace.h>
++
++
++/* pid faking stuff */
++
++
++#define vx_info_map_pid(v,p) \
++	__vx_info_map_pid((v), (p), __FUNC__, __FILE__, __LINE__)
++#define vx_info_map_tgid(v,p)  vx_info_map_pid(v,p)
++#define vx_map_pid(p)	vx_info_map_pid(current->vx_info, p)
++#define vx_map_tgid(p) vx_map_pid(p)
++
++static inline int __vx_info_map_pid(struct vx_info *vxi, int pid,
++	const char *func, const char *file, int line)
++{
++	if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
++		vxfprintk(VXD_CBIT(cvirt, 2),
++			"vx_map_tgid: %p/%llx: %d -> %d",
++			vxi, (long long)vxi->vx_flags, pid,
++			(pid && pid == vxi->vx_initpid)?1:pid,
++			func, file, line);
++		if (pid == 0)
++			return 0;
++		if (pid == vxi->vx_initpid)
++			return 1;
++	}
++	return pid;
++}
++
++#define vx_info_rmap_pid(v,p) \
++	__vx_info_rmap_pid((v), (p), __FUNC__, __FILE__, __LINE__)
++#define vx_rmap_pid(p)	vx_info_rmap_pid(current->vx_info, p)
++#define vx_rmap_tgid(p) vx_rmap_pid(p)
++
++static inline int __vx_info_rmap_pid(struct vx_info *vxi, int pid,
++	const char *func, const char *file, int line)
++{
++	if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
++		vxfprintk(VXD_CBIT(cvirt, 2),
++			"vx_rmap_tgid: %p/%llx: %d -> %d",
++			vxi, (long long)vxi->vx_flags, pid,
++			(pid == 1)?vxi->vx_initpid:pid,
++			func, file, line);
++		if ((pid == 1) && vxi->vx_initpid)
++			return vxi->vx_initpid;
++		if (pid == vxi->vx_initpid)
++			return ~0U;
++	}
++	return pid;
++}
++
++
++#define VXF_FAKE_INIT	(VXF_INFO_INIT|VXF_STATE_INIT)
++
++static inline
++int vx_proc_task_visible(struct task_struct *task)
++{
++	if ((task->pid == 1) &&
++		!vx_flags(VXF_FAKE_INIT, VXF_FAKE_INIT))
++		/* show a blend through init */
++		goto visible;
++	if (vx_check(vx_task_xid(task), VS_WATCH|VS_IDENT))
++		goto visible;
++	return 0;
++visible:
++	return 1;
++}
++
++static inline
++struct task_struct *vx_find_proc_task_by_pid(int pid)
++{
++	struct task_struct *task = find_task_by_pid(pid);
++
++	if (task && !vx_proc_task_visible(task)) {
++		vxdprintk(VXD_CBIT(misc, 6),
++			"dropping task (find) %p[#%u,%u] for %p[#%u,%u]",
++			task, task->xid, task->pid,
++			current, current->xid, current->pid);
++		task = NULL;
++	}
++	return task;
++}
++
++static inline
++struct task_struct *vx_get_proc_task(struct inode *inode, struct pid *pid)
++{
++	struct task_struct *task = get_pid_task(pid, PIDTYPE_PID);
++
++	if (task && !vx_proc_task_visible(task)) {
++		vxdprintk(VXD_CBIT(misc, 6),
++			"dropping task (get) %p[#%u,%u] for %p[#%u,%u]",
++			task, task->xid, task->pid,
++			current, current->xid, current->pid);
++		put_task_struct(task);
++		task = NULL;
++	}
++	return task;
++}
++
++
++static inline
++struct task_struct *vx_child_reaper(struct task_struct *p)
++{
++	struct vx_info *vxi = p->vx_info;
++	struct task_struct *reaper = child_reaper(p);
++
++	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, 7),
++		"vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]",
++		p, p->xid, p->pid, reaper, reaper->xid, reaper->pid);
++	return reaper;
++}
++
++
++#else
++#warning duplicate inclusion
++#endif
+Index: linux-2.6.20/include/linux/vs_sched.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vs_sched.h
+@@ -0,0 +1,110 @@
++#ifndef _VS_SCHED_H
++#define _VS_SCHED_H
++
++#include "vserver/base.h"
++#include "vserver/context.h"
++#include "vserver/sched.h"
++
++
++#define VAVAVOOM_RATIO		 50
++
++#define MAX_PRIO_BIAS		 20
++#define MIN_PRIO_BIAS		-20
++
++
++#ifdef CONFIG_VSERVER_HARDCPU
++
++/*
++ * effective_prio - return the priority that is based on the static
++ * priority but is modified by bonuses/penalties.
++ *
++ * We scale the actual sleep average [0 .... MAX_SLEEP_AVG]
++ * into a -4 ... 0 ... +4 bonus/penalty range.
++ *
++ * Additionally, we scale another amount based on the number of
++ * CPU tokens currently held by the context, if the process is
++ * part of a context (and the appropriate SCHED flag is set).
++ * This ranges from -5 ... 0 ... +15, quadratically.
++ *
++ * So, the total bonus is -9 .. 0 .. +19
++ * We use ~50% of the full 0...39 priority range so that:
++ *
++ * 1) nice +19 interactive tasks do not preempt nice 0 CPU hogs.
++ * 2) nice -20 CPU hogs do not get preempted by nice 0 tasks.
++ *    unless that context is far exceeding its CPU allocation.
++ *
++ * Both properties are important to certain workloads.
++ */
++static inline
++int vx_effective_vavavoom(struct _vx_sched_pc *sched_pc, int max_prio)
++{
++	int vavavoom, max;
++
++	/* 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;
++}
++
++
++static inline
++int vx_adjust_prio(struct task_struct *p, int prio, int max_user)
++{
++	struct vx_info *vxi = p->vx_info;
++	struct _vx_sched_pc *sched_pc;
++
++	if (!vxi)
++		return prio;
++
++	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;
++}
++
++#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;
++
++	if (vxi)
++		prio += vx_cpu(vxi, sched_pc).prio_bias;
++	return prio;
++}
++
++#endif /* CONFIG_VSERVER_HARDCPU */
++
++
++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;
++}
++
++#else
++#warning duplicate inclusion
++#endif
+Index: linux-2.6.20/include/linux/vs_socket.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vs_socket.h
+@@ -0,0 +1,80 @@
++#ifndef _VS_SOCKET_H
++#define _VS_SOCKET_H
++
++#include "vserver/debug.h"
++#include "vserver/base.h"
++#include "vserver/cacct.h"
++#include "vserver/context.h"
++#include "vserver/tag.h"
++
++
++/* socket accounting */
++
++#include <linux/socket.h>
++
++static inline int vx_sock_type(int family)
++{
++	switch (family) {
++	case PF_UNSPEC:
++		return VXA_SOCK_UNSPEC;
++	case PF_UNIX:
++		return VXA_SOCK_UNIX;
++	case PF_INET:
++		return VXA_SOCK_INET;
++	case PF_INET6:
++		return VXA_SOCK_INET6;
++	case PF_PACKET:
++		return VXA_SOCK_PACKET;
++	default:
++		return VXA_SOCK_OTHER;
++	}
++}
++
++#define vx_acc_sock(v,f,p,s) \
++	__vx_acc_sock((v), (f), (p), (s), __FILE__, __LINE__)
++
++static inline void __vx_acc_sock(struct vx_info *vxi,
++	int family, int pos, int size, char *file, int line)
++{
++	if (vxi) {
++		int type = vx_sock_type(family);
++
++		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 sock_vx_init(s) do {		\
++	(s)->sk_xid = 0;		\
++	(s)->sk_vx_info = NULL;		\
++	} while (0)
++
++#define sock_nx_init(s) do {		\
++	(s)->sk_nid = 0;		\
++	(s)->sk_nx_info = NULL;		\
++	} while (0)
++
++static inline
++int vx_socket_peer_tag(struct socket *sock, int level,
++	char __user *optval, int __user *optlen, int len)
++{
++	struct peer_tag tag;
++
++	tag.xid = sock->sk->sk_xid;
++	tag.nid = sock->sk->sk_nid;
++	if (copy_to_user(optval, &tag, sizeof(tag)))
++		return -EFAULT;
++	return 0;
++}
++
++#else
++#warning duplicate inclusion
++#endif
+Index: linux-2.6.20/include/linux/vs_tag.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vs_tag.h
+@@ -0,0 +1,44 @@
++#ifndef _VS_TAG_H
++#define _VS_TAG_H
++
++#include <linux/vserver/tag.h>
++
++/* check conditions */
++
++#define DX_ADMIN	0x0001
++#define DX_WATCH	0x0002
++#define DX_HOSTID	0x0008
++
++#define DX_IDENT	0x0010
++
++#define DX_ARG_MASK	0x0010
++
++
++#define dx_task_tag(t)	((t)->xid)
++
++#define dx_current_tag() dx_task_tag(current)
++
++#define dx_check(c,m)	__dx_check(dx_current_tag(),c,m)
++
++#define dx_weak_check(c,m)	((m) ? dx_check(c,m) : 1)
++
++
++/*
++ * 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)));
++}
++
++#else
++#warning duplicate inclusion
++#endif
+Index: linux-2.6.20/include/linux/vs_time.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vs_time.h
+@@ -0,0 +1,19 @@
++#ifndef _VS_TIME_H
++#define _VS_TIME_H
++
++
++/* time faking stuff */
++
++#ifdef CONFIG_VSERVER_VTIME
++
++extern void vx_gettimeofday(struct timeval *tv);
++extern int vx_settimeofday(struct timespec *ts);
++
++#else
++#define	vx_gettimeofday(t)	do_gettimeofday(t)
++#define	vx_settimeofday(t)	do_settimeofday(t)
++#endif
++
++#else
++#warning duplicate inclusion
++#endif
+Index: linux-2.6.20/include/linux/vserver/Kbuild
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/Kbuild
+@@ -0,0 +1,7 @@
++
++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
++
+Index: linux-2.6.20/include/linux/vserver/base.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/base.h
+@@ -0,0 +1,217 @@
++#ifndef _VX_BASE_H
++#define _VX_BASE_H
++
++
++/* context state changes */
++
++enum {
++	VSC_STARTUP = 1,
++	VSC_SHUTDOWN,
++
++	VSC_NETUP,
++	VSC_NETDOWN,
++};
++
++
++#define MAX_S_CONTEXT	65535	/* Arbitrary limit */
++
++/* check conditions */
++
++#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
++
++#ifdef	CONFIG_VSERVER_PRIVACY
++#define VS_ADMIN_P	(0)
++#define VS_WATCH_P	(0)
++#else
++#define VS_ADMIN_P	VS_ADMIN
++#define VS_WATCH_P	VS_WATCH
++#endif
++
++#define VS_HARDIRQ	0x1000
++#define VS_SOFTIRQ	0x2000
++#define VS_IRQ		0x4000
++
++#define VS_IRQ_MASK	0xF000
++
++#include <linux/hardirq.h>
++
++/*
++ * check current context for ADMIN/WATCH and
++ * optionally against supplied argument
++ */
++static inline int __vs_check(int cid, int id, unsigned int mode)
++{
++	if (mode & VS_ARG_MASK) {
++		if ((mode & VS_IDENT) &&
++			(id == cid))
++			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 vx_current_xid() vx_task_xid(current)
++
++#define current_vx_info() (current->vx_info)
++
++
++#define vx_check(c,m)	__vs_check(vx_current_xid(),c,(m)|VS_IRQ)
++
++#define vx_weak_check(c,m)	((m) ? vx_check(c,m) : 1)
++
++
++#define nx_task_nid(t)	((t)->nid)
++
++#define nx_current_nid() nx_task_nid(current)
++
++#define current_nx_info() (current->nx_info)
++
++
++#define nx_check(c,m)	__vs_check(nx_current_nid(),c,m)
++
++#define nx_weak_check(c,m)	((m) ? nx_check(c,m) : 1)
++
++
++
++/* generic flag merging */
++
++#define vs_check_flags(v,m,f)	(((v) & (m)) ^ (f))
++
++#define vs_mask_flags(v,f,m)	(((v) & ~(m)) | ((f) & (m)))
++
++#define vs_mask_mask(v,f,m)	(((v) & ~(m)) | ((v) & (f) & (m)))
++
++#define vs_check_bit(v,n)	((v) & (1LL << (n)))
++
++
++/* context flags */
++
++#define __vx_flags(v)	((v) ? (v)->vx_flags : 0)
++
++#define vx_current_flags()	__vx_flags(current->vx_info)
++
++#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 vx_flags(m,f)	vx_info_flags(current->vx_info,(m),(f))
++
++
++/* context caps */
++
++#define __vx_ccaps(v)	((v) ? (v)->vx_ccaps : 0)
++
++#define vx_current_ccaps()	__vx_ccaps(current->vx_info)
++
++#define vx_info_ccaps(v,c)	(__vx_ccaps(v) & (c))
++
++#define vx_ccaps(c)	vx_info_ccaps(current->vx_info,(c))
++
++
++
++/* 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) \
++	vs_check_flags(__nx_flags(v),(m),(f))
++
++#define task_nx_flags(t,m,f) \
++	((t) && nx_info_flags((t)->nx_info, (m), (f)))
++
++#define nx_flags(m,f)	nx_info_flags(current->nx_info,(m),(f))
++
++
++/* network caps */
++
++#define __nx_ncaps(v)	((v) ? (v)->nx_ncaps : 0)
++
++#define nx_current_ncaps()	__nx_ncaps(current->nx_info)
++
++#define nx_info_ncaps(v,c)	(__nx_ncaps(v) & (c))
++
++#define nx_ncaps(c)	nx_info_ncaps(current->nx_info,(c))
++
++
++/* context mask capabilities */
++
++#define __vx_mcaps(v)	((v) ? (v)->vx_ccaps >> 32UL : ~0 )
++
++#define vx_info_mcaps(v,c)	(__vx_mcaps(v) & (c))
++
++#define vx_mcaps(c)	vx_info_mcaps(current->vx_info,(c))
++
++
++/* context bcap mask */
++
++#define __vx_bcaps(v)	((v) ? (v)->vx_bcaps : ~0 )
++
++#define vx_current_bcaps()	__vx_bcaps(current->vx_info)
++
++#define vx_info_bcaps(v,c)	(__vx_bcaps(v) & (c))
++
++#define vx_bcaps(c)	vx_info_bcaps(current->vx_info,(c))
++
++
++#define vx_info_cap_bset(v)	((v) ? (v)->vx_cap_bset : cap_bset)
++
++#define vx_current_cap_bset()	vx_info_cap_bset(current->vx_info)
++
++
++#define __vx_info_mbcap(v,b) \
++	(!vx_info_flags(v, VXF_STATE_SETUP, 0) ? \
++	vx_info_bcaps(v, b) : (b))
++
++#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)
++
++#define vx_mbcap(b)	task_vx_mbcap(current,b)
++
++#define vx_cap_raised(v,c,f)	(vx_info_mbcap(v,c) & CAP_TO_MASK(f))
++
++#define vx_capable(b,c) (capable(b) || \
++	(cap_raised(current->cap_effective,b) && vx_ccaps(c)))
++
++
++#define vx_current_initpid(n) \
++	(current->vx_info && \
++	(current->vx_info->vx_initpid == (n)))
++
++
++#define __vx_state(v)	((v) ? ((v)->vx_state) : 0)
++
++#define vx_info_state(v,m)	(__vx_state(v) & (m))
++
++
++#define __nx_state(v)	((v) ? ((v)->nx_state) : 0)
++
++#define nx_info_state(v,m)	(__nx_state(v) & (m))
++
++#endif
+Index: linux-2.6.20/include/linux/vserver/cacct.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/cacct.h
+@@ -0,0 +1,15 @@
++#ifndef _VX_CACCT_H
++#define _VX_CACCT_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 */
+Index: linux-2.6.20/include/linux/vserver/cacct_cmd.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/cacct_cmd.h
+@@ -0,0 +1,23 @@
++#ifndef _VX_CACCT_CMD_H
++#define _VX_CACCT_CMD_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 */
+Index: linux-2.6.20/include/linux/vserver/cacct_def.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/cacct_def.h
+@@ -0,0 +1,43 @@
++#ifndef _VX_CACCT_DEF_H
++#define _VX_CACCT_DEF_H
++
++#include <asm/atomic.h>
++#include <linux/vserver/cacct.h>
++
++
++struct _vx_sock_acc {
++	atomic_long_t count;
++	atomic_long_t total;
++};
++
++/* 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)
++{
++	int i,j;
++
++	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");
++	}
++}
++
++#endif
++
++#endif	/* _VX_CACCT_DEF_H */
+Index: linux-2.6.20/include/linux/vserver/cacct_int.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/cacct_int.h
+@@ -0,0 +1,21 @@
++#ifndef _VX_CACCT_INT_H
++#define _VX_CACCT_INT_H
++
++
++#ifdef	__KERNEL__
++
++static inline
++unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
++{
++	return atomic_long_read(&cacct->sock[type][pos].count);
++}
++
++
++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 */
+Index: linux-2.6.20/include/linux/vserver/context.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/context.h
+@@ -0,0 +1,170 @@
++#ifndef _VX_CONTEXT_H
++#define _VX_CONTEXT_H
++
++#include <linux/types.h>
++#include <linux/capability.h>
++
++
++/* context flags */
++
++#define VXF_INFO_SCHED		0x00000002
++#define VXF_INFO_NPROC		0x00000004
++#define VXF_INFO_PRIVATE	0x00000008
++
++#define VXF_INFO_INIT		0x00000010
++#define VXF_INFO_HIDE		0x00000020
++#define VXF_INFO_ULIMIT		0x00000040
++#define VXF_INFO_NSPACE		0x00000080
++
++#define VXF_SCHED_HARD		0x00000100
++#define VXF_SCHED_PRIO		0x00000200
++#define VXF_SCHED_PAUSE		0x00000400
++
++#define VXF_VIRT_MEM		0x00010000
++#define VXF_VIRT_UPTIME		0x00020000
++#define VXF_VIRT_CPU		0x00040000
++#define VXF_VIRT_LOAD		0x00080000
++#define VXF_VIRT_TIME		0x00100000
++
++#define VXF_HIDE_MOUNT		0x01000000
++/* was	VXF_HIDE_NETIF		0x02000000 */
++#define VXF_HIDE_VINFO		0x04000000
++
++#define VXF_STATE_SETUP		(1ULL<<32)
++#define VXF_STATE_INIT		(1ULL<<33)
++#define VXF_STATE_ADMIN		(1ULL<<34)
++
++#define VXF_SC_HELPER		(1ULL<<36)
++#define VXF_REBOOT_KILL		(1ULL<<37)
++#define VXF_PERSISTENT		(1ULL<<38)
++
++#define VXF_FORK_RSS		(1ULL<<48)
++#define VXF_PROLIFIC		(1ULL<<49)
++
++#define VXF_IGNEG_NICE		(1ULL<<52)
++
++#define VXF_ONE_TIME		(0x0007ULL<<32)
++
++#define VXF_INIT_SET		(VXF_STATE_SETUP|VXF_STATE_INIT|VXF_STATE_ADMIN)
++
++
++/* context migration */
++
++#define VXM_SET_INIT		0x00000001
++#define VXM_SET_REAPER		0x00000002
++
++/* context caps */
++
++#define VXC_CAP_MASK		0x00000000
++
++#define VXC_SET_UTSNAME		0x00000001
++#define VXC_SET_RLIMIT		0x00000002
++
++#define VXC_RAW_ICMP		0x00000100
++#define VXC_SYSLOG		0x00001000
++
++#define VXC_SECURE_MOUNT	0x00010000
++#define VXC_SECURE_REMOUNT	0x00020000
++#define VXC_BINARY_MOUNT	0x00040000
++
++#define VXC_QUOTA_CTL		0x00100000
++#define VXC_ADMIN_MAPPER	0x00200000
++#define VXC_ADMIN_CLOOP		0x00400000
++
++
++#ifdef	__KERNEL__
++
++#include <linux/list.h>
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
++
++#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 */
++	xid_t vx_id;				/* context id */
++	atomic_t vx_usecnt;			/* usage count */
++	atomic_t vx_tasks;			/* tasks count */
++	struct vx_info *vx_parent;		/* parent context */
++	int vx_state;				/* context state */
++
++	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 */
++
++	struct _vx_limit limit;			/* vserver limits */
++	struct _vx_sched sched;			/* vserver scheduler */
++	struct _vx_cvirt cvirt;			/* virtual/bias stuff */
++	struct _vx_cacct cacct;			/* context accounting */
++
++#ifndef CONFIG_SMP
++	struct _vx_info_pc info_pc;		/* per cpu data */
++#else
++	struct _vx_info_pc *ptr_pc;		/* per cpu array */
++#endif
++
++	wait_queue_head_t vx_wait;		/* context exit waitqueue */
++	int reboot_cmd;				/* last sys_reboot() cmd */
++	int exit_code;				/* last process exit code */
++
++	char vx_name[65];			/* vserver name */
++};
++
++#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;
++	xid_t xid;
++};
++
++
++/* status flags */
++
++#define VXS_HASHED	0x0001
++#define VXS_PAUSED	0x0010
++#define VXS_SHUTDOWN	0x0100
++#define VXS_HELPER	0x1000
++#define VXS_RELEASED	0x8000
++
++
++extern void claim_vx_info(struct vx_info *, struct task_struct *);
++extern void release_vx_info(struct vx_info *, struct task_struct *);
++
++extern struct vx_info *lookup_vx_info(int);
++extern struct vx_info *lookup_or_create_vx_info(int);
++
++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 *, int);
++
++extern long vs_state_change(struct vx_info *, unsigned int);
++
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_CONTEXT_H */
+Index: linux-2.6.20/include/linux/vserver/context_cmd.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/context_cmd.h
+@@ -0,0 +1,123 @@
++#ifndef _VX_CONTEXT_CMD_H
++#define _VX_CONTEXT_CMD_H
++
++
++/* vinfo commands */
++
++#define VCMD_task_xid		VC_CMD(VINFO, 1, 0)
++
++#ifdef	__KERNEL__
++extern int vc_task_xid(uint32_t, void __user *);
++
++#endif	/* __KERNEL__ */
++
++#define VCMD_vx_info		VC_CMD(VINFO, 5, 0)
++
++struct	vcmd_vx_info_v0 {
++	uint32_t xid;
++	uint32_t initpid;
++	/* more to come */
++};
++
++#ifdef	__KERNEL__
++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 */
++
++#define VCMD_ctx_create_v0	VC_CMD(VPROC, 1, 0)
++#define VCMD_ctx_create		VC_CMD(VPROC, 1, 1)
++
++struct	vcmd_ctx_create {
++	uint64_t flagword;
++};
++
++#define VCMD_ctx_migrate_v0	VC_CMD(PROCMIG, 1, 0)
++#define VCMD_ctx_migrate	VC_CMD(PROCMIG, 1, 1)
++
++struct	vcmd_ctx_migrate {
++	uint64_t flagword;
++};
++
++#ifdef	__KERNEL__
++extern int vc_ctx_create(uint32_t, void __user *);
++extern int vc_ctx_migrate(struct vx_info *, void __user *);
++
++#endif	/* __KERNEL__ */
++
++
++/* flag commands */
++
++#define VCMD_get_cflags		VC_CMD(FLAGS, 1, 0)
++#define VCMD_set_cflags		VC_CMD(FLAGS, 2, 0)
++
++struct	vcmd_ctx_flags_v0 {
++	uint64_t flagword;
++	uint64_t mask;
++};
++
++#ifdef	__KERNEL__
++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_v0	VC_CMD(FLAGS, 3, 0)
++#define VCMD_set_ccaps_v0	VC_CMD(FLAGS, 4, 0)
++
++struct	vcmd_ctx_caps_v0 {
++	uint64_t bcaps;
++	uint64_t ccaps;
++	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_bcaps(struct vx_info *, void __user *);
++extern int vc_set_bcaps(struct vx_info *, void __user *);
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_CONTEXT_CMD_H */
+Index: linux-2.6.20/include/linux/vserver/cvirt.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/cvirt.h
+@@ -0,0 +1,20 @@
++#ifndef _VX_CVIRT_H
++#define _VX_CVIRT_H
++
++
++#ifdef	__KERNEL__
++
++struct timespec;
++
++void vx_vsi_uptime(struct timespec *, struct timespec *);
++
++
++struct vx_info;
++
++void vx_update_load(struct vx_info *);
++
++
++int vx_do_syslog(int, char __user *, int);
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_CVIRT_H */
+Index: linux-2.6.20/include/linux/vserver/cvirt_cmd.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/cvirt_cmd.h
+@@ -0,0 +1,53 @@
++#ifndef _VX_CVIRT_CMD_H
++#define _VX_CVIRT_CMD_H
++
++
++/* virtual host info name commands */
++
++#define VCMD_set_vhi_name	VC_CMD(VHOST, 1, 0)
++#define VCMD_get_vhi_name	VC_CMD(VHOST, 2, 0)
++
++struct	vcmd_vhi_name_v0 {
++	uint32_t field;
++	char name[65];
++};
++
++
++enum vhi_name_field {
++	VHIN_CONTEXT=0,
++	VHIN_SYSNAME,
++	VHIN_NODENAME,
++	VHIN_RELEASE,
++	VHIN_VERSION,
++	VHIN_MACHINE,
++	VHIN_DOMAINNAME,
++};
++
++
++#ifdef	__KERNEL__
++
++#include <linux/compiler.h>
++
++extern int vc_set_vhi_name(struct vx_info *, void __user *);
++extern int vc_get_vhi_name(struct vx_info *, void __user *);
++
++#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 */
+Index: linux-2.6.20/include/linux/vserver/cvirt_def.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/cvirt_def.h
+@@ -0,0 +1,82 @@
++#ifndef _VX_CVIRT_DEF_H
++#define _VX_CVIRT_DEF_H
++
++#include <linux/jiffies.h>
++#include <linux/spinlock.h>
++#include <linux/wait.h>
++#include <linux/time.h>
++#include <linux/utsname.h>
++#include <asm/atomic.h>
++
++
++struct _vx_usage_stat {
++	uint64_t user;
++	uint64_t nice;
++	uint64_t system;
++	uint64_t softirq;
++	uint64_t irq;
++	uint64_t idle;
++	uint64_t iowait;
++};
++
++struct _vx_syslog {
++	wait_queue_head_t log_wait;
++	spinlock_t logbuf_lock;		/* lock for the log buffer */
++
++	unsigned long log_start;	/* next char to be read by syslog() */
++	unsigned long con_start;	/* next char to be sent to consoles */
++	unsigned long log_end;	/* most-recently-written-char + 1 */
++	unsigned long logged_chars;	/* #chars since last read+clear operation */
++
++	char log_buf[1024];
++};
++
++
++/* context sub struct */
++
++struct _vx_cvirt {
++//	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 */
++
++	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 */
++
++	spinlock_t load_lock;		/* lock for the load averages */
++	atomic_t load_updates;		/* nr of load updates done so far */
++	uint32_t load_last;		/* last time load was calculated */
++	uint32_t load[3];		/* load averages 1,5,15 */
++
++	atomic_t total_forks;		/* number of forks so far */
++
++	struct _vx_syslog syslog;
++};
++
++struct _vx_cvirt_pc {
++	struct _vx_usage_stat cpustat;
++};
++
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++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 */
+Index: linux-2.6.20/include/linux/vserver/debug.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/debug.h
+@@ -0,0 +1,112 @@
++#ifndef _VX_DEBUG_H
++#define _VX_DEBUG_H
++
++
++#define VXD_CBIT(n,m)	(vx_debug_ ## n & (1 << (m)))
++#define VXD_CMIN(n,m)	(vx_debug_ ## n > (m))
++#define VXD_MASK(n,m)	(vx_debug_ ## n & (m))
++
++#define VXD_QPOS(v,p)	(((uint32_t)(v) >> ((p)*8)) & 0xFF)
++#define VXD_QUAD(v)	VXD_QPOS(v,0), VXD_QPOS(v,1),		\
++			VXD_QPOS(v,2), VXD_QPOS(v,3)
++#define VXF_QUAD	"%u.%u.%u.%u"
++
++#define VXD_DEV(d)	(d), (d)->bd_inode->i_ino,		\
++			imajor((d)->bd_inode), iminor((d)->bd_inode)
++#define VXF_DEV		"%p[%lu,%d:%d]"
++
++
++#define __FUNC__	__func__
++
++
++#ifdef	CONFIG_VSERVER_DEBUG
++
++extern unsigned int vx_debug_switch;
++extern unsigned int vx_debug_xid;
++extern unsigned int vx_debug_nid;
++extern unsigned int vx_debug_tag;
++extern unsigned int vx_debug_net;
++extern unsigned int vx_debug_limit;
++extern unsigned int vx_debug_cres;
++extern unsigned int vx_debug_dlim;
++extern unsigned int vx_debug_quota;
++extern unsigned int vx_debug_cvirt;
++extern unsigned int vx_debug_misc;
++
++
++#define VX_LOGLEVEL	"vxD: "
++#define VX_WARNLEVEL	KERN_WARNING "vxW: "
++
++#define vxdprintk(c,f,x...)					\
++	do {							\
++		if (c)						\
++			printk(VX_LOGLEVEL f "\n" , ##x);	\
++	} while (0)
++
++#define vxlprintk(c,f,x...)					\
++	do {							\
++		if (c)						\
++			printk(VX_LOGLEVEL f " @%s:%d\n", x);	\
++	} while (0)
++
++#define vxfprintk(c,f,x...)					\
++	do {							\
++		if (c)						\
++			printk(VX_LOGLEVEL f " %s@%s:%d\n", x); \
++	} while (0)
++
++
++#define 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 */
+Index: linux-2.6.20/include/linux/vserver/debug_cmd.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/debug_cmd.h
+@@ -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 */
+Index: linux-2.6.20/include/linux/vserver/device.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/device.h
+@@ -0,0 +1,13 @@
++#ifndef _VX_DEVICE_H
++#define _VX_DEVICE_H
++
++
++#define DATTR_CREATE	0x00000001
++#define DATTR_OPEN	0x00000002
++
++#define DATTR_REMAP	0x00000010
++
++
++#else	/* _VX_DEVICE_H */
++#warning duplicate inclusion
++#endif	/* _VX_DEVICE_H */
+Index: linux-2.6.20/include/linux/vserver/device_cmd.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/device_cmd.h
+@@ -0,0 +1,41 @@
++#ifndef _VX_DEVICE_CMD_H
++#define _VX_DEVICE_CMD_H
++
++
++/*  device vserver commands */
++
++#define VCMD_set_mapping	VC_CMD(DEVICE, 1, 0)
++
++struct	vcmd_set_mapping_v0 {
++	const char __user *device;
++	const char __user *target;
++	uint32_t flags;
++};
++
++
++#ifdef	__KERNEL__
++
++#ifdef	CONFIG_COMPAT
++
++#include <asm/compat.h>
++
++struct	vcmd_set_mapping_v0_x32 {
++	compat_uptr_t device_ptr;
++	compat_uptr_t target_ptr;
++	uint32_t flags;
++};
++
++#endif	/* CONFIG_COMPAT */
++
++#include <linux/compiler.h>
++
++extern int vc_set_mapping(uint32_t, void __user *);
++
++#ifdef	CONFIG_COMPAT
++
++extern int vc_set_mapping_x32(uint32_t, void __user *);
++
++#endif	/* CONFIG_COMPAT */
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_DEVICE_CMD_H */
+Index: linux-2.6.20/include/linux/vserver/dlimit.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/dlimit.h
+@@ -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 */
+Index: linux-2.6.20/include/linux/vserver/dlimit_cmd.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/dlimit_cmd.h
+@@ -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;
++};
++
++struct	vcmd_ctx_dlimit_v0 {
++	const char __user *name;
++	uint32_t space_used;			/* used space in kbytes */
++	uint32_t space_total;			/* maximum space in kbytes */
++	uint32_t inodes_used;			/* used inodes */
++	uint32_t inodes_total;			/* maximum inodes */
++	uint32_t reserved;			/* reserved for root in % */
++	uint32_t flags;
++};
++
++#define CDLIM_UNSET		((uint32_t)0UL)
++#define CDLIM_INFINITY		((uint32_t)~0UL)
++#define CDLIM_KEEP		((uint32_t)~1UL)
++
++#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 */
++
++#include <linux/compiler.h>
++
++extern int vc_add_dlimit(uint32_t, void __user *);
++extern int vc_rem_dlimit(uint32_t, void __user *);
++
++extern int vc_set_dlimit(uint32_t, void __user *);
++extern int vc_get_dlimit(uint32_t, void __user *);
++
++#ifdef	CONFIG_COMPAT
++
++extern int vc_add_dlimit_x32(uint32_t, void __user *);
++extern int vc_rem_dlimit_x32(uint32_t, void __user *);
++
++extern int vc_set_dlimit_x32(uint32_t, void __user *);
++extern int vc_get_dlimit_x32(uint32_t, void __user *);
++
++#endif	/* CONFIG_COMPAT */
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_DLIMIT_CMD_H */
+Index: linux-2.6.20/include/linux/vserver/global.h
+===================================================================
+--- /dev/null
++++ linux-2.6.20/include/linux/vserver/global.h
+@@ -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;
++