diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/Makefile linux-2.6.20.14-vs2.2.0.0.6/Makefile
--- linux-2.6.20.14-vs2.2.0/Makefile	2007-06-13 02:42:10 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/Makefile	2007-06-15 01:28:45 +0200
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 20
-EXTRAVERSION = .14-vs2.2.0
+EXTRAVERSION = .14-vs2.2.0.0.6
 NAME = Homicidal Dwarf Hamster
 
 # *DOCUMENTATION*
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/arch/alpha/kernel/ptrace.c linux-2.6.20.14-vs2.2.0.0.6/arch/alpha/kernel/ptrace.c
--- linux-2.6.20.14-vs2.2.0/arch/alpha/kernel/ptrace.c	2007-02-06 03:05:21 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/arch/alpha/kernel/ptrace.c	2007-06-13 18:45:45 +0200
@@ -284,7 +284,7 @@ do_sys_ptrace(long request, long pid, lo
 		goto out_notsk;
 	}
 
-	if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT)) {
+	if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT)) {
 		ret = -EPERM;
 		goto out;
 	}
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/arch/ia64/kernel/ptrace.c linux-2.6.20.14-vs2.2.0.0.6/arch/ia64/kernel/ptrace.c
--- linux-2.6.20.14-vs2.2.0/arch/ia64/kernel/ptrace.c	2007-02-06 03:05:21 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/arch/ia64/kernel/ptrace.c	2007-06-13 18:45:53 +0200
@@ -1443,7 +1443,7 @@ 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))
+	if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
 		goto out_tsk;
 
 	ret = -EPERM;
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/arch/m68k/kernel/ptrace.c linux-2.6.20.14-vs2.2.0.0.6/arch/m68k/kernel/ptrace.c
--- linux-2.6.20.14-vs2.2.0/arch/m68k/kernel/ptrace.c	2007-02-06 03:05:21 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/arch/m68k/kernel/ptrace.c	2007-06-13 18:46:00 +0200
@@ -280,7 +280,7 @@ 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))
+	if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
 		goto out_tsk;
 
 	return ret;
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/arch/mips/kernel/ptrace.c linux-2.6.20.14-vs2.2.0.0.6/arch/mips/kernel/ptrace.c
--- linux-2.6.20.14-vs2.2.0/arch/mips/kernel/ptrace.c	2007-02-06 03:05:21 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/arch/mips/kernel/ptrace.c	2007-06-13 18:46:07 +0200
@@ -173,7 +173,7 @@ long arch_ptrace(struct task_struct *chi
 {
 	int ret;
 
-	if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT))
+	if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
 		goto out;
 
 	switch (request) {
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/arch/s390/kernel/ptrace.c linux-2.6.20.14-vs2.2.0.0.6/arch/s390/kernel/ptrace.c
--- linux-2.6.20.14-vs2.2.0/arch/s390/kernel/ptrace.c	2007-02-06 03:05:21 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/arch/s390/kernel/ptrace.c	2007-06-13 18:46:13 +0200
@@ -724,7 +724,7 @@ sys_ptrace(long request, long pid, long 
 		goto out;
 	}
 
-	if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT)) {
+	if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT)) {
 		ret = -EPERM;
 		goto out_tsk;
 	}
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/arch/sparc/kernel/ptrace.c linux-2.6.20.14-vs2.2.0.0.6/arch/sparc/kernel/ptrace.c
--- linux-2.6.20.14-vs2.2.0/arch/sparc/kernel/ptrace.c	2007-02-06 03:05:21 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/arch/sparc/kernel/ptrace.c	2007-06-13 18:46:20 +0200
@@ -303,7 +303,7 @@ 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)) {
+	if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT)) {
 		pt_error_return(regs, ESRCH);
 		goto out_tsk;
 	}
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/arch/sparc64/kernel/ptrace.c linux-2.6.20.14-vs2.2.0.0.6/arch/sparc64/kernel/ptrace.c
--- linux-2.6.20.14-vs2.2.0/arch/sparc64/kernel/ptrace.c	2007-02-06 03:05:21 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/arch/sparc64/kernel/ptrace.c	2007-06-13 18:46:26 +0200
@@ -216,7 +216,7 @@ 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)) {
+	if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT)) {
 		pt_error_return(regs, ESRCH);
 		goto out_tsk;
 	}
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/arch/v850/kernel/ptrace.c linux-2.6.20.14-vs2.2.0.0.6/arch/v850/kernel/ptrace.c
--- linux-2.6.20.14-vs2.2.0/arch/v850/kernel/ptrace.c	2007-02-06 03:05:21 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/arch/v850/kernel/ptrace.c	2007-06-13 18:46:34 +0200
@@ -118,7 +118,7 @@ long arch_ptrace(struct task_struct *chi
 {
 	int rval;
 
-	if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT))
+	if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
 		goto out;
 
 	switch (request) {
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/drivers/block/vroot.c linux-2.6.20.14-vs2.2.0.0.6/drivers/block/vroot.c
--- linux-2.6.20.14-vs2.2.0/drivers/block/vroot.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/drivers/block/vroot.c	2007-06-13 19:18:14 +0200
@@ -97,7 +97,7 @@ static int vroot_clr_dev(
 }
 
 
-static int vr_ioctl(struct inode * inode, struct file * file,
+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;
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/drivers/md/dm-ioctl.c linux-2.6.20.14-vs2.2.0.0.6/drivers/md/dm-ioctl.c
--- linux-2.6.20.14-vs2.2.0/drivers/md/dm-ioctl.c	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/drivers/md/dm-ioctl.c	2007-06-13 18:47:12 +0200
@@ -101,7 +101,7 @@ static struct hash_cell *__get_name_cell
 	unsigned int h = hash_str(str);
 
 	list_for_each_entry (hc, _name_buckets + h, name_list)
-		if (vx_check(dm_get_xid(hc->md), VS_WATCH_P|VS_IDENT) &&
+		if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
 			!strcmp(hc->name, str)) {
 			dm_get(hc->md);
 			return hc;
@@ -116,7 +116,7 @@ static struct hash_cell *__get_uuid_cell
 	unsigned int h = hash_str(str);
 
 	list_for_each_entry (hc, _uuid_buckets + h, uuid_list)
-		if (vx_check(dm_get_xid(hc->md), VS_WATCH_P|VS_IDENT) &&
+		if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
 			!strcmp(hc->uuid, str)) {
 			dm_get(hc->md);
 			return hc;
@@ -402,7 +402,7 @@ 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))
+			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;
@@ -427,7 +427,7 @@ 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))
+			if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
 				continue;
 			if (old_nl)
 				old_nl->next = (uint32_t) ((void *) nl -
@@ -619,7 +619,7 @@ static struct hash_cell *__find_device_h
 	if (!md)
 		goto out;
 
-	if (vx_check(dm_get_xid(md), VS_WATCH_P|VS_IDENT))
+	if (vx_check(dm_get_xid(md), VS_WATCH_P | VS_IDENT))
 		mdptr = dm_get_mdptr(md);
 
 	if (!mdptr)
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/fs/devpts/inode.c linux-2.6.20.14-vs2.2.0.0.6/fs/devpts/inode.c
--- linux-2.6.20.14-vs2.2.0/fs/devpts/inode.c	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/fs/devpts/inode.c	2007-06-13 18:47:27 +0200
@@ -27,7 +27,7 @@ static int devpts_permission(struct inod
 	int ret = -EACCES;
 
 	/* devpts is xid tagged */
-	if (vx_check((xid_t)inode->i_tag, VS_WATCH_P|VS_IDENT))
+	if (vx_check((xid_t)inode->i_tag, VS_WATCH_P | VS_IDENT))
 		ret = generic_permission(inode, mask, NULL);
 	return ret;
 }
@@ -108,7 +108,7 @@ static int devpts_remount(struct super_b
 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);
+	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)
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/fs/libfs.c linux-2.6.20.14-vs2.2.0.0.6/fs/libfs.c
--- linux-2.6.20.14-vs2.2.0/fs/libfs.c	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/fs/libfs.c	2007-06-13 19:17:16 +0200
@@ -124,8 +124,8 @@ static inline unsigned char dt_type(stru
  * both impossible due to the lock on directory.
  */
 
-static inline int do_dcache_readdir_filter(struct file * filp,
-	void * dirent, filldir_t filldir, int (*filter)(struct dentry *dentry))
+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;
@@ -175,12 +175,12 @@ static inline int do_dcache_readdir_filt
 	return 0;
 }
 
-int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
+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 dcache_readdir_filter(struct file *filp, void *dirent, filldir_t filldir,
 	int (*filter)(struct dentry *))
 {
 	return do_dcache_readdir_filter(filp, dirent, filldir, filter);
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/fs/locks.c linux-2.6.20.14-vs2.2.0.0.6/fs/locks.c
--- linux-2.6.20.14-vs2.2.0/fs/locks.c	2007-02-25 17:48:19 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/fs/locks.c	2007-06-13 18:47:41 +0200
@@ -2163,7 +2163,7 @@ int get_locks_status(char *buffer, char 
 		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))
+		if (!vx_check(fl->fl_xid, VS_WATCH_P | VS_IDENT))
 			continue;
 
 		lock_get_status(q, fl, ++i, "");
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_context.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_context.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vs_context.h	2007-02-06 04:58:45 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_context.h	2007-06-13 17:24:44 +0200
@@ -7,7 +7,7 @@
 #include "vserver/debug.h"
 
 
-#define get_vx_info(i)	__get_vx_info(i,__FILE__,__LINE__,__HERE__)
+#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)
@@ -16,7 +16,8 @@ static inline struct vx_info *__get_vx_i
 		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,
+		vxi, vxi ? vxi->vx_id : 0,
+		vxi ? atomic_read(&vxi->vx_usecnt) : 0,
 		_file, _line);
 	__vxh_get_vx_info(vxi, _here);
 
@@ -27,7 +28,7 @@ static inline struct vx_info *__get_vx_i
 
 extern void free_vx_info(struct vx_info *);
 
-#define put_vx_info(i)	__put_vx_info(i,__FILE__,__LINE__,__HERE__)
+#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)
@@ -36,7 +37,8 @@ static inline void __put_vx_info(struct 
 		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,
+		vxi, vxi ? vxi->vx_id : 0,
+		vxi ? atomic_read(&vxi->vx_usecnt) : 0,
 		_file, _line);
 	__vxh_put_vx_info(vxi, _here);
 
@@ -45,7 +47,8 @@ static inline void __put_vx_info(struct 
 }
 
 
-#define init_vx_info(p,i) __init_vx_info(p,i,__FILE__,__LINE__,__HERE__)
+#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)
@@ -53,8 +56,8 @@ static inline void __init_vx_info(struct
 	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,
+			vxi, vxi ? vxi->vx_id : 0,
+			vxi ? atomic_read(&vxi->vx_usecnt) : 0,
 			_file, _line);
 		__vxh_init_vx_info(vxi, vxp, _here);
 
@@ -64,7 +67,8 @@ static inline void __init_vx_info(struct
 }
 
 
-#define set_vx_info(p,i) __set_vx_info(p,i,__FILE__,__LINE__,__HERE__)
+#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)
@@ -75,8 +79,8 @@ static inline void __set_vx_info(struct 
 		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,
+		vxi, vxi ? vxi->vx_id : 0,
+		vxi ? atomic_read(&vxi->vx_usecnt) : 0,
 		_file, _line);
 	__vxh_set_vx_info(vxi, vxp, _here);
 
@@ -86,7 +90,7 @@ static inline void __set_vx_info(struct 
 }
 
 
-#define clr_vx_info(p) __clr_vx_info(p,__FILE__,__LINE__,__HERE__)
+#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)
@@ -98,8 +102,8 @@ static inline void __clr_vx_info(struct 
 		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,
+		vxo, vxo ? vxo->vx_id : 0,
+		vxo ? atomic_read(&vxo->vx_usecnt) : 0,
 		_file, _line);
 	__vxh_clr_vx_info(vxo, vxp, _here);
 
@@ -108,17 +112,17 @@ static inline void __clr_vx_info(struct 
 }
 
 
-#define claim_vx_info(v,p) \
-	__claim_vx_info(v,p,__FILE__,__LINE__,__HERE__)
+#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,
+		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);
 
@@ -128,17 +132,17 @@ static inline void __claim_vx_info(struc
 
 extern void unhash_vx_info(struct vx_info *);
 
-#define release_vx_info(v,p) \
-	__release_vx_info(v,p,__FILE__,__LINE__,__HERE__)
+#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,
+		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);
 
@@ -150,7 +154,7 @@ static inline void __release_vx_info(str
 
 
 #define task_get_vx_info(p) \
-	__task_get_vx_info(p,__FILE__,__LINE__,__HERE__)
+	__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)
@@ -173,7 +177,7 @@ static inline void __wakeup_vx_info(stru
 }
 
 
-#define enter_vx_info(v,s)	__enter_vx_info(v,s,__FILE__,__LINE__)
+#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)
@@ -186,7 +190,7 @@ static inline void __enter_vx_info(struc
 	current->xid = vxi ? vxi->vx_id : 0;
 }
 
-#define leave_vx_info(s)	__leave_vx_info(s,__FILE__,__LINE__)
+#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)
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_cowbl.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_cowbl.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vs_cowbl.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_cowbl.h	2007-06-13 16:44:33 +0200
@@ -31,7 +31,7 @@ static inline int cow_check_and_break(st
 			} else
 				error = PTR_ERR(new_dentry);
 		} else {
-			inode->i_flags &= ~(S_IUNLINK|S_IMMUTABLE);
+			inode->i_flags &= ~(S_IUNLINK | S_IMMUTABLE);
 			inode->i_ctime = CURRENT_TIME;
 			mark_inode_dirty(inode);
 		}
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_dlimit.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_dlimit.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vs_dlimit.h	2007-03-10 18:02:51 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_dlimit.h	2007-06-13 16:51:59 +0200
@@ -6,7 +6,7 @@
 #include "vserver/debug.h"
 
 
-#define get_dl_info(i)	__get_dl_info(i,__FILE__,__LINE__)
+#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)
@@ -14,7 +14,8 @@ static inline struct dl_info *__get_dl_i
 	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,
+		dli, dli ? dli->dl_tag : 0,
+		dli ? atomic_read(&dli->dl_usecnt) : 0,
 		_file, _line);
 	atomic_inc(&dli->dl_usecnt);
 	return dli;
@@ -22,9 +23,9 @@ static inline struct dl_info *__get_dl_i
 
 
 #define free_dl_info(i) \
-	call_rcu(&i->dl_rcu, rcu_free_dl_info);
+	call_rcu(&(i)->dl_rcu, rcu_free_dl_info)
 
-#define put_dl_info(i)	__put_dl_info(i,__FILE__,__LINE__)
+#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)
@@ -32,14 +33,15 @@ static inline void __put_dl_info(struct 
 	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,
+		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)?'*':' ')
+#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)
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_limit.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_limit.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vs_limit.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_limit.h	2007-06-13 16:53:55 +0200
@@ -9,22 +9,22 @@
 #include "vserver/limit_int.h"
 
 
-#define vx_acc_cres(v,d,p,r) \
+#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) \
+#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) \
+#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_sub_cres(v, a, p, r)		vx_add_cres(v, -(a), p, r)
 
-#define vx_add_cres_cond(x,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)
+#define vx_sub_cres_cond(x, a, p, r)	vx_add_cres_cond(x, -(a), p, r)
 
 
 /* process and file limits */
@@ -54,7 +54,7 @@
 	vx_acc_cres(current->vx_info,-1, (void *)(long)(f), VLIMIT_OPENFD)
 
 
-#define vx_cres_avail(v,n,r) \
+#define vx_cres_avail(v, n, r) \
 	__vx_cres_avail(v, r, n, __FILE__, __LINE__)
 
 
@@ -101,23 +101,23 @@
 
 /* ipc resource limits */
 
-#define vx_ipcmsg_add(v,u,a) \
+#define vx_ipcmsg_add(v, u, a) \
 	vx_add_cres(v, a, u, RLIMIT_MSGQUEUE)
 
-#define vx_ipcmsg_sub(v,u,a) \
+#define vx_ipcmsg_sub(v, u, a) \
 	vx_sub_cres(v, a, u, RLIMIT_MSGQUEUE)
 
-#define vx_ipcmsg_avail(v,a) \
+#define vx_ipcmsg_avail(v, a) \
 	vx_cres_avail(v, a, RLIMIT_MSGQUEUE)
 
 
-#define vx_ipcshm_add(v,k,a) \
+#define vx_ipcshm_add(v, k, a) \
 	vx_add_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
 
-#define vx_ipcshm_sub(v,k,a) \
+#define vx_ipcshm_sub(v, k, a) \
 	vx_sub_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
 
-#define vx_ipcshm_avail(v,a) \
+#define vx_ipcshm_avail(v, a) \
 	vx_cres_avail(v, a, VLIMIT_SHMEM)
 
 
@@ -125,7 +125,7 @@
 	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)
+	vx_acc_cres(current->vx_info, -1, a, VLIMIT_SEMARY)
 
 
 #define vx_nsems_add(a,n) \
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_memory.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_memory.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vs_memory.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_memory.h	2007-06-13 19:54:23 +0200
@@ -9,103 +9,103 @@
 #include "vserver/limit_int.h"
 
 
-#define __acc_add_long(a,v)	(*(v) += (a))
+#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_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_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 {					\
+#define vx_acc_page(m, d, v, r) do {					\
 	if ((d) > 0)							\
-		__acc_inc_long(&(m->v));				\
+		__acc_inc_long(&(m)->v);				\
 	else								\
-		__acc_dec_long(&(m->v));				\
+		__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 {				\
+#define vx_acc_page_atomic(m, d, v, r) do {				\
 	if ((d) > 0)							\
-		__acc_inc_atomic(&(m->v));				\
+		__acc_inc_atomic(&(m)->v);				\
 	else								\
-		__acc_dec_atomic(&(m->v));				\
+		__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 {					\
+#define vx_acc_pages(m, p, v, r) do {					\
 	unsigned long __p = (p);					\
-	__acc_add_long(__p, &(m->v));					\
+	__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 {				\
+#define vx_acc_pages_atomic(m, p, v, r) do {				\
 	unsigned long __p = (p);					\
-	__acc_add_atomic(__p, &(m->v));					\
+	__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) \
+#define vx_acc_vmpage(m, d) \
 	vx_acc_page(m, d, total_vm,  RLIMIT_AS)
-#define vx_acc_vmlpage(m,d) \
+#define vx_acc_vmlpage(m, d) \
 	vx_acc_page(m, d, locked_vm, RLIMIT_MEMLOCK)
-#define vx_acc_file_rsspage(m,d) \
+#define vx_acc_file_rsspage(m, d) \
 	vx_acc_page_atomic(m, d, _file_rss, VLIMIT_MAPPED)
-#define vx_acc_anon_rsspage(m,d) \
+#define vx_acc_anon_rsspage(m, d) \
 	vx_acc_page_atomic(m, d, _anon_rss, VLIMIT_ANON)
 
-#define vx_acc_vmpages(m,p) \
+#define vx_acc_vmpages(m, p) \
 	vx_acc_pages(m, p, total_vm,  RLIMIT_AS)
-#define vx_acc_vmlpages(m,p) \
+#define vx_acc_vmlpages(m, p) \
 	vx_acc_pages(m, p, locked_vm, RLIMIT_MEMLOCK)
-#define vx_acc_file_rsspages(m,p) \
+#define vx_acc_file_rsspages(m, p) \
 	vx_acc_pages_atomic(m, p, _file_rss, VLIMIT_MAPPED)
-#define vx_acc_anon_rsspages(m,p) \
+#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_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_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_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_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_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) \
+#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_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) \
+#define vx_rss_avail(m, p) \
 	__vx_cres_array_avail((m)->mm_vx_info, VLA_RSS, p, __FILE__, __LINE__)
 
 
@@ -119,7 +119,7 @@ enum {
 };
 
 #if 0
-#define	vx_page_fault(mm,vma,type,ret)
+#define	vx_page_fault(mm, vma, type, ret)
 #else
 
 static inline
@@ -130,7 +130,7 @@ void __vx_page_fault(struct mm_struct *m
 	int what;
 /*
 	static char *page_type[6] =
-		{ "UNKNOWN", "ANON","NONE", "FILE", "SWAP", "WRITE" };
+		{ "UNKNOWN", "ANON", "NONE", "FILE", "SWAP", "WRITE" };
 	static char *page_what[4] =
 		{ "FAULT_OOM", "FAULT_SIGBUS", "FAULT_MINOR", "FAULT_MAJOR" };
 */
@@ -148,7 +148,7 @@ void __vx_page_fault(struct mm_struct *m
 	atomic_inc(&vxi->cacct.page[type][what]);
 }
 
-#define	vx_page_fault(mm,vma,type,ret)	__vx_page_fault(mm,vma,type,ret)
+#define	vx_page_fault(mm, vma, type, ret)	__vx_page_fault(mm, vma, type, ret)
 #endif
 
 
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_network.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_network.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vs_network.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_network.h	2007-06-14 18:04:33 +0200
@@ -7,7 +7,7 @@
 #include "vserver/debug.h"
 
 
-#define get_nx_info(i)	__get_nx_info(i,__FILE__,__LINE__)
+#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)
@@ -16,7 +16,8 @@ static inline struct nx_info *__get_nx_i
 		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,
+		nxi, nxi ? nxi->nx_id : 0,
+		nxi ? atomic_read(&nxi->nx_usecnt) : 0,
 		_file, _line);
 
 	atomic_inc(&nxi->nx_usecnt);
@@ -26,7 +27,7 @@ static inline struct nx_info *__get_nx_i
 
 extern void free_nx_info(struct nx_info *);
 
-#define put_nx_info(i)	__put_nx_info(i,__FILE__,__LINE__)
+#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)
 {
@@ -34,7 +35,8 @@ static inline void __put_nx_info(struct 
 		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,
+		nxi, nxi ? nxi->nx_id : 0,
+		nxi ? atomic_read(&nxi->nx_usecnt) : 0,
 		_file, _line);
 
 	if (atomic_dec_and_test(&nxi->nx_usecnt))
@@ -42,7 +44,7 @@ static inline void __put_nx_info(struct 
 }
 
 
-#define init_nx_info(p,i) __init_nx_info(p,i,__FILE__,__LINE__)
+#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)
@@ -50,8 +52,8 @@ static inline void __init_nx_info(struct
 	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,
+			nxi, nxi ? nxi->nx_id : 0,
+			nxi ? atomic_read(&nxi->nx_usecnt) : 0,
 			_file, _line);
 
 		atomic_inc(&nxi->nx_usecnt);
@@ -60,7 +62,7 @@ static inline void __init_nx_info(struct
 }
 
 
-#define set_nx_info(p,i) __set_nx_info(p,i,__FILE__,__LINE__)
+#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)
@@ -71,8 +73,8 @@ static inline void __set_nx_info(struct 
 		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,
+		nxi, nxi ? nxi->nx_id : 0,
+		nxi ? atomic_read(&nxi->nx_usecnt) : 0,
 		_file, _line);
 
 	atomic_inc(&nxi->nx_usecnt);
@@ -80,7 +82,7 @@ static inline void __set_nx_info(struct 
 	BUG_ON(nxo);
 }
 
-#define clr_nx_info(p)	__clr_nx_info(p,__FILE__,__LINE__)
+#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)
@@ -92,8 +94,8 @@ static inline void __clr_nx_info(struct 
 		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,
+		nxo, nxo ? nxo->nx_id : 0,
+		nxo ? atomic_read(&nxo->nx_usecnt) : 0,
 		_file, _line);
 
 	if (atomic_dec_and_test(&nxo->nx_usecnt))
@@ -101,13 +103,13 @@ static inline void __clr_nx_info(struct 
 }
 
 
-#define claim_nx_info(v,p) __claim_nx_info(v,p,__FILE__,__LINE__)
+#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, nxi ? nxi->nx_id : 0,
 		nxi?atomic_read(&nxi->nx_usecnt):0,
 		nxi?atomic_read(&nxi->nx_tasks):0,
 		task, _file, _line);
@@ -118,15 +120,15 @@ static inline void __claim_nx_info(struc
 
 extern void unhash_nx_info(struct nx_info *);
 
-#define release_nx_info(v,p) __release_nx_info(v,p,__FILE__,__LINE__)
+#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,
+		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();
@@ -136,7 +138,7 @@ static inline void __release_nx_info(str
 }
 
 
-#define task_get_nx_info(i)	__task_get_nx_info(i,__FILE__,__LINE__)
+#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)
@@ -156,7 +158,7 @@ static __inline__ struct nx_info *__task
 
 static inline int addr_in_nx_info(struct nx_info *nxi, uint32_t addr)
 {
-	int n,i;
+	int n, i;
 
 	if (!nxi)
 		return 1;
@@ -164,7 +166,7 @@ static inline int addr_in_nx_info(struct
 	n = nxi->nbipv4;
 	if (n && (nxi->ipv4[0] == 0))
 		return 1;
-	for (i=0; i<n; i++) {
+	for (i = 0; i < n; i++) {
 		if (nxi->ipv4[i] == addr)
 			return 1;
 	}
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_pid.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_pid.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vs_pid.h	2007-03-25 00:57:25 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_pid.h	2007-06-13 18:54:22 +0200
@@ -10,10 +10,10 @@
 /* pid faking stuff */
 
 
-#define vx_info_map_pid(v,p) \
+#define vx_info_map_pid(v, p) \
 	__vx_info_map_pid((v), (p), __FUNC__, __FILE__, __LINE__)
 #define vx_info_map_tgid(v,p)  vx_info_map_pid(v,p)
-#define vx_map_pid(p)	vx_info_map_pid(current->vx_info, p)
+#define vx_map_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,
@@ -23,7 +23,7 @@ static inline int __vx_info_map_pid(stru
 		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,
+			(pid && pid == vxi->vx_initpid) ? 1 : pid,
 			func, file, line);
 		if (pid == 0)
 			return 0;
@@ -33,9 +33,9 @@ static inline int __vx_info_map_pid(stru
 	return pid;
 }
 
-#define vx_info_rmap_pid(v,p) \
+#define vx_info_rmap_pid(v, p) \
 	__vx_info_rmap_pid((v), (p), __FUNC__, __FILE__, __LINE__)
-#define vx_rmap_pid(p)	vx_info_rmap_pid(current->vx_info, p)
+#define vx_rmap_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,
@@ -45,7 +45,7 @@ static inline int __vx_info_rmap_pid(str
 		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,
+			(pid == 1) ? vxi->vx_initpid : pid,
 			func, file, line);
 		if ((pid == 1) && vxi->vx_initpid)
 			return vxi->vx_initpid;
@@ -56,7 +56,7 @@ static inline int __vx_info_rmap_pid(str
 }
 
 
-#define VXF_FAKE_INIT	(VXF_INFO_INIT|VXF_STATE_INIT)
+#define VXF_FAKE_INIT	(VXF_INFO_INIT | VXF_STATE_INIT)
 
 static inline
 int vx_proc_task_visible(struct task_struct *task)
@@ -65,7 +65,7 @@ int vx_proc_task_visible(struct task_str
 		!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))
+	if (vx_check(vx_task_xid(task), VS_WATCH | VS_IDENT))
 		goto visible;
 	return 0;
 visible:
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_socket.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_socket.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vs_socket.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_socket.h	2007-06-13 17:21:27 +0200
@@ -29,8 +29,8 @@ static inline int vx_sock_type(int famil
 	}
 }
 
-#define vx_acc_sock(v,f,p,s) \
-	__vx_acc_sock((v), (f), (p), (s), __FILE__, __LINE__)
+#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)
@@ -43,12 +43,12 @@ static inline void __vx_acc_sock(struct 
 	}
 }
 
-#define vx_sock_recv(sk,s) \
-	vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 0, (s))
-#define vx_sock_send(sk,s) \
-	vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 1, (s))
-#define vx_sock_fail(sk,s) \
-	vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 2, (s))
+#define vx_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 {		\
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vs_tag.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_tag.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vs_tag.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vs_tag.h	2007-06-14 18:06:32 +0200
@@ -18,9 +18,9 @@
 
 #define dx_current_tag() dx_task_tag(current)
 
-#define dx_check(c,m)	__dx_check(dx_current_tag(),c,m)
+#define dx_check(c, m)	__dx_check(dx_current_tag(), c, m)
 
-#define dx_weak_check(c,m)	((m) ? dx_check(c,m) : 1)
+#define dx_weak_check(c, m)	((m) ? dx_check(c, m) : 1)
 
 
 /*
@@ -30,8 +30,7 @@
 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))
+		if ((mode & DX_IDENT) && (id == cid))
 			return 1;
 	}
 	return (((mode & DX_ADMIN) && (cid == 0)) ||
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/base.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/base.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vserver/base.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/base.h	2007-06-14 18:09:31 +0200
@@ -63,8 +63,7 @@ enum {
 static inline int __vs_check(int cid, int id, unsigned int mode)
 {
 	if (mode & VS_ARG_MASK) {
-		if ((mode & VS_IDENT) &&
-			(id == cid))
+		if ((mode & VS_IDENT) && (id == cid))
 			return 1;
 	}
 	if (mode & VS_ATR_MASK) {
@@ -96,9 +95,9 @@ static inline int __vs_check(int cid, in
 #define current_vx_info() (current->vx_info)
 
 
-#define vx_check(c,m)	__vs_check(vx_current_xid(),c,(m)|VS_IRQ)
+#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 vx_weak_check(c, m)	((m) ? vx_check(c, m) : 1)
 
 
 #define nx_task_nid(t)	((t)->nid)
@@ -108,21 +107,21 @@ static inline int __vs_check(int cid, in
 #define current_nx_info() (current->nx_info)
 
 
-#define nx_check(c,m)	__vs_check(nx_current_nid(),c,m)
+#define nx_check(c, m)	__vs_check(nx_current_nid(), c, m)
 
-#define nx_weak_check(c,m)	((m) ? nx_check(c,m) : 1)
+#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_check_flags(v, m, f)	(((v) & (m)) ^ (f))
 
-#define vs_mask_flags(v,f,m)	(((v) & ~(m)) | ((f) & (m)))
+#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_mask_mask(v, f, m)	(((v) & ~(m)) | ((v) & (f) & (m)))
 
-#define vs_check_bit(v,n)	((v) & (1LL << (n)))
+#define vs_check_bit(v, n)	((v) & (1LL << (n)))
 
 
 /* context flags */
@@ -131,13 +130,13 @@ static inline int __vs_check(int cid, in
 
 #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 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 task_vx_flags(t, m, f) \
+	((t) && vx_info_flags((t)->vx_info, m, f))
 
-#define vx_flags(m,f)	vx_info_flags(current->vx_info,(m),(f))
+#define vx_flags(m, f)	vx_info_flags(current->vx_info, m, f)
 
 
 /* context caps */
@@ -146,9 +145,9 @@ static inline int __vs_check(int cid, in
 
 #define vx_current_ccaps()	__vx_ccaps(current->vx_info)
 
-#define vx_info_ccaps(v,c)	(__vx_ccaps(v) & (c))
+#define vx_info_ccaps(v, c)	(__vx_ccaps(v) & (c))
 
-#define vx_ccaps(c)	vx_info_ccaps(current->vx_info,(c))
+#define vx_ccaps(c)	vx_info_ccaps(current->vx_info, (c))
 
 
 
@@ -158,13 +157,13 @@ static inline int __vs_check(int cid, in
 
 #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 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 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))
+#define nx_flags(m, f)	nx_info_flags(current->nx_info, m, f)
 
 
 /* network caps */
@@ -173,18 +172,18 @@ static inline int __vs_check(int cid, in
 
 #define nx_current_ncaps()	__nx_ncaps(current->nx_info)
 
-#define nx_info_ncaps(v,c)	(__nx_ncaps(v) & (c))
+#define nx_info_ncaps(v, c)	(__nx_ncaps(v) & (c))
 
-#define nx_ncaps(c)	nx_info_ncaps(current->nx_info,(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_info_mcaps(v, c)	(__vx_mcaps(v) & (c))
 
-#define vx_mcaps(c)	vx_info_mcaps(current->vx_info,(c))
+#define vx_mcaps(c)	vx_info_mcaps(current->vx_info, c)
 
 
 /* context bcap mask */
@@ -193,9 +192,9 @@ static inline int __vs_check(int cid, in
 
 #define vx_current_bcaps()	__vx_bcaps(current->vx_info)
 
-#define vx_info_bcaps(v,c)	(__vx_bcaps(v) & (c))
+#define vx_info_bcaps(v, c)	(__vx_bcaps(v) & (c))
 
-#define vx_bcaps(c)	vx_info_bcaps(current->vx_info,(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)
@@ -203,21 +202,21 @@ static inline int __vs_check(int cid, in
 #define vx_current_cap_bset()	vx_info_cap_bset(current->vx_info)
 
 
-#define __vx_info_mbcap(v,b) \
+#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 vx_info_mbcap(v, b)	__vx_info_mbcap(v, cap_t(b))
 
-#define task_vx_mbcap(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_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_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_capable(b, c) (capable(b) || \
+	(cap_raised(current->cap_effective, b) && vx_ccaps(c)))
 
 
 #define vx_current_initpid(n) \
@@ -227,11 +226,11 @@ static inline int __vs_check(int cid, in
 
 #define __vx_state(v)	((v) ? ((v)->vx_state) : 0)
 
-#define vx_info_state(v,m)	(__vx_state(v) & (m))
+#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))
+#define nx_info_state(v, m)	(__nx_state(v) & (m))
 
 #endif
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/cacct_def.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/cacct_def.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vserver/cacct_def.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/cacct_def.h	2007-06-13 09:47:21 +0200
@@ -22,14 +22,14 @@ struct _vx_cacct {
 
 static inline void __dump_vx_cacct(struct _vx_cacct *cacct)
 {
-	int i,j;
+	int i, j;
 
 	printk("\t_vx_cacct:");
-	for (i=0; i<6; i++) {
+	for (i = 0; i < 6; i++) {
 		struct _vx_sock_acc *ptr = cacct->sock[i];
 
 		printk("\t [%d] =", i);
-		for (j=0; j<3; j++) {
+		for (j = 0; j < 3; j++) {
 			printk(" [%d] = %8lu, %8lu", j,
 				atomic_long_read(&ptr[j].count),
 				atomic_long_read(&ptr[j].total));
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/context.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/context.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vserver/context.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/context.h	2007-06-13 08:58:36 +0200
@@ -32,22 +32,22 @@
 #define VXF_HIDE_NETIF		0x02000000
 #define VXF_HIDE_VINFO		0x04000000
 
-#define VXF_STATE_SETUP		(1ULL<<32)
-#define VXF_STATE_INIT		(1ULL<<33)
-#define VXF_STATE_ADMIN		(1ULL<<34)
+#define VXF_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_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_FORK_RSS		(1ULL << 48)
+#define VXF_PROLIFIC		(1ULL << 49)
 
-#define VXF_IGNEG_NICE		(1ULL<<52)
+#define VXF_IGNEG_NICE		(1ULL << 52)
 
-#define VXF_ONE_TIME		(0x0007ULL<<32)
+#define VXF_ONE_TIME		(0x0007ULL << 32)
 
-#define VXF_INIT_SET		(VXF_STATE_SETUP|VXF_STATE_INIT|VXF_STATE_ADMIN)
+#define VXF_INIT_SET		(VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN)
 
 
 /* context migration */
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/context_cmd.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/context_cmd.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vserver/context_cmd.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/context_cmd.h	2007-06-13 09:47:35 +0200
@@ -108,7 +108,7 @@ extern int vc_set_ccaps(struct vx_info *
 /* bcaps commands */
 
 #define VCMD_get_bcaps		VC_CMD(FLAGS, 9, 0)
-#define VCMD_set_bcaps		VC_CMD(FLAGS,10, 0)
+#define VCMD_set_bcaps		VC_CMD(FLAGS, 10, 0)
 
 struct	vcmd_bcaps {
 	uint64_t bcaps;
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/cvirt_cmd.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/cvirt_cmd.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vserver/cvirt_cmd.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/cvirt_cmd.h	2007-06-13 07:51:01 +0200
@@ -14,7 +14,7 @@ struct	vcmd_vhi_name_v0 {
 
 
 enum vhi_name_field {
-	VHIN_CONTEXT=0,
+	VHIN_CONTEXT = 0,
 	VHIN_SYSNAME,
 	VHIN_NODENAME,
 	VHIN_RELEASE,
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/debug.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/debug.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vserver/debug.h	2007-03-10 18:02:51 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/debug.h	2007-06-13 09:00:36 +0200
@@ -2,14 +2,9 @@
 #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_CBIT(n, m)	(vx_debug_ ## n & (1 << (m)))
+#define VXD_CMIN(n, m)	(vx_debug_ ## n > (m))
+#define VXD_MASK(n, m)	(vx_debug_ ## n & (m))
 
 #define VXD_DEV(d)	(d), (d)->bd_inode->i_ino,		\
 			imajor((d)->bd_inode), iminor((d)->bd_inode)
@@ -19,9 +14,9 @@
 #define __FUNC__	__func__
 
 
-#define vxd_path(d,m)						\
+#define vxd_path(d, m)						\
 	({ static char _buffer[PATH_MAX];			\
-	   d_path((d), (m), _buffer, sizeof(_buffer)); })
+	   d_path(d, m, _buffer, sizeof(_buffer)); })
 
 #define vxd_cond_path(n)					\
 	((n) ? vxd_path((n)->dentry, (n)->mnt) : "<null>" )
@@ -44,19 +39,19 @@ extern unsigned int vx_debug_misc;
 
 #define VX_LOGLEVEL	"vxD: "
 
-#define vxdprintk(c,f,x...)					\
+#define vxdprintk(c, f, x...)					\
 	do {							\
 		if (c)						\
 			printk(VX_LOGLEVEL f "\n" , ##x);	\
 	} while (0)
 
-#define vxlprintk(c,f,x...)					\
+#define vxlprintk(c, f, x...)					\
 	do {							\
 		if (c)						\
 			printk(VX_LOGLEVEL f " @%s:%d\n", x);	\
 	} while (0)
 
-#define vxfprintk(c,f,x...)					\
+#define vxfprintk(c, f, x...)					\
 	do {							\
 		if (c)						\
 			printk(VX_LOGLEVEL f " %s@%s:%d\n", x); \
@@ -91,7 +86,7 @@ void dump_vx_info_inactive(int);
 
 #define VX_WARNLEVEL	KERN_WARNING "vxW: "
 
-#define vxwprintk(c,f,x...)					\
+#define vxwprintk(c, f, x...)					\
 	do {							\
 		if (c)						\
 			printk(VX_WARNLEVEL f "\n" , ##x);	\
@@ -106,11 +101,11 @@ void dump_vx_info_inactive(int);
 
 #ifdef	CONFIG_VSERVER_DEBUG
 #define vxd_assert_lock(l)	assert_spin_locked(l)
-#define vxd_assert(c,f,x...)	vxlprintk(!(c), \
+#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)
+#define vxd_assert(c, f, x...)	do { } while (0)
 #endif
 
 
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/debug_cmd.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/debug_cmd.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vserver/debug_cmd.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/debug_cmd.h	2007-06-13 19:59:28 +0200
@@ -28,13 +28,13 @@ struct  vcmd_read_monitor_v0 {
 
 #include <asm/compat.h>
 
-struct  vcmd_read_history_v0_x32 {
+struct	vcmd_read_history_v0_x32 {
 	uint32_t index;
 	uint32_t count;
 	compat_uptr_t data_ptr;
 };
 
-struct  vcmd_read_monitor_v0_x32 {
+struct	vcmd_read_monitor_v0_x32 {
 	uint32_t index;
 	uint32_t count;
 	compat_uptr_t data_ptr;
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/history.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/history.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vserver/history.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/history.h	2007-06-13 09:04:26 +0200
@@ -3,8 +3,8 @@
 
 
 enum {
-	VXH_UNUSED=0,
-	VXH_THROW_OOPS=1,
+	VXH_UNUSED = 0,
+	VXH_THROW_OOPS = 1,
 
 	VXH_GET_VX_INFO,
 	VXH_PUT_VX_INFO,
@@ -128,20 +128,20 @@ void	__vxh_throw_oops(void *__here)
 
 #define vxh_throw_oops()	__vxh_throw_oops(__HERE__);
 
-#define __vxh_get_vx_info(v,h)	__vxh_smpl(v, VXH_GET_VX_INFO, h);
-#define __vxh_put_vx_info(v,h)	__vxh_smpl(v, VXH_PUT_VX_INFO, h);
+#define __vxh_get_vx_info(v, h)	__vxh_smpl(v, VXH_GET_VX_INFO, h);
+#define __vxh_put_vx_info(v, h)	__vxh_smpl(v, VXH_PUT_VX_INFO, h);
 
-#define __vxh_init_vx_info(v,d,h) \
-	__vxh_data(v,d, VXH_INIT_VX_INFO, h);
-#define __vxh_set_vx_info(v,d,h) \
-	__vxh_data(v,d, VXH_SET_VX_INFO, h);
-#define __vxh_clr_vx_info(v,d,h) \
-	__vxh_data(v,d, VXH_CLR_VX_INFO, h);
+#define __vxh_init_vx_info(v, d, h) \
+	__vxh_data(v, d, VXH_INIT_VX_INFO, h);
+#define __vxh_set_vx_info(v, d, h) \
+	__vxh_data(v, d, VXH_SET_VX_INFO, h);
+#define __vxh_clr_vx_info(v, d, h) \
+	__vxh_data(v, d, VXH_CLR_VX_INFO, h);
 
-#define __vxh_claim_vx_info(v,d,h) \
-	__vxh_data(v,d, VXH_CLAIM_VX_INFO, h);
-#define __vxh_release_vx_info(v,d,h) \
-	__vxh_data(v,d, VXH_RELEASE_VX_INFO, h);
+#define __vxh_claim_vx_info(v, d, h) \
+	__vxh_data(v, d, VXH_CLAIM_VX_INFO, h);
+#define __vxh_release_vx_info(v, d, h) \
+	__vxh_data(v, d, VXH_RELEASE_VX_INFO, h);
 
 #define vxh_alloc_vx_info(v) \
 	__vxh_smpl(v, VXH_ALLOC_VX_INFO, __HERE__);
@@ -153,12 +153,12 @@ void	__vxh_throw_oops(void *__here)
 #define vxh_unhash_vx_info(v) \
 	__vxh_smpl(v, VXH_UNHASH_VX_INFO, __HERE__);
 
-#define vxh_loc_vx_info(v,l) \
-	__vxh_long(v,l, VXH_LOC_VX_INFO, __HERE__);
-#define vxh_lookup_vx_info(v,l) \
-	__vxh_long(v,l, VXH_LOOKUP_VX_INFO, __HERE__);
-#define vxh_create_vx_info(v,l) \
-	__vxh_long(v,l, VXH_CREATE_VX_INFO, __HERE__);
+#define vxh_loc_vx_info(v, l) \
+	__vxh_long(v, l, VXH_LOC_VX_INFO, __HERE__);
+#define vxh_lookup_vx_info(v, l) \
+	__vxh_long(v, l, VXH_LOOKUP_VX_INFO, __HERE__);
+#define vxh_create_vx_info(v, l) \
+	__vxh_long(v, l, VXH_CREATE_VX_INFO, __HERE__);
 
 extern void vxh_dump_history(void);
 
@@ -169,15 +169,15 @@ extern void vxh_dump_history(void);
 
 #define vxh_throw_oops()		do { } while (0)
 
-#define __vxh_get_vx_info(v,h)		do { } while (0)
-#define __vxh_put_vx_info(v,h)		do { } while (0)
+#define __vxh_get_vx_info(v, h)		do { } while (0)
+#define __vxh_put_vx_info(v, h)		do { } while (0)
 
-#define __vxh_init_vx_info(v,d,h)	do { } while (0)
-#define __vxh_set_vx_info(v,d,h)	do { } while (0)
-#define __vxh_clr_vx_info(v,d,h)	do { } while (0)
+#define __vxh_init_vx_info(v, d, h)	do { } while (0)
+#define __vxh_set_vx_info(v, d, h)	do { } while (0)
+#define __vxh_clr_vx_info(v, d, h)	do { } while (0)
 
-#define __vxh_claim_vx_info(v,d,h)	do { } while (0)
-#define __vxh_release_vx_info(v,d,h)	do { } while (0)
+#define __vxh_claim_vx_info(v, d, h)	do { } while (0)
+#define __vxh_release_vx_info(v, d, h)	do { } while (0)
 
 #define vxh_alloc_vx_info(v)		do { } while (0)
 #define vxh_dealloc_vx_info(v)		do { } while (0)
@@ -185,9 +185,9 @@ extern void vxh_dump_history(void);
 #define vxh_hash_vx_info(v)		do { } while (0)
 #define vxh_unhash_vx_info(v)		do { } while (0)
 
-#define vxh_loc_vx_info(a,v)		do { } while (0)
-#define vxh_lookup_vx_info(a,v)		do { } while (0)
-#define vxh_create_vx_info(a,v)		do { } while (0)
+#define vxh_loc_vx_info(v, l)		do { } while (0)
+#define vxh_lookup_vx_info(v, l)	do { } while (0)
+#define vxh_create_vx_info(v, l)	do { } while (0)
 
 #define vxh_dump_history()		do { } while (0)
 
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/inode.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/inode.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vserver/inode.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/inode.h	2007-06-13 09:05:00 +0200
@@ -24,7 +24,7 @@
 #define IATTR_PROC_SYMLINK	( IATTR_ADMIN )
 #endif
 
-#define vx_hide_check(c,m)	(((m) & IATTR_HIDE) ? vx_check(c,m) : 1)
+#define vx_hide_check(c, m)	(((m) & IATTR_HIDE) ? vx_check(c, m) : 1)
 
 #endif	/* __KERNEL__ */
 
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/limit.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/limit.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vserver/limit.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/limit.h	2007-06-13 09:08:22 +0200
@@ -24,27 +24,27 @@
 #warning RLIM_INFINITY is undefined
 #endif
 
-#define __rlim_val(l,r,v)	((l)->res[(r)].v)
+#define __rlim_val(l, r, v)	((l)->res[r].v)
 
-#define __rlim_soft(l,r)	__rlim_val(l,r,soft)
-#define __rlim_hard(l,r)	__rlim_val(l,r,hard)
+#define __rlim_soft(l, r)	__rlim_val(l, r, soft)
+#define __rlim_hard(l, r)	__rlim_val(l, r, hard)
 
-#define __rlim_rcur(l,r)	__rlim_val(l,r,rcur)
-#define __rlim_rmin(l,r)	__rlim_val(l,r,rmin)
-#define __rlim_rmax(l,r)	__rlim_val(l,r,rmax)
+#define __rlim_rcur(l, r)	__rlim_val(l, r, rcur)
+#define __rlim_rmin(l, r)	__rlim_val(l, r, rmin)
+#define __rlim_rmax(l, r)	__rlim_val(l, r, rmax)
 
-#define __rlim_lhit(l,r)	__rlim_val(l,r,lhit)
-#define __rlim_hit(l,r)		atomic_inc(&__rlim_lhit(l,r))
+#define __rlim_lhit(l, r)	__rlim_val(l, r, lhit)
+#define __rlim_hit(l, r)	atomic_inc(&__rlim_lhit(l, r))
 
 typedef atomic_long_t rlim_atomic_t;
 typedef unsigned long rlim_t;
 
-#define __rlim_get(l,r)		atomic_long_read(&__rlim_rcur(l,r))
-#define __rlim_set(l,r,v)	atomic_long_set(&__rlim_rcur(l,r), v)
-#define __rlim_inc(l,r)		atomic_long_inc(&__rlim_rcur(l,r))
-#define __rlim_dec(l,r)		atomic_long_dec(&__rlim_rcur(l,r))
-#define __rlim_add(l,r,v)	atomic_long_add(v, &__rlim_rcur(l,r))
-#define __rlim_sub(l,r,v)	atomic_long_sub(v, &__rlim_rcur(l,r))
+#define __rlim_get(l, r)	atomic_long_read(&__rlim_rcur(l, r))
+#define __rlim_set(l, r, v)	atomic_long_set(&__rlim_rcur(l, r), v)
+#define __rlim_inc(l, r)	atomic_long_inc(&__rlim_rcur(l, r))
+#define __rlim_dec(l, r)	atomic_long_dec(&__rlim_rcur(l, r))
+#define __rlim_add(l, r, v)	atomic_long_add(v, &__rlim_rcur(l, r))
+#define __rlim_sub(l, r, v)	atomic_long_sub(v, &__rlim_rcur(l, r))
 
 
 #if	(RLIM_INFINITY == VLIM_INFINITY)
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/limit_def.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/limit_def.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vserver/limit_def.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/limit_def.h	2007-06-13 05:15:43 +0200
@@ -31,7 +31,7 @@ static inline void __dump_vx_limit(struc
 	int i;
 
 	printk("\t_vx_limit:");
-	for (i=0; i<NUM_LIMITS; i++) {
+	for (i = 0; i < NUM_LIMITS; i++) {
 		printk("\t [%2d] = %8lu %8lu/%8lu, %8ld/%8ld, %8d\n",
 			i, (unsigned long)__rlim_get(limit, i),
 			(unsigned long)__rlim_rmin(limit, i),
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/limit_int.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/limit_int.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vserver/limit_int.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/limit_int.h	2007-06-14 18:12:05 +0200
@@ -5,8 +5,8 @@
 
 #ifdef	__KERNEL__
 
-#define VXD_RCRES_COND(r)	VXD_CBIT(cres, (r))
-#define VXD_RLIMIT_COND(r)	VXD_CBIT(limit, (r))
+#define VXD_RCRES_COND(r)	VXD_CBIT(cres, r)
+#define VXD_RLIMIT_COND(r)	VXD_CBIT(limit, r)
 
 extern const char *vlimit_name[NUM_LIMITS];
 
@@ -162,7 +162,7 @@ static inline int __vx_cres_array_avail(
 
 	limit = &vxi->limit;
 	res = *array;
-	value = __vx_cres_array_sum(limit, array+1);
+	value = __vx_cres_array_sum(limit, array + 1);
 
 	__rlim_set(limit, res, value);
 	__vx_cres_fixup(limit, res, value);
@@ -180,7 +180,7 @@ static inline void vx_limit_fixup(struct
 	if ((id < 0) || (id == RLIMIT_RSS))
 		__vx_cres_array_fixup(limit, VLA_RSS);
 
-	for (res=0; res<NUM_LIMITS; res++) {
+	for (res = 0; res < NUM_LIMITS; res++) {
 		if ((id > 0) && (res != id))
 			continue;
 
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/network.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/network.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vserver/network.h	2007-02-15 00:05:40 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/network.h	2007-06-13 09:09:31 +0200
@@ -15,13 +15,13 @@
 
 #define NXF_INFO_PRIVATE	0x00000008
 
-#define NXF_STATE_SETUP		(1ULL<<32)
-#define NXF_STATE_ADMIN		(1ULL<<34)
+#define NXF_STATE_SETUP		(1ULL << 32)
+#define NXF_STATE_ADMIN		(1ULL << 34)
 
-#define NXF_SC_HELPER		(1ULL<<36)
-#define NXF_PERSISTENT		(1ULL<<38)
+#define NXF_SC_HELPER		(1ULL << 36)
+#define NXF_PERSISTENT		(1ULL << 38)
 
-#define NXF_ONE_TIME		(0x0005ULL<<32)
+#define NXF_ONE_TIME		(0x0005ULL << 32)
 
 #define NXF_INIT_SET		(NXF_STATE_ADMIN)
 
@@ -31,7 +31,7 @@
 #define NXA_TYPE_IPV4		1
 #define NXA_TYPE_IPV6		2
 
-#define NXA_MOD_BCAST		(1<<8)
+#define NXA_MOD_BCAST		(1 << 8)
 
 #define NXA_TYPE_ANY		((uint16_t)-1)
 
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/switch.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/switch.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vserver/switch.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/switch.h	2007-06-13 09:10:06 +0200
@@ -8,7 +8,7 @@
 #define VC_COMMAND(c)		(((c) >> 16) & 0xFF)
 #define VC_VERSION(c)		((c) & 0xFFF)
 
-#define VC_CMD(c,i,v)		((((VC_CAT_ ## c) & 0x3F) << 24) \
+#define VC_CMD(c, i, v)		((((VC_CAT_ ## c) & 0x3F) << 24) \
 				| (((i) & 0xFF) << 16) | ((v) & 0xFFF))
 
 /*
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/linux/vserver/tag.h linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/tag.h
--- linux-2.6.20.14-vs2.2.0/include/linux/vserver/tag.h	2007-03-10 18:02:51 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/include/linux/vserver/tag.h	2007-06-13 09:45:38 +0200
@@ -87,7 +87,7 @@
 
 #ifndef CONFIG_TAGGING_NONE
 #define dx_current_fstag(sb)	\
-	((sb)->s_flags & MS_TAGGED ? dx_current_tag(): 0)
+	((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0)
 #else
 #define dx_current_fstag(sb)	(0)
 #endif
@@ -131,10 +131,10 @@ int dx_parse_tag(char *string, tag_t *ta
 
 void __dx_propagate_tag(struct nameidata *nd, struct inode *inode);
 
-#define dx_propagate_tag(n,i)	__dx_propagate_tag(n,i)
+#define dx_propagate_tag(n, i)	__dx_propagate_tag(n, i)
 
 #else
-#define dx_propagate_tag(n,i)	do { } while (0)
+#define dx_propagate_tag(n, i)	do { } while (0)
 #endif
 
 #endif /* _DX_TAG_H */
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/include/net/af_unix.h linux-2.6.20.14-vs2.2.0.0.6/include/net/af_unix.h
--- linux-2.6.20.14-vs2.2.0/include/net/af_unix.h	2007-06-13 01:45:56 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/include/net/af_unix.h	2007-06-13 18:47:49 +0200
@@ -34,7 +34,7 @@ static inline struct sock *next_unix_soc
 			s = sk_next(s);
 		if (!s)
 			s = next_unix_socket_table(i);
-	} while (s && !nx_check(s->sk_nid, VS_WATCH_P|VS_IDENT));
+	} while (s && !nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT));
 	return s;
 }
 
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/ptrace.c linux-2.6.20.14-vs2.2.0.0.6/kernel/ptrace.c
--- linux-2.6.20.14-vs2.2.0/kernel/ptrace.c	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/ptrace.c	2007-06-13 18:47:56 +0200
@@ -475,7 +475,7 @@ asmlinkage long sys_ptrace(long request,
 	}
 
 	ret = -EPERM;
-	if (!vx_check(vx_task_xid(child), VS_WATCH_P|VS_IDENT))
+	if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
 		goto out_put_task_struct;
 
 	if (request == PTRACE_ATTACH) {
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/sched_hard.h linux-2.6.20.14-vs2.2.0.0.6/kernel/sched_hard.h
--- linux-2.6.20.14-vs2.2.0/kernel/sched_hard.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/sched_hard.h	2007-06-13 18:54:48 +0200
@@ -234,7 +234,7 @@ int vx_schedule(struct task_struct *next
 
 	if (unlikely(vs_check_flags(flags , VXF_SCHED_PAUSE, 0)))
 		goto put_on_hold;
-	if (!vs_check_flags(flags , VXF_SCHED_HARD|VXF_SCHED_PRIO, 0))
+	if (!vs_check_flags(flags , VXF_SCHED_HARD | VXF_SCHED_PRIO, 0))
 		return 1;
 
 	sched_pc = &vx_per_cpu(vxi, sched_pc, cpu);
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/signal.c linux-2.6.20.14-vs2.2.0.0.6/kernel/signal.c
--- linux-2.6.20.14-vs2.2.0/kernel/signal.c	2007-03-10 18:03:14 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/signal.c	2007-06-13 18:48:03 +0200
@@ -604,7 +604,7 @@ static int check_kill_permission(int sig
 		return error;
 
 	error = -ESRCH;
-	if (!vx_check(vx_task_xid(t), VS_WATCH_P|VS_IDENT)) {
+	if (!vx_check(vx_task_xid(t), VS_WATCH_P | VS_IDENT)) {
 		vxdprintk(current->xid || VXD_CBIT(misc, 7),
 			"signal %d[%p] xid mismatch %p[#%u,%u] xid=#%u",
 			sig, info, t, vx_task_xid(t), t->pid, current->xid);
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/cacct.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/cacct.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/cacct.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/cacct.c	2007-06-13 05:17:20 +0200
@@ -25,19 +25,19 @@ int vc_sock_stat(struct vx_info *vxi, vo
 	struct vcmd_sock_stat_v0 vc_data;
 	int j, field;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	field = vc_data.field;
 	if ((field < 0) || (field >= VXA_SOCK_SIZE))
 		return -EINVAL;
 
-	for (j=0; j<3; j++) {
+	for (j = 0; j < 3; j++) {
 		vc_data.count[j] = vx_sock_count(&vxi->cacct, field, j);
 		vc_data.total[j] = vx_sock_total(&vxi->cacct, field, j);
 	}
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return 0;
 }
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/cacct_init.h linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/cacct_init.h
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/cacct_init.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/cacct_init.h	2007-06-13 09:48:33 +0200
@@ -2,19 +2,19 @@
 
 static inline void vx_info_init_cacct(struct _vx_cacct *cacct)
 {
-	int i,j;
+	int i, j;
 
 
-	for (i=0; i<VXA_SOCK_SIZE; i++) {
-		for (j=0; j<3; j++) {
+	for (i = 0; i < VXA_SOCK_SIZE; i++) {
+		for (j = 0; j < 3; j++) {
 			atomic_set(&cacct->sock[i][j].count, 0);
 			atomic_set(&cacct->sock[i][j].total, 0);
 		}
 	}
-	for (i=0; i<8; i++)
+	for (i = 0; i < 8; i++)
 		atomic_set(&cacct->slab[i], 0);
-	for (i=0; i<5; i++)
-		for (j=0; j<4; j++)
+	for (i = 0; i < 5; i++)
+		for (j = 0; j < 4; j++)
 			atomic_set(&cacct->page[i][j], 0);
 }
 
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/cacct_proc.h linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/cacct_proc.h
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/cacct_proc.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/cacct_proc.h	2007-06-14 18:12:51 +0200
@@ -9,49 +9,44 @@
 
 static inline int vx_info_proc_cacct(struct _vx_cacct *cacct, char *buffer)
 {
-	int i,j, length = 0;
+	int i, j, length = 0;
 	static char *type[VXA_SOCK_SIZE] = {
-		"UNSPEC", "UNIX", "INET", "INET6", "PACKET", "OTHER" };
+		"UNSPEC", "UNIX", "INET", "INET6", "PACKET", "OTHER"
+	};
 
 	length += sprintf(buffer + length, VX_SOCKA_TOP);
-	for (i=0; i<VXA_SOCK_SIZE; i++) {
-		length += sprintf(buffer + length,
-			"%s:", type[i]);
-		for (j=0; j<3; j++) {
+	for (i = 0; i < VXA_SOCK_SIZE; i++) {
+		length += sprintf(buffer + length, "%s:", type[i]);
+		for (j = 0; j < 3; j++) {
 			length += sprintf(buffer + length,
-				"\t%10lu/%-10lu"
-				,vx_sock_count(cacct, i, j)
-				,vx_sock_total(cacct, i, j)
-				);
+				"\t%10lu/%-10lu",
+				vx_sock_count(cacct, i, j),
+				vx_sock_total(cacct, i, j));
 		}
 		buffer[length++] = '\n';
 	}
 
 	length += sprintf(buffer + length, "\n");
 	length += sprintf(buffer + length,
-		"slab:\t %8u %8u %8u %8u\n"
-		,atomic_read(&cacct->slab[1])
-		,atomic_read(&cacct->slab[4])
-		,atomic_read(&cacct->slab[0])
-		,atomic_read(&cacct->slab[2])
-		);
+		"slab:\t %8u %8u %8u %8u\n",
+		atomic_read(&cacct->slab[1]),
+		atomic_read(&cacct->slab[4]),
+		atomic_read(&cacct->slab[0]),
+		atomic_read(&cacct->slab[2]));
 
 	length += sprintf(buffer + length, "\n");
-	for (i=0; i<5; i++) {
+	for (i = 0; i < 5; i++) {
 		length += sprintf(buffer + length,
-			"page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n"
-			,i
-			,atomic_read(&cacct->page[i][0])
-			,atomic_read(&cacct->page[i][1])
-			,atomic_read(&cacct->page[i][2])
-			,atomic_read(&cacct->page[i][3])
-			,atomic_read(&cacct->page[i][4])
-			,atomic_read(&cacct->page[i][5])
-			,atomic_read(&cacct->page[i][6])
-			,atomic_read(&cacct->page[i][7])
-			);
+			"page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n", i,
+			atomic_read(&cacct->page[i][0]),
+			atomic_read(&cacct->page[i][1]),
+			atomic_read(&cacct->page[i][2]),
+			atomic_read(&cacct->page[i][3]),
+			atomic_read(&cacct->page[i][4]),
+			atomic_read(&cacct->page[i][5]),
+			atomic_read(&cacct->page[i][6]),
+			atomic_read(&cacct->page[i][7]));
 	}
-
 	return length;
 }
 
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/context.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/context.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/context.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/context.c	2007-06-14 19:18:42 +0200
@@ -79,7 +79,7 @@ static struct vx_info *__alloc_vx_info(x
 	if (!new)
 		return 0;
 
-	memset (new, 0, sizeof(struct vx_info));
+	memset(new, 0, sizeof(struct vx_info));
 #ifdef CONFIG_SMP
 	new->ptr_pc = alloc_percpu(struct _vx_info_pc);
 	if (!new->ptr_pc)
@@ -301,7 +301,7 @@ static inline struct vx_info *__lookup_v
 found:
 	vxdprintk(VXD_CBIT(xid, 0),
 		"__lookup_vx_info(#%u): %p[#%u]",
-		xid, vxi, vxi?vxi->vx_id:0);
+		xid, vxi, vxi ? vxi->vx_id : 0);
 	vxh_lookup_vx_info(vxi, xid);
 	return vxi;
 }
@@ -337,7 +337,7 @@ static inline xid_t __vx_dynamic_id(void
 	* locate or create the requested context
 	* get() it and if new hash it				*/
 
-static struct vx_info * __loc_vx_info(int id, int *err)
+static struct vx_info *__loc_vx_info(int id, int *err)
 {
 	struct vx_info *new, *vxi = NULL;
 
@@ -404,7 +404,7 @@ out_unlock:
 	* create the requested context
 	* get(), claim() and hash it				*/
 
-static struct vx_info * __create_vx_info(int id)
+static struct vx_info *__create_vx_info(int id)
 {
 	struct vx_info *new, *vxi = NULL;
 
@@ -461,7 +461,7 @@ static struct vx_info * __create_vx_info
 
 out_unlock:
 	spin_unlock(&vx_info_hash_lock);
-	vxh_create_vx_info(IS_ERR(vxi)?NULL:vxi, id);
+	vxh_create_vx_info(IS_ERR(vxi) ? NULL : vxi, id);
 	if (new)
 		__dealloc_vx_info(new);
 	return vxi;
@@ -537,7 +537,7 @@ int get_xid_list(int index, unsigned int
 	int hindex, nr_xids = 0;
 
 	/* only show current and children */
-	if (!vx_check(0, VS_ADMIN|VS_WATCH)) {
+	if (!vx_check(0, VS_ADMIN | VS_WATCH)) {
 		if (index > 0)
 			return 0;
 		xids[nr_xids] = vx_current_xid();
@@ -715,8 +715,8 @@ int vx_migrate_task(struct task_struct *
 
 		/* hack for *spaces to provide compatibility */
 		if (unshare) {
-			ret = sys_unshare(CLONE_NEWUTS|CLONE_NEWIPC);
-			vx_set_space(vxi, CLONE_NEWUTS|CLONE_NEWIPC);
+			ret = sys_unshare(CLONE_NEWUTS | CLONE_NEWIPC);
+			vx_set_space(vxi, CLONE_NEWUTS | CLONE_NEWIPC);
 		}
 	}
 out:
@@ -840,15 +840,14 @@ int vc_task_xid(uint32_t id, void __user
 	if (id) {
 		struct task_struct *tsk;
 
-		if (!vx_check(0, VS_ADMIN|VS_WATCH))
+		if (!vx_check(0, VS_ADMIN | VS_WATCH))
 			return -EPERM;
 
 		read_lock(&tasklist_lock);
 		tsk = find_task_by_real_pid(id);
 		xid = (tsk) ? tsk->xid : -ESRCH;
 		read_unlock(&tasklist_lock);
-	}
-	else
+	} else
 		xid = vx_current_xid();
 	return xid;
 }
@@ -861,7 +860,7 @@ int vc_vx_info(struct vx_info *vxi, void
 	vc_data.xid = vxi->vx_id;
 	vc_data.initpid = vxi->vx_initpid;
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return 0;
 }
@@ -874,7 +873,7 @@ int vc_ctx_stat(struct vx_info *vxi, voi
 	vc_data.usecnt = atomic_read(&vxi->vx_usecnt);
 	vc_data.tasks = atomic_read(&vxi->vx_tasks);
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return 0;
 }
@@ -888,7 +887,7 @@ int vc_ctx_create(uint32_t xid, void __u
 	struct vx_info *new_vxi;
 	int ret;
 
-	if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	if ((xid > MAX_S_CONTEXT) && (xid != VX_DYNAMIC_ID))
@@ -929,7 +928,7 @@ int vc_ctx_migrate(struct vx_info *vxi, 
 	struct vcmd_ctx_migrate vc_data = { .flagword = 0 };
 	int ret;
 
-	if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	ret = vx_migrate_task(current, vxi, 0);
@@ -954,7 +953,7 @@ int vc_get_cflags(struct vx_info *vxi, v
 	/* special STATE flag handling */
 	vc_data.mask = vs_mask_flags(~0UL, vxi->vx_flags, VXF_ONE_TIME);
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return 0;
 }
@@ -964,7 +963,7 @@ int vc_set_cflags(struct vx_info *vxi, v
 	struct vcmd_ctx_flags_v0 vc_data;
 	uint64_t mask, trigger;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	/* special STATE flag handling */
@@ -1014,7 +1013,7 @@ int vc_get_ccaps_v0(struct vx_info *vxi,
 		return ret;
 	vc_data.cmask = ~0UL;
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return 0;
 }
@@ -1029,7 +1028,7 @@ int vc_get_ccaps(struct vx_info *vxi, vo
 		return ret;
 	vc_data.cmask = ~0UL;
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return 0;
 }
@@ -1047,7 +1046,7 @@ int vc_set_ccaps_v0(struct vx_info *vxi,
 {
 	struct vcmd_ctx_caps_v0 vc_data;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	/* simulate old &= behaviour for bcaps */
@@ -1059,7 +1058,7 @@ int vc_set_ccaps(struct vx_info *vxi, vo
 {
 	struct vcmd_ctx_caps_v1 vc_data;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	return do_set_caps(vxi, 0, 0, vc_data.ccaps, vc_data.cmask);
@@ -1075,7 +1074,7 @@ int vc_get_bcaps(struct vx_info *vxi, vo
 		return ret;
 	vc_data.bmask = ~0UL;
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return 0;
 }
@@ -1084,7 +1083,7 @@ int vc_set_bcaps(struct vx_info *vxi, vo
 {
 	struct vcmd_bcaps vc_data;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	return do_set_caps(vxi, vc_data.bcaps, vc_data.bmask, 0, 0);
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/cvirt.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/cvirt.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/cvirt.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/cvirt.c	2007-06-13 09:58:15 +0200
@@ -164,7 +164,7 @@ int vx_do_syslog(int type, char __user *
 
 /* virtual host info names */
 
-static char * vx_vhi_name(struct vx_info *vxi, int id)
+static char *vx_vhi_name(struct vx_info *vxi, int id)
 {
 	struct nsproxy *nsproxy;
 	struct uts_namespace *uts;
@@ -205,7 +205,7 @@ int vc_set_vhi_name(struct vx_info *vxi,
 	struct vcmd_vhi_name_v0 vc_data;
 	char *name;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	name = vx_vhi_name(vxi, vc_data.field);
@@ -221,7 +221,7 @@ int vc_get_vhi_name(struct vx_info *vxi,
 	struct vcmd_vhi_name_v0 vc_data;
 	char *name;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	name = vx_vhi_name(vxi, vc_data.field);
@@ -229,7 +229,7 @@ int vc_get_vhi_name(struct vx_info *vxi,
 		return -EINVAL;
 
 	memcpy(vc_data.name, name, 65);
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return 0;
 }
@@ -257,7 +257,7 @@ int vc_virt_stat(struct vx_info *vxi, vo
 	vc_data.load[1] = cvirt->load[1];
 	vc_data.load[2] = cvirt->load[2];
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return 0;
 }
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/cvirt_proc.h linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/cvirt_proc.h
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/cvirt_proc.h	2007-02-06 05:55:13 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/cvirt_proc.h	2007-06-14 18:18:25 +0200
@@ -34,12 +34,12 @@ int vx_info_proc_nsproxy(struct nsproxy 
 		goto skip_ns;
 
 	mnt = ns->root;
-	root = d_path(mnt->mnt_root, mnt->mnt_parent, path, PATH_MAX-2);
+	root = d_path(mnt->mnt_root, mnt->mnt_parent, path, PATH_MAX - 2);
 	length += sprintf(buffer + length,
 		"Namespace:\t%p [#%u]\n"
-		"RootPath:\t%s\n"
-		,ns , atomic_read(&ns->count)
-		,root);
+		"RootPath:\t%s\n",
+		ns, atomic_read(&ns->count),
+		root);
 	kfree(path);
 skip_ns:
 
@@ -53,14 +53,13 @@ skip_ns:
 		"Release:\t%.*s\n"
 		"Version:\t%.*s\n"
 		"Machine:\t%.*s\n"
-		"DomainName:\t%.*s\n"
-		,__NEW_UTS_LEN, uts->name.sysname
-		,__NEW_UTS_LEN, uts->name.nodename
-		,__NEW_UTS_LEN, uts->name.release
-		,__NEW_UTS_LEN, uts->name.version
-		,__NEW_UTS_LEN, uts->name.machine
-		,__NEW_UTS_LEN, uts->name.domainname
-		);
+		"DomainName:\t%.*s\n",
+		__NEW_UTS_LEN, uts->name.sysname,
+		__NEW_UTS_LEN, uts->name.nodename,
+		__NEW_UTS_LEN, uts->name.release,
+		__NEW_UTS_LEN, uts->name.version,
+		__NEW_UTS_LEN, uts->name.machine,
+		__NEW_UTS_LEN, uts->name.domainname);
 skip_uts:
 
 	ipc = nsproxy->ipc_ns;
@@ -70,17 +69,15 @@ skip_uts:
 	length += sprintf(buffer + length,
 		"SEMS:\t\t%d %d %d %d  %d\n"
 		"MSG:\t\t%d %d %d\n"
-		"SHM:\t\t%lu %lu  %d %d\n"
-		,ipc->sem_ctls[0], ipc->sem_ctls[1]
-		,ipc->sem_ctls[2], ipc->sem_ctls[3]
-		,ipc->used_sems
-		,ipc->msg_ctlmax, ipc->msg_ctlmnb, ipc->msg_ctlmni
-		,(unsigned long)ipc->shm_ctlmax
-		,(unsigned long)ipc->shm_ctlall
-		,ipc->shm_ctlmni, ipc->shm_tot
-		);
+		"SHM:\t\t%lu %lu  %d %d\n",
+		ipc->sem_ctls[0], ipc->sem_ctls[1],
+		ipc->sem_ctls[2], ipc->sem_ctls[3],
+		ipc->used_sems,
+		ipc->msg_ctlmax, ipc->msg_ctlmnb, ipc->msg_ctlmni,
+		(unsigned long)ipc->shm_ctlmax,
+		(unsigned long)ipc->shm_ctlall,
+		ipc->shm_ctlmni, ipc->shm_tot);
 skip_ipc:
-
 out:
 	return length;
 }
@@ -89,7 +86,7 @@ out:
 #include <linux/sched.h>
 
 #define LOAD_INT(x) ((x) >> FSHIFT)
-#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
+#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1 - 1)) * 100)
 
 static inline
 int vx_info_proc_cvirt(struct _vx_cvirt *cvirt, char *buffer)
@@ -99,12 +96,12 @@ int vx_info_proc_cvirt(struct _vx_cvirt 
 
 	length += sprintf(buffer + length,
 		"BiasUptime:\t%lu.%02lu\n",
-			(unsigned long)cvirt->bias_uptime.tv_sec,
-			(cvirt->bias_uptime.tv_nsec / (NSEC_PER_SEC / 100)));
+		(unsigned long)cvirt->bias_uptime.tv_sec,
+		(cvirt->bias_uptime.tv_nsec / (NSEC_PER_SEC / 100)));
 
-	a = cvirt->load[0] + (FIXED_1/200);
-	b = cvirt->load[1] + (FIXED_1/200);
-	c = cvirt->load[2] + (FIXED_1/200);
+	a = cvirt->load[0] + (FIXED_1 / 200);
+	b = cvirt->load[1] + (FIXED_1 / 200);
+	c = cvirt->load[2] + (FIXED_1 / 200);
 	length += sprintf(buffer + length,
 		"nr_threads:\t%d\n"
 		"nr_running:\t%d\n"
@@ -112,18 +109,16 @@ int vx_info_proc_cvirt(struct _vx_cvirt 
 		"nr_onhold:\t%d\n"
 		"load_updates:\t%d\n"
 		"loadavg:\t%d.%02d %d.%02d %d.%02d\n"
-		"total_forks:\t%d\n"
-		,atomic_read(&cvirt->nr_threads)
-		,atomic_read(&cvirt->nr_running)
-		,atomic_read(&cvirt->nr_uninterruptible)
-		,atomic_read(&cvirt->nr_onhold)
-		,atomic_read(&cvirt->load_updates)
-		,LOAD_INT(a), LOAD_FRAC(a)
-		,LOAD_INT(b), LOAD_FRAC(b)
-		,LOAD_INT(c), LOAD_FRAC(c)
-		,atomic_read(&cvirt->total_forks)
-		);
-
+		"total_forks:\t%d\n",
+		atomic_read(&cvirt->nr_threads),
+		atomic_read(&cvirt->nr_running),
+		atomic_read(&cvirt->nr_uninterruptible),
+		atomic_read(&cvirt->nr_onhold),
+		atomic_read(&cvirt->load_updates),
+		LOAD_INT(a), LOAD_FRAC(a),
+		LOAD_INT(b), LOAD_FRAC(b),
+		LOAD_INT(c), LOAD_FRAC(c),
+		atomic_read(&cvirt->total_forks));
 	return length;
 }
 
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/dlimit.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/dlimit.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/dlimit.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/dlimit.c	2007-06-13 06:34:15 +0200
@@ -41,7 +41,7 @@ static struct dl_info *__alloc_dl_info(s
 	if (!new)
 		return 0;
 
-	memset (new, 0, sizeof(struct dl_info));
+	memset(new, 0, sizeof(struct dl_info));
 	new->dl_tag = tag;
 	new->dl_sb = sb;
 	INIT_RCU_HEAD(&new->dl_rcu);
@@ -230,7 +230,7 @@ int vc_add_dlimit(uint32_t id, void __us
 {
 	struct vcmd_ctx_dlimit_base_v0 vc_data;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 1);
@@ -240,7 +240,7 @@ int vc_rem_dlimit(uint32_t id, void __us
 {
 	struct vcmd_ctx_dlimit_base_v0 vc_data;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 0);
@@ -252,7 +252,7 @@ int vc_add_dlimit_x32(uint32_t id, void 
 {
 	struct vcmd_ctx_dlimit_base_v0_x32 vc_data;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	return do_addrem_dlimit(id,
@@ -263,7 +263,7 @@ int vc_rem_dlimit_x32(uint32_t id, void 
 {
 	struct vcmd_ctx_dlimit_base_v0_x32 vc_data;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	return do_addrem_dlimit(id,
@@ -339,7 +339,7 @@ int vc_set_dlimit(uint32_t id, void __us
 {
 	struct vcmd_ctx_dlimit_v0 vc_data;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	return do_set_dlimit(id, vc_data.name,
@@ -354,7 +354,7 @@ int vc_set_dlimit_x32(uint32_t id, void 
 {
 	struct vcmd_ctx_dlimit_v0_x32 vc_data;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	return do_set_dlimit(id, compat_ptr(vc_data.name_ptr),
@@ -419,7 +419,7 @@ int vc_get_dlimit(uint32_t id, void __us
 	struct vcmd_ctx_dlimit_v0 vc_data;
 	int ret;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	ret = do_get_dlimit(id, vc_data.name,
@@ -441,7 +441,7 @@ int vc_get_dlimit_x32(uint32_t id, void 
 	struct vcmd_ctx_dlimit_v0_x32 vc_data;
 	int ret;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	ret = do_get_dlimit(id, compat_ptr(vc_data.name_ptr),
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/helper.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/helper.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/helper.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/helper.c	2007-06-13 09:58:42 +0200
@@ -32,11 +32,11 @@ static int do_vshelper(char *name, char 
 		printk(	KERN_WARNING
 			"%s: (%s %s) returned %s with %d\n",
 			name, argv[1], argv[2],
-			sync?"sync":"async", ret);
+			sync ? "sync" : "async", ret);
 	}
 	vxdprintk(VXD_CBIT(switch, 4),
 		"%s: (%s %s) returned %s with %d",
-		name, argv[1], argv[2], sync?"sync":"async", ret);
+		name, argv[1], argv[2], sync ? "sync" : "async", ret);
 	return ret;
 }
 
@@ -106,14 +106,14 @@ long vs_reboot_helper(struct vx_info *vx
 }
 
 
-long vs_reboot(unsigned int cmd, void __user * arg)
+long vs_reboot(unsigned int cmd, void __user *arg)
 {
 	struct vx_info *vxi = current->vx_info;
 	long ret = 0;
 
 	vxdprintk(VXD_CBIT(misc, 5),
 		"vs_reboot(%p[#%d],%d)",
-		vxi, vxi?vxi->vx_id:0, cmd);
+		vxi, vxi ? vxi->vx_id : 0, cmd);
 
 	ret = vs_reboot_helper(vxi, cmd, arg);
 	if (ret)
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/history.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/history.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/history.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/history.c	2007-06-14 18:19:42 +0200
@@ -35,7 +35,7 @@
 struct _vx_history {
 	unsigned int counter;
 
-	struct _vx_hist_entry entry[VXH_SIZE+1];
+	struct _vx_hist_entry entry[VXH_SIZE + 1];
 };
 
 
@@ -75,10 +75,10 @@ EXPORT_SYMBOL_GPL(vxh_advance);
 
 #define VXH_VXI_FMTS	"%p[#%d,%d.%d]"
 
-#define VXH_VXI_ARGS(e)	(e)->vxi.ptr,			\
-			(e)->vxi.ptr?(e)->vxi.xid:0,	\
-			(e)->vxi.ptr?(e)->vxi.usecnt:0,	\
-			(e)->vxi.ptr?(e)->vxi.tasks:0
+#define VXH_VXI_ARGS(e)	(e)->vxi.ptr,				\
+			(e)->vxi.ptr ? (e)->vxi.xid : 0,	\
+			(e)->vxi.ptr ? (e)->vxi.usecnt : 0,	\
+			(e)->vxi.ptr ? (e)->vxi.tasks : 0
 
 void	vxh_dump_entry(struct _vx_hist_entry *e, unsigned cpu)
 {
@@ -91,7 +91,7 @@ void	vxh_dump_entry(struct _vx_hist_entr
 	case VXH_PUT_VX_INFO:
 		printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n",
 			VXH_LOC_ARGS(e),
-			(e->type==VXH_GET_VX_INFO)?"get":"put",
+			(e->type == VXH_GET_VX_INFO) ? "get" : "put",
 			VXH_VXI_ARGS(e));
 		break;
 
@@ -100,8 +100,8 @@ void	vxh_dump_entry(struct _vx_hist_entr
 	case VXH_CLR_VX_INFO:
 		printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n",
 			VXH_LOC_ARGS(e),
-			(e->type==VXH_INIT_VX_INFO)?"init":
-			((e->type==VXH_SET_VX_INFO)?"set":"clr"),
+			(e->type == VXH_INIT_VX_INFO) ? "init" :
+			((e->type == VXH_SET_VX_INFO) ? "set" : "clr"),
 			VXH_VXI_ARGS(e), e->sc.data);
 		break;
 
@@ -109,7 +109,7 @@ void	vxh_dump_entry(struct _vx_hist_entr
 	case VXH_RELEASE_VX_INFO:
 		printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n",
 			VXH_LOC_ARGS(e),
-			(e->type==VXH_CLAIM_VX_INFO)?"claim":"release",
+			(e->type == VXH_CLAIM_VX_INFO) ? "claim" : "release",
 			VXH_VXI_ARGS(e), e->sc.data);
 		break;
 
@@ -117,7 +117,7 @@ void	vxh_dump_entry(struct _vx_hist_entr
 	case VXH_DEALLOC_VX_INFO:
 		printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n",
 			VXH_LOC_ARGS(e),
-			(e->type==VXH_ALLOC_VX_INFO)?"alloc":"dealloc",
+			(e->type == VXH_ALLOC_VX_INFO) ? "alloc" : "dealloc",
 			VXH_VXI_ARGS(e));
 		break;
 
@@ -125,7 +125,7 @@ void	vxh_dump_entry(struct _vx_hist_entr
 	case VXH_UNHASH_VX_INFO:
 		printk( VXH_LOC_FMTS " __%s_vx_info " VXH_VXI_FMTS "\n",
 			VXH_LOC_ARGS(e),
-			(e->type==VXH_HASH_VX_INFO)?"hash":"unhash",
+			(e->type == VXH_HASH_VX_INFO) ? "hash" : "unhash",
 			VXH_VXI_ARGS(e));
 		break;
 
@@ -134,8 +134,8 @@ void	vxh_dump_entry(struct _vx_hist_entr
 	case VXH_CREATE_VX_INFO:
 		printk( VXH_LOC_FMTS " __%s_vx_info [#%d] -> " VXH_VXI_FMTS "\n",
 			VXH_LOC_ARGS(e),
-			(e->type==VXH_CREATE_VX_INFO)?"create":
-			((e->type==VXH_LOC_VX_INFO)?"loc":"lookup"),
+			(e->type == VXH_CREATE_VX_INFO) ? "create" :
+			((e->type == VXH_LOC_VX_INFO) ? "loc" : "lookup"),
 			e->ll.arg, VXH_VXI_ARGS(e));
 		break;
 	}
@@ -148,11 +148,11 @@ static void __vxh_dump_history(void)
 	printk("History:\tSEQ: %8x\tNR_CPUS: %d\n",
 		atomic_read(&sequence), NR_CPUS);
 
-	for (i=0; i < VXH_SIZE; i++) {
+	for (i = 0; i < VXH_SIZE; i++) {
 		for_each_online_cpu(cpu) {
 			struct _vx_history *hist =
 				&per_cpu(vx_history_buffer, cpu);
-			unsigned int index = (hist->counter-i) % VXH_SIZE;
+			unsigned int index = (hist->counter - i) % VXH_SIZE;
 			struct _vx_hist_entry *entry = &hist->entry[index];
 
 			vxh_dump_entry(entry, cpu);
@@ -209,7 +209,7 @@ int do_read_history(struct __user _vx_hi
 			&hist->entry[idx % VXH_SIZE];
 
 		/* send entry to userspace */
-		ret = copy_to_user (&data[pos], entry, sizeof(*entry));
+		ret = copy_to_user(&data[pos], entry, sizeof(*entry));
 		if (ret)
 			break;
 	}
@@ -227,13 +227,13 @@ int vc_read_history(uint32_t id, void __
 	if (id >= NR_CPUS)
 		return -EINVAL;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	ret = do_read_history((struct __user _vx_hist_entry *)vc_data.data,
 		id, &vc_data.index, &vc_data.count);
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return ret;
 }
@@ -248,14 +248,14 @@ int vc_read_history_x32(uint32_t id, voi
 	if (id >= NR_CPUS)
 		return -EINVAL;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	ret = do_read_history((struct __user _vx_hist_entry *)
 		compat_ptr(vc_data.data_ptr),
 		id, &vc_data.index, &vc_data.count);
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return ret;
 }
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/inode.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/inode.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/inode.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/inode.c	2007-06-13 09:59:00 +0200
@@ -76,7 +76,7 @@ int vc_get_iattr(uint32_t id, void __use
 	struct vcmd_ctx_iattr_v1 vc_data = { .xid = -1 };
 	int ret;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	ret = user_path_walk_link(vc_data.name, &nd);
@@ -88,7 +88,7 @@ int vc_get_iattr(uint32_t id, void __use
 	if (ret)
 		return ret;
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		ret = -EFAULT;
 	return ret;
 }
@@ -103,7 +103,7 @@ int vc_get_iattr_x32(uint32_t id, void _
 
 	if (!vx_check(0, VS_ADMIN))
 		return -ENOSYS;
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	ret = user_path_walk_link(compat_ptr(vc_data.name_ptr), &nd);
@@ -115,7 +115,7 @@ int vc_get_iattr_x32(uint32_t id, void _
 	if (ret)
 		return ret;
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		ret = -EFAULT;
 	return ret;
 }
@@ -207,7 +207,7 @@ int vc_set_iattr(uint32_t id, void __use
 
 	if (!capable(CAP_LINUX_IMMUTABLE))
 		return -EPERM;
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	ret = user_path_walk_link(vc_data.name, &nd);
@@ -217,7 +217,7 @@ int vc_set_iattr(uint32_t id, void __use
 		path_release(&nd);
 	}
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		ret = -EFAULT;
 	return ret;
 }
@@ -232,7 +232,7 @@ int vc_set_iattr_x32(uint32_t id, void _
 
 	if (!capable(CAP_LINUX_IMMUTABLE))
 		return -EPERM;
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	ret = user_path_walk_link(compat_ptr(vc_data.name_ptr), &nd);
@@ -242,7 +242,7 @@ int vc_set_iattr_x32(uint32_t id, void _
 		path_release(&nd);
 	}
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		ret = -EFAULT;
 	return ret;
 }
@@ -253,7 +253,7 @@ int vc_set_iattr_x32(uint32_t id, void _
 
 #define PROC_DYNAMIC_FIRST 0xF0000000UL
 
-int vx_proc_ioctl(struct inode * inode, struct file * filp,
+int vx_proc_ioctl(struct inode *inode, struct file *filp,
 	unsigned int cmd, unsigned long arg)
 {
 	struct proc_dir_entry *entry;
@@ -355,7 +355,7 @@ void __dx_propagate_tag(struct nameidata
 	vxdprintk(VXD_CBIT(tag, 7),
 		"dx_propagate_tag(%p[#%lu.%d]): %d,%d",
 		inode, inode->i_ino, inode->i_tag,
-		new_tag, (propagate)?1:0);
+		new_tag, (propagate) ? 1 : 0);
 
 	if (propagate)
 		inode->i_tag = new_tag;
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/legacy.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/legacy.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/legacy.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/legacy.c	2007-06-13 18:55:33 +0200
@@ -98,13 +98,13 @@ int vc_new_s_context(uint32_t ctx, void 
 		if (vc_data.flags & VX_INFO_INIT)
 			vx_set_initpid(new_vxi, current->tgid);
 		if (vc_data.flags & VX_INFO_NAMESPACE)
-			vx_set_space(new_vxi, CLONE_NEWNS|CLONE_FS);
+			vx_set_space(new_vxi, CLONE_NEWNS | CLONE_FS);
 		if (vc_data.flags & VX_INFO_NPROC)
 			__rlim_set(&new_vxi->limit, RLIMIT_NPROC,
 				current->signal->rlim[RLIMIT_NPROC].rlim_max);
 
 		/* tweak some defaults for legacy */
-		new_vxi->vx_flags |= (VXF_HIDE_NETIF|VXF_INFO_INIT);
+		new_vxi->vx_flags |= (VXF_HIDE_NETIF | VXF_INFO_INIT);
 		ret = new_vxi->vx_id;
 	}
 out_put:
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/legacynet.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/legacynet.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/legacynet.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/legacynet.c	2007-06-13 06:34:56 +0200
@@ -34,7 +34,7 @@ int vc_set_ipv4root(uint32_t nbip, void 
 
 	if (nbip < 0 || nbip > NB_IPV4ROOT)
 		return -EINVAL;
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	if (!nxi || nxi->ipv4[0] == 0 || capable(CAP_NET_ADMIN))
@@ -46,10 +46,10 @@ int vc_set_ipv4root(uint32_t nbip, void 
 		/* We are allowed to select a subset of the currently
 		   installed IP numbers. No new one are allowed
 		   We can't change the broadcast address though */
-		for (i=0; i<nbip; i++) {
+		for (i = 0; i < nbip; i++) {
 			int j;
 			__u32 nxip = vc_data.nx_mask_pair[i].ip;
-			for (j=0; j<nxi->nbipv4; j++) {
+			for (j = 0; j < nxi->nbipv4; j++) {
 				if (nxip == nxi->ipv4[j]) {
 					found++;
 					break;
@@ -68,7 +68,7 @@ int vc_set_ipv4root(uint32_t nbip, void 
 		return -EINVAL;
 
 	new_nxi->nbipv4 = nbip;
-	for (i=0; i<nbip; i++) {
+	for (i = 0; i < nbip; i++) {
 		new_nxi->ipv4[i] = vc_data.nx_mask_pair[i].ip;
 		new_nxi->mask[i] = vc_data.nx_mask_pair[i].mask;
 	}
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/limit.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/limit.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/limit.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/limit.c	2007-06-13 06:54:24 +0200
@@ -121,7 +121,7 @@ int vc_get_rlimit(struct vx_info *vxi, v
 	struct vcmd_ctx_rlimit_v0 vc_data;
 	int ret;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	ret = do_get_rlimit(vxi, vc_data.id,
@@ -129,7 +129,7 @@ int vc_get_rlimit(struct vx_info *vxi, v
 	if (ret)
 		return ret;
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return 0;
 }
@@ -156,7 +156,7 @@ int vc_set_rlimit(struct vx_info *vxi, v
 {
 	struct vcmd_ctx_rlimit_v0 vc_data;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	return do_set_rlimit(vxi, vc_data.id,
@@ -169,7 +169,7 @@ int vc_set_rlimit_x32(struct vx_info *vx
 {
 	struct vcmd_ctx_rlimit_v0_x32 vc_data;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	return do_set_rlimit(vxi, vc_data.id,
@@ -181,7 +181,7 @@ int vc_get_rlimit_x32(struct vx_info *vx
 	struct vcmd_ctx_rlimit_v0_x32 vc_data;
 	int ret;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	ret = do_get_rlimit(vxi, vc_data.id,
@@ -189,7 +189,7 @@ int vc_get_rlimit_x32(struct vx_info *vx
 	if (ret)
 		return ret;
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return 0;
 }
@@ -210,7 +210,7 @@ static inline void vx_reset_minmax(struc
 	rlim_t value;
 	int lim;
 
-	for (lim=0; lim<NUM_LIMITS; lim++) {
+	for (lim = 0; lim < NUM_LIMITS; lim++) {
 		value = __rlim_get(limit, lim);
 		__rlim_rmax(limit, lim) = value;
 		__rlim_rmin(limit, lim) = value;
@@ -231,7 +231,7 @@ int vc_rlimit_stat(struct vx_info *vxi, 
 	struct _vx_limit *limit = &vxi->limit;
 	int id;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	id = vc_data.id;
@@ -244,7 +244,7 @@ int vc_rlimit_stat(struct vx_info *vxi, 
 	vc_data.minimum = __rlim_rmin(limit, id);
 	vc_data.maximum = __rlim_rmax(limit, id);
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return 0;
 }
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/limit_init.h linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/limit_init.h
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/limit_init.h	2007-03-10 18:02:51 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/limit_init.h	2007-06-13 05:23:20 +0200
@@ -4,7 +4,7 @@ static inline void vx_info_init_limit(st
 {
 	int lim;
 
-	for (lim=0; lim<NUM_LIMITS; lim++) {
+	for (lim = 0; lim < NUM_LIMITS; lim++) {
 		__rlim_soft(limit, lim) = RLIM_INFINITY;
 		__rlim_hard(limit, lim) = RLIM_INFINITY;
 		__rlim_set(limit, lim, 0);
@@ -20,7 +20,7 @@ static inline void vx_info_exit_limit(st
 	rlim_t value;
 	int lim;
 
-	for (lim=0; lim<NUM_LIMITS; lim++) {
+	for (lim = 0; lim < NUM_LIMITS; lim++) {
 		if ((1 << lim) & VLIM_NOCHECK)
 			continue;
 		value = __rlim_get(limit, lim);
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/limit_proc.h linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/limit_proc.h
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/limit_proc.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/limit_proc.h	2007-06-13 04:54:45 +0200
@@ -9,12 +9,12 @@
 	"Limit\t current\t     min/max\t\t    soft/hard\t\thits\n"
 
 #define VX_LIMIT_ARG(r)				\
-	,(unsigned long)__rlim_get(limit, r)	\
-	,(unsigned long)__rlim_rmin(limit, r)	\
-	,(unsigned long)__rlim_rmax(limit, r)	\
-	,VX_VLIM(__rlim_soft(limit, r))		\
-	,VX_VLIM(__rlim_hard(limit, r))		\
-	,atomic_read(&__rlim_lhit(limit, r))
+	(unsigned long)__rlim_get(limit, r),	\
+	(unsigned long)__rlim_rmin(limit, r),	\
+	(unsigned long)__rlim_rmax(limit, r),	\
+	VX_VLIM(__rlim_soft(limit, r)),		\
+	VX_VLIM(__rlim_hard(limit, r)),		\
+	atomic_read(&__rlim_lhit(limit, r))
 
 static inline int vx_info_proc_limit(struct _vx_limit *limit, char *buffer)
 {
@@ -34,23 +34,22 @@ static inline int vx_info_proc_limit(str
 		"SHM"	VX_LIMIT_FMT
 		"SEMA"	VX_LIMIT_FMT
 		"SEMS"	VX_LIMIT_FMT
-		"DENT"	VX_LIMIT_FMT
-		VX_LIMIT_ARG(RLIMIT_NPROC)
-		VX_LIMIT_ARG(RLIMIT_AS)
-		VX_LIMIT_ARG(RLIMIT_MEMLOCK)
-		VX_LIMIT_ARG(RLIMIT_RSS)
-		VX_LIMIT_ARG(VLIMIT_ANON)
-		VX_LIMIT_ARG(VLIMIT_MAPPED)
-		VX_LIMIT_ARG(RLIMIT_NOFILE)
-		VX_LIMIT_ARG(VLIMIT_OPENFD)
-		VX_LIMIT_ARG(RLIMIT_LOCKS)
-		VX_LIMIT_ARG(VLIMIT_NSOCK)
-		VX_LIMIT_ARG(RLIMIT_MSGQUEUE)
-		VX_LIMIT_ARG(VLIMIT_SHMEM)
-		VX_LIMIT_ARG(VLIMIT_SEMARY)
-		VX_LIMIT_ARG(VLIMIT_NSEMS)
-		VX_LIMIT_ARG(VLIMIT_DENTRY)
-		);
+		"DENT"	VX_LIMIT_FMT,
+		VX_LIMIT_ARG(RLIMIT_NPROC),
+		VX_LIMIT_ARG(RLIMIT_AS),
+		VX_LIMIT_ARG(RLIMIT_MEMLOCK),
+		VX_LIMIT_ARG(RLIMIT_RSS),
+		VX_LIMIT_ARG(VLIMIT_ANON),
+		VX_LIMIT_ARG(VLIMIT_MAPPED),
+		VX_LIMIT_ARG(RLIMIT_NOFILE),
+		VX_LIMIT_ARG(VLIMIT_OPENFD),
+		VX_LIMIT_ARG(RLIMIT_LOCKS),
+		VX_LIMIT_ARG(VLIMIT_NSOCK),
+		VX_LIMIT_ARG(RLIMIT_MSGQUEUE),
+		VX_LIMIT_ARG(VLIMIT_SHMEM),
+		VX_LIMIT_ARG(VLIMIT_SEMARY),
+		VX_LIMIT_ARG(VLIMIT_NSEMS),
+		VX_LIMIT_ARG(VLIMIT_DENTRY));
 }
 
 #endif	/* _VX_LIMIT_PROC_H */
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/monitor.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/monitor.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/monitor.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/monitor.c	2007-06-13 06:54:40 +0200
@@ -87,7 +87,7 @@ int do_read_monitor(struct __user _vx_mo
 			&mon->entry[idx % VXM_SIZE];
 
 		/* send entry to userspace */
-		ret = copy_to_user (&data[pos], entry, sizeof(*entry));
+		ret = copy_to_user(&data[pos], entry, sizeof(*entry));
 		if (ret)
 			break;
 	}
@@ -105,13 +105,13 @@ int vc_read_monitor(uint32_t id, void __
 	if (id >= NR_CPUS)
 		return -EINVAL;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	ret = do_read_monitor((struct __user _vx_mon_entry *)vc_data.data,
 		id, &vc_data.index, &vc_data.count);
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return ret;
 }
@@ -126,14 +126,14 @@ int vc_read_monitor_x32(uint32_t id, voi
 	if (id >= NR_CPUS)
 		return -EINVAL;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	ret = do_read_monitor((struct __user _vx_mon_entry *)
 		compat_ptr(vc_data.data_ptr),
 		id, &vc_data.index, &vc_data.count);
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return ret;
 }
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/network.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/network.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/network.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/network.c	2007-06-14 18:21:10 +0200
@@ -44,7 +44,7 @@ static struct nx_info *__alloc_nx_info(n
 	if (!new)
 		return 0;
 
-	memset (new, 0, sizeof(struct nx_info));
+	memset(new, 0, sizeof(struct nx_info));
 	new->nx_id = nid;
 	INIT_HLIST_NODE(&new->nx_hlist);
 	atomic_set(&new->nx_usecnt, 0);
@@ -187,7 +187,7 @@ static inline struct nx_info *__lookup_n
 found:
 	vxdprintk(VXD_CBIT(nid, 0),
 		"__lookup_nx_info(#%u): %p[#%u]",
-		nid, nxi, nxi?nxi->nx_id:0);
+		nid, nxi, nxi ? nxi->nx_id : 0);
 	return nxi;
 }
 
@@ -220,7 +220,7 @@ static inline nid_t __nx_dynamic_id(void
 	* create the requested context
 	* get(), claim() and hash it				*/
 
-static struct nx_info * __create_nx_info(int id)
+static struct nx_info *__create_nx_info(int id)
 {
 	struct nx_info *new, *nxi = NULL;
 
@@ -348,7 +348,7 @@ int get_nid_list(int index, unsigned int
 	int hindex, nr_nids = 0;
 
 	/* only show current and children */
-	if (!nx_check(0, VS_ADMIN|VS_WATCH)) {
+	if (!nx_check(0, VS_ADMIN | VS_WATCH)) {
 		if (index > 0)
 			return 0;
 		nids[nr_nids] = nx_current_nid();
@@ -488,9 +488,9 @@ static inline int __addr_in_socket(const
 	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));
+		"__addr_in_socket(%p," NIPQUAD_FMT ") %p:" NIPQUAD_FMT " %p;%lx",
+		sk, NIPQUAD(addr), nxi, NIPQUAD(saddr), sk->sk_socket,
+		(sk->sk_socket ? sk->sk_socket->flags : 0));
 
 	if (saddr) {
 		/* direct address match */
@@ -508,8 +508,8 @@ static inline int __addr_in_socket(const
 int nx_addr_conflict(struct nx_info *nxi, uint32_t addr, const struct sock *sk)
 {
 	vxdprintk(VXD_CBIT(net, 2),
-		"nx_addr_conflict(%p,%p) %d.%d,%d.%d",
-		nxi, sk, VXD_QUAD(addr));
+		"nx_addr_conflict(%p,%p) " NIPQUAD_FMT,
+		nxi, sk, NIPQUAD(addr));
 
 	if (addr) {
 		/* check real address */
@@ -518,7 +518,7 @@ int nx_addr_conflict(struct nx_info *nxi
 		/* check against nx_info */
 		int i, n = nxi->nbipv4;
 
-		for (i=0; i<n; i++)
+		for (i = 0; i < n; i++)
 			if (__addr_in_socket(sk, nxi->ipv4[i]))
 				return 1;
 		return 0;
@@ -570,15 +570,14 @@ int vc_task_nid(uint32_t id, void __user
 	if (id) {
 		struct task_struct *tsk;
 
-		if (!nx_check(0, VS_ADMIN|VS_WATCH))
+		if (!nx_check(0, VS_ADMIN | VS_WATCH))
 			return -EPERM;
 
 		read_lock(&tasklist_lock);
 		tsk = find_task_by_real_pid(id);
 		nid = (tsk) ? tsk->nid : -ESRCH;
 		read_unlock(&tasklist_lock);
-	}
-	else
+	} else
 		nid = nx_current_nid();
 	return nid;
 }
@@ -590,7 +589,7 @@ int vc_nx_info(struct nx_info *nxi, void
 
 	vc_data.nid = nxi->nx_id;
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return 0;
 }
@@ -604,7 +603,7 @@ int vc_net_create(uint32_t nid, void __u
 	struct nx_info *new_nxi;
 	int ret;
 
-	if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	if ((nid > MAX_S_CONTEXT) && (nid != NX_DYNAMIC_ID))
@@ -650,7 +649,7 @@ int vc_net_add(struct nx_info *nxi, void
 	struct vcmd_net_addr_v0 vc_data;
 	int index, pos, ret = 0;
 
-	if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	switch (vc_data.type) {
@@ -688,11 +687,11 @@ int vc_net_add(struct nx_info *nxi, void
 	return ret;
 }
 
-int vc_net_remove(struct nx_info * nxi, void __user *data)
+int vc_net_remove(struct nx_info *nxi, void __user *data)
 {
 	struct vcmd_net_addr_v0 vc_data;
 
-	if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	switch (vc_data.type) {
@@ -715,7 +714,7 @@ int vc_get_nflags(struct nx_info *nxi, v
 	/* special STATE flag handling */
 	vc_data.mask = vs_mask_flags(~0UL, nxi->nx_flags, NXF_ONE_TIME);
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return 0;
 }
@@ -725,7 +724,7 @@ int vc_set_nflags(struct nx_info *nxi, v
 	struct vcmd_net_flags_v0 vc_data;
 	uint64_t mask, trigger;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	/* special STATE flag handling */
@@ -747,7 +746,7 @@ int vc_get_ncaps(struct nx_info *nxi, vo
 	vc_data.ncaps = nxi->nx_ncaps;
 	vc_data.cmask = ~0UL;
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return 0;
 }
@@ -756,7 +755,7 @@ int vc_set_ncaps(struct nx_info *nxi, vo
 {
 	struct vcmd_net_caps_v0 vc_data;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	nxi->nx_ncaps = vs_mask_flags(nxi->nx_ncaps,
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/proc.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/proc.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/proc.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/proc.c	2007-06-14 18:27:07 +0200
@@ -48,12 +48,11 @@ static int proc_vci(char *buffer)
 	return sprintf(buffer,
 		"VCIVersion:\t%04x:%04x\n"
 		"VCISyscall:\t%d\n"
-		"VCIKernel:\t%08x\n"
-		,VCI_VERSION >> 16
-		,VCI_VERSION & 0xFFFF
-		,__NR_vserver
-		,vci_kernel_config()
-		);
+		"VCIKernel:\t%08x\n",
+		VCI_VERSION >> 16,
+		VCI_VERSION & 0xFFFF,
+		__NR_vserver,
+		vci_kernel_config());
 }
 
 static int proc_virtual_info(char *buffer)
@@ -66,34 +65,32 @@ static int proc_virtual_status(char *buf
 	return sprintf(buffer,
 		"#CTotal:\t%d\n"
 		"#CActive:\t%d\n"
-		"#NSProxy:\t%d\t%d %d %d %d\n"
-		,atomic_read(&vx_global_ctotal)
-		,atomic_read(&vx_global_cactive)
-		,atomic_read(&vs_global_nsproxy)
-		,atomic_read(&vs_global_fs)
-		,atomic_read(&vs_global_mnt_ns)
-		,atomic_read(&vs_global_uts_ns)
-		,atomic_read(&vs_global_ipc_ns)
-		);
+		"#NSProxy:\t%d\t%d %d %d %d\n",
+		atomic_read(&vx_global_ctotal),
+		atomic_read(&vx_global_cactive),
+		atomic_read(&vs_global_nsproxy),
+		atomic_read(&vs_global_fs),
+		atomic_read(&vs_global_mnt_ns),
+		atomic_read(&vs_global_uts_ns),
+		atomic_read(&vs_global_ipc_ns));
 }
 
 
-int proc_vxi_info (struct vx_info *vxi, char *buffer)
+int proc_vxi_info(struct vx_info *vxi, char *buffer)
 {
 	int length;
 
 	length = sprintf(buffer,
 		"ID:\t%d\n"
 		"Info:\t%p\n"
-		"Init:\t%d\n"
-		,vxi->vx_id
-		,vxi
-		,vxi->vx_initpid
-		);
+		"Init:\t%d\n",
+		vxi->vx_id,
+		vxi,
+		vxi->vx_initpid);
 	return length;
 }
 
-int proc_vxi_status (struct vx_info *vxi, char *buffer)
+int proc_vxi_status(struct vx_info *vxi, char *buffer)
 {
 	int length;
 
@@ -103,23 +100,22 @@ int proc_vxi_status (struct vx_info *vxi
 		"Flags:\t%016llx\n"
 		"BCaps:\t%016llx\n"
 		"CCaps:\t%016llx\n"
-		"Spaces:\t%08lx\n"
-		,atomic_read(&vxi->vx_usecnt)
-		,atomic_read(&vxi->vx_tasks)
-		,(unsigned long long)vxi->vx_flags
-		,(unsigned long long)vxi->vx_bcaps
-		,(unsigned long long)vxi->vx_ccaps
-		,vxi->vx_nsmask
-		);
+		"Spaces:\t%08lx\n",
+		atomic_read(&vxi->vx_usecnt),
+		atomic_read(&vxi->vx_tasks),
+		(unsigned long long)vxi->vx_flags,
+		(unsigned long long)vxi->vx_bcaps,
+		(unsigned long long)vxi->vx_ccaps,
+		vxi->vx_nsmask);
 	return length;
 }
 
-int proc_vxi_limit (struct vx_info *vxi, char *buffer)
+int proc_vxi_limit(struct vx_info *vxi, char *buffer)
 {
 	return vx_info_proc_limit(&vxi->limit, buffer);
 }
 
-int proc_vxi_sched (struct vx_info *vxi, char *buffer)
+int proc_vxi_sched(struct vx_info *vxi, char *buffer)
 {
 	int cpu, length;
 
@@ -132,12 +128,12 @@ int proc_vxi_sched (struct vx_info *vxi,
 	return length;
 }
 
-int proc_vxi_nsproxy (struct vx_info *vxi, char *buffer)
+int proc_vxi_nsproxy(struct vx_info *vxi, char *buffer)
 {
 	return vx_info_proc_nsproxy(vxi->vx_nsproxy, buffer);
 }
 
-int proc_vxi_cvirt (struct vx_info *vxi, char *buffer)
+int proc_vxi_cvirt(struct vx_info *vxi, char *buffer)
 {
 	int cpu, length;
 
@@ -151,7 +147,7 @@ int proc_vxi_cvirt (struct vx_info *vxi,
 	return length;
 }
 
-int proc_vxi_cacct (struct vx_info *vxi, char *buffer)
+int proc_vxi_cacct(struct vx_info *vxi, char *buffer)
 {
 	return vx_info_proc_cacct(&vxi->cacct, buffer);
 }
@@ -166,23 +162,21 @@ static int proc_virtnet_status(char *buf
 {
 	return sprintf(buffer,
 		"#CTotal:\t%d\n"
-		"#CActive:\t%d\n"
-		,atomic_read(&nx_global_ctotal)
-		,atomic_read(&nx_global_cactive)
-		);
+		"#CActive:\t%d\n",
+		atomic_read(&nx_global_ctotal),
+		atomic_read(&nx_global_cactive));
 }
 
-int proc_nxi_info (struct nx_info *nxi, char *buffer)
+int proc_nxi_info(struct nx_info *nxi, char *buffer)
 {
 	int length, i;
 
 	length = sprintf(buffer,
 		"ID:\t%d\n"
-		"Info:\t%p\n"
-		,nxi->nx_id
-		,nxi
-		);
-	for (i=0; i<nxi->nbipv4; i++) {
+		"Info:\t%p\n",
+		nxi->nx_id,
+		nxi);
+	for (i = 0; i < nxi->nbipv4; i++) {
 		length += sprintf(buffer + length,
 			"%d:\t" NIPQUAD_FMT "/" NIPQUAD_FMT "\n", i,
 			NIPQUAD(nxi->ipv4[i]), NIPQUAD(nxi->mask[i]));
@@ -190,7 +184,7 @@ int proc_nxi_info (struct nx_info *nxi, 
 	return length;
 }
 
-int proc_nxi_status (struct nx_info *nxi, char *buffer)
+int proc_nxi_status(struct nx_info *nxi, char *buffer)
 {
 	int length;
 
@@ -198,12 +192,11 @@ int proc_nxi_status (struct nx_info *nxi
 		"UseCnt:\t%d\n"
 		"Tasks:\t%d\n"
 		"Flags:\t%016llx\n"
-		"NCaps:\t%016llx\n"
-		,atomic_read(&nxi->nx_usecnt)
-		,atomic_read(&nxi->nx_tasks)
-		,(unsigned long long)nxi->nx_flags
-		,(unsigned long long)nxi->nx_ncaps
-		);
+		"NCaps:\t%016llx\n",
+		atomic_read(&nxi->nx_usecnt),
+		atomic_read(&nxi->nx_tasks),
+		(unsigned long long)nxi->nx_flags,
+		(unsigned long long)nxi->nx_ncaps);
 	return length;
 }
 
@@ -330,7 +323,7 @@ struct vx_info *get_proc_vx_info(struct 
 	return lookup_vx_info(PROC_I(inode)->fd);
 }
 
-static int proc_xid_revalidate(struct dentry * dentry, struct nameidata *nd)
+static int proc_xid_revalidate(struct dentry *dentry, struct nameidata *nd)
 {
 	struct inode *inode = dentry->d_inode;
 	xid_t xid = PROC_I(inode)->fd;
@@ -344,7 +337,7 @@ static int proc_xid_revalidate(struct de
 
 /* get and revalidate nx_info/nid */
 
-static int proc_nid_revalidate(struct dentry * dentry, struct nameidata *nd)
+static int proc_nid_revalidate(struct dentry *dentry, struct nameidata *nd)
 {
 	struct inode *inode = dentry->d_inode;
 	nid_t nid = PROC_I(inode)->fd;
@@ -359,7 +352,7 @@ static int proc_nid_revalidate(struct de
 
 #define PROC_BLOCK_SIZE (PAGE_SIZE - 1024)
 
-static ssize_t proc_vs_info_read(struct file * file, char __user * buf,
+static ssize_t proc_vs_info_read(struct file *file, char __user *buf,
 			  size_t count, loff_t *ppos)
 {
 	struct inode *inode = file->f_dentry->d_inode;
@@ -376,7 +369,7 @@ static ssize_t proc_vs_info_read(struct 
 		return -ENOMEM;
 
 	BUG_ON(!PROC_I(inode)->op.proc_vs_read);
-	length = PROC_I(inode)->op.proc_vs_read((char*)page);
+	length = PROC_I(inode)->op.proc_vs_read((char *)page);
 
 	if (length >= 0)
 		length = simple_read_from_buffer(buf, count, ppos,
@@ -386,7 +379,7 @@ static ssize_t proc_vs_info_read(struct 
 	return length;
 }
 
-static ssize_t proc_vx_info_read(struct file * file, char __user * buf,
+static ssize_t proc_vx_info_read(struct file *file, char __user *buf,
 			  size_t count, loff_t *ppos)
 {
 	struct inode *inode = file->f_dentry->d_inode;
@@ -409,7 +402,7 @@ static ssize_t proc_vx_info_read(struct 
 		goto out_put;
 
 	BUG_ON(!PROC_I(inode)->op.proc_vxi_read);
-	length = PROC_I(inode)->op.proc_vxi_read(vxi, (char*)page);
+	length = PROC_I(inode)->op.proc_vxi_read(vxi, (char *)page);
 
 	if (length >= 0)
 		length = simple_read_from_buffer(buf, count, ppos,
@@ -422,7 +415,7 @@ out:
 	return length;
 }
 
-static ssize_t proc_nx_info_read(struct file * file, char __user * buf,
+static ssize_t proc_nx_info_read(struct file *file, char __user *buf,
 			  size_t count, loff_t *ppos)
 {
 	struct inode *inode = file->f_dentry->d_inode;
@@ -445,7 +438,7 @@ static ssize_t proc_nx_info_read(struct 
 		goto out_put;
 
 	BUG_ON(!PROC_I(inode)->op.proc_nxi_read);
-	length = PROC_I(inode)->op.proc_nxi_read(nxi, (char*)page);
+	length = PROC_I(inode)->op.proc_nxi_read(nxi, (char *)page);
 
 	if (length >= 0)
 		length = simple_read_from_buffer(buf, count, ppos,
@@ -474,22 +467,22 @@ out:
 
 
 #define DIR(NAME, MODE, OTYPE)				\
-	NOD(NAME, (S_IFDIR|(MODE)),			\
-		&proc_##OTYPE##_inode_operations,	\
-		&proc_##OTYPE##_file_operations, { } )
+	NOD(NAME, (S_IFDIR | (MODE)),			\
+		&proc_ ## OTYPE ## _inode_operations,	\
+		&proc_ ## OTYPE ## _file_operations, { } )
 
 #define INF(NAME, MODE, OTYPE)				\
-	NOD(NAME, (S_IFREG|(MODE)), NULL,		\
+	NOD(NAME, (S_IFREG | (MODE)), NULL,		\
 		&proc_vs_info_file_operations,		\
 		{ .proc_vs_read = &proc_##OTYPE } )
 
 #define VINF(NAME, MODE, OTYPE)				\
-	NOD(NAME, (S_IFREG|(MODE)), NULL,		\
+	NOD(NAME, (S_IFREG | (MODE)), NULL,		\
 		&proc_vx_info_file_operations,		\
 		{ .proc_vxi_read = &proc_##OTYPE } )
 
 #define NINF(NAME, MODE, OTYPE)				\
-	NOD(NAME, (S_IFREG|(MODE)), NULL,		\
+	NOD(NAME, (S_IFREG | (MODE)), NULL,		\
 		&proc_nx_info_file_operations,		\
 		{ .proc_nxi_read = &proc_##OTYPE } )
 
@@ -547,13 +540,13 @@ out:
 	return error;
 }
 
-static int proc_xid_readdir(struct file * filp,
-	void * dirent, filldir_t filldir)
+static int proc_xid_readdir(struct file *filp,
+	void *dirent, filldir_t filldir)
 {
 	struct dentry *dentry = filp->f_dentry;
 	struct inode *inode = dentry->d_inode;
 	struct vs_entry *p = vx_base_stuff;
-	int size = sizeof(vx_base_stuff)/sizeof(struct vs_entry);
+	int size = sizeof(vx_base_stuff) / sizeof(struct vs_entry);
 	int pos, index;
 	u64 ino;
 
@@ -631,13 +624,13 @@ out:
 	return error;
 }
 
-static int proc_nid_readdir(struct file * filp,
-	void * dirent, filldir_t filldir)
+static int proc_nid_readdir(struct file *filp,
+	void *dirent, filldir_t filldir)
 {
 	struct dentry *dentry = filp->f_dentry;
 	struct inode *inode = dentry->d_inode;
 	struct vs_entry *p = nx_base_stuff;
-	int size = sizeof(nx_base_stuff)/sizeof(struct vs_entry);
+	int size = sizeof(nx_base_stuff) / sizeof(struct vs_entry);
 	int pos, index;
 	u64 ino;
 
@@ -672,7 +665,7 @@ out:
 }
 
 
-#define MAX_MULBY10	((~0U-9)/10)
+#define MAX_MULBY10	((~0U - 9) / 10)
 
 static inline int atovid(const char *str, int len)
 {
@@ -709,7 +702,7 @@ static struct inode_operations proc_xid_
 static struct vs_entry vx_virtual_stuff[] = {
 	INF("info",	S_IRUGO, virtual_info),
 	INF("status",	S_IRUGO, virtual_status),
-	DIR(NULL,	S_IRUGO|S_IXUGO, xid),
+	DIR(NULL,	S_IRUGO | S_IXUGO, xid),
 };
 
 
@@ -751,7 +744,7 @@ static struct inode_operations proc_nid_
 static struct vs_entry nx_virtnet_stuff[] = {
 	INF("info",	S_IRUGO, virtnet_info),
 	INF("status",	S_IRUGO, virtnet_status),
-	DIR(NULL,	S_IRUGO|S_IXUGO, nid),
+	DIR(NULL,	S_IRUGO | S_IXUGO, nid),
 };
 
 
@@ -786,13 +779,13 @@ out:
 #define PROC_NUMBUF 10
 #define PROC_MAXVIDS 32
 
-int proc_virtual_readdir(struct file * filp,
-	void * dirent, filldir_t filldir)
+int proc_virtual_readdir(struct file *filp,
+	void *dirent, filldir_t filldir)
 {
 	struct dentry *dentry = filp->f_dentry;
 	struct inode *inode = dentry->d_inode;
 	struct vs_entry *p = vx_virtual_stuff;
-	int size = sizeof(vx_virtual_stuff)/sizeof(struct vs_entry);
+	int size = sizeof(vx_virtual_stuff) / sizeof(struct vs_entry);
 	int pos, index;
 	unsigned int xid_array[PROC_MAXVIDS];
 	char buf[PROC_NUMBUF];
@@ -825,16 +818,19 @@ int proc_virtual_readdir(struct file * f
 		}
 	entries:
 		index = pos - size;
-		p = &vx_virtual_stuff[size-1];
+		p = &vx_virtual_stuff[size - 1];
 		nr_xids = get_xid_list(index, xid_array, PROC_MAXVIDS);
 		for (i = 0; i < nr_xids; i++) {
 			int n, xid = xid_array[i];
 			unsigned int j = PROC_NUMBUF;
 
 			n = xid;
-			do buf[--j] = '0' + (n % 10); while (n /= 10);
+			do
+				buf[--j] = '0' + (n % 10);
+			while (n /= 10);
 
-			if (proc_fill_cache(filp, dirent, filldir, buf+j, PROC_NUMBUF-j,
+			if (proc_fill_cache(filp, dirent, filldir,
+				buf + j, PROC_NUMBUF - j,
 				vs_proc_instantiate, xid, p))
 				goto out;
 			pos++;
@@ -869,13 +865,13 @@ static struct inode_operations proc_virt
 
 
 
-int proc_virtnet_readdir(struct file * filp,
-	void * dirent, filldir_t filldir)
+int proc_virtnet_readdir(struct file *filp,
+	void *dirent, filldir_t filldir)
 {
 	struct dentry *dentry = filp->f_dentry;
 	struct inode *inode = dentry->d_inode;
 	struct vs_entry *p = nx_virtnet_stuff;
-	int size = sizeof(nx_virtnet_stuff)/sizeof(struct vs_entry);
+	int size = sizeof(nx_virtnet_stuff) / sizeof(struct vs_entry);
 	int pos, index;
 	unsigned int nid_array[PROC_MAXVIDS];
 	char buf[PROC_NUMBUF];
@@ -908,16 +904,19 @@ int proc_virtnet_readdir(struct file * f
 		}
 	entries:
 		index = pos - size;
-		p = &nx_virtnet_stuff[size-1];
+		p = &nx_virtnet_stuff[size - 1];
 		nr_nids = get_nid_list(index, nid_array, PROC_MAXVIDS);
 		for (i = 0; i < nr_nids; i++) {
 			int n, nid = nid_array[i];
 			unsigned int j = PROC_NUMBUF;
 
 			n = nid;
-			do buf[--j] = '0' + (n % 10); while (n /= 10);
+			do
+				buf[--j] = '0' + (n % 10);
+			while (n /= 10);
 
-			if (proc_fill_cache(filp, dirent, filldir, buf+j, PROC_NUMBUF-j,
+			if (proc_fill_cache(filp, dirent, filldir,
+				buf + j, PROC_NUMBUF - j,
 				vs_proc_instantiate, nid, p))
 				goto out;
 			pos++;
@@ -978,22 +977,21 @@ void proc_vx_init(void)
 int proc_pid_vx_info(struct task_struct *p, char *buffer)
 {
 	struct vx_info *vxi;
-	char * orig = buffer;
+	char *orig = buffer;
 
-	buffer += sprintf (buffer,"XID:\t%d\n", vx_task_xid(p));
+	buffer += sprintf(buffer, "XID:\t%d\n", vx_task_xid(p));
 
 	vxi = task_get_vx_info(p);
 	if (!vxi)
 		goto out;
 
-	buffer += sprintf (buffer,"BCaps:\t%016llx\n"
-		,(unsigned long long)vxi->vx_bcaps);
-	buffer += sprintf (buffer,"CCaps:\t%016llx\n"
-		,(unsigned long long)vxi->vx_ccaps);
-	buffer += sprintf (buffer,"CFlags:\t%016llx\n"
-		,(unsigned long long)vxi->vx_flags);
-	buffer += sprintf (buffer,"CIPid:\t%d\n"
-		,vxi->vx_initpid);
+	buffer += sprintf(buffer, "BCaps:\t%016llx\n",
+		(unsigned long long)vxi->vx_bcaps);
+	buffer += sprintf(buffer, "CCaps:\t%016llx\n",
+		(unsigned long long)vxi->vx_ccaps);
+	buffer += sprintf(buffer, "CFlags:\t%016llx\n",
+		(unsigned long long)vxi->vx_flags);
+	buffer += sprintf(buffer, "CIPid:\t%d\n", vxi->vx_initpid);
 
 	put_vx_info(vxi);
 out:
@@ -1004,29 +1002,29 @@ out:
 int proc_pid_nx_info(struct task_struct *p, char *buffer)
 {
 	struct nx_info *nxi;
-	char * orig = buffer;
+	char *orig = buffer;
 	int i;
 
-	buffer += sprintf (buffer,"NID:\t%d\n", nx_task_nid(p));
+	buffer += sprintf(buffer, "NID:\t%d\n", nx_task_nid(p));
 
 	nxi = task_get_nx_info(p);
 	if (!nxi)
 		goto out;
 
-	buffer += sprintf (buffer,"NCaps:\t%016llx\n"
-		,(unsigned long long)nxi->nx_ncaps);
-	buffer += sprintf (buffer,"NFlags:\t%016llx\n"
-		,(unsigned long long)nxi->nx_flags);
+	buffer += sprintf(buffer, "NCaps:\t%016llx\n",
+		(unsigned long long)nxi->nx_ncaps);
+	buffer += sprintf(buffer, "NFlags:\t%016llx\n",
+		(unsigned long long)nxi->nx_flags);
 
-	for (i=0; i<nxi->nbipv4; i++){
-		buffer += sprintf (buffer,
-			"V4Root[%d]:\t%d.%d.%d.%d/%d.%d.%d.%d\n", i
-			,NIPQUAD(nxi->ipv4[i])
-			,NIPQUAD(nxi->mask[i]));
+	for (i = 0; i < nxi->nbipv4; i++){
+		buffer += sprintf(buffer,
+			"V4Root[%d]:\t%d.%d.%d.%d/%d.%d.%d.%d\n", i,
+			NIPQUAD(nxi->ipv4[i]),
+			NIPQUAD(nxi->mask[i]));
 	}
-	buffer += sprintf (buffer,
-		"V4Root[bcast]:\t%d.%d.%d.%d\n"
-		,NIPQUAD(nxi->v4_bcast));
+	buffer += sprintf(buffer,
+		"V4Root[bcast]:\t%d.%d.%d.%d\n",
+		NIPQUAD(nxi->v4_bcast));
 
 	put_nx_info(nxi);
 out:
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/sched.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/sched.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/sched.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/sched.c	2007-06-14 19:51:10 +0200
@@ -20,7 +20,7 @@
 #include <asm/uaccess.h>
 
 #define vxd_check_range(val, min, max) do {		\
-	vxlprintk((val<min) || (val>max),		\
+	vxlprintk((val < min) || (val > max),		\
 		"check_range(%ld,%ld,%ld)",		\
 		(long)val, (long)min, (long)max,	\
 		__FILE__, __LINE__);			\
@@ -96,8 +96,7 @@ int vx_tokens_recalc(struct _vx_sched_pc
 		/* add tokens */
 		sched_pc->tokens += tokens;
 		sched_pc->token_time += tokens;
-	}
-	else
+	} else
 		delta_min[0] = delta;
 
 #ifdef	CONFIG_VSERVER_IDLETIME
@@ -124,8 +123,7 @@ int vx_tokens_recalc(struct _vx_sched_pc
 		/* add tokens */
 		sched_pc->tokens += tokens;
 		sched_pc->token_time += tokens;
-	}
-	else
+	} else
 		delta_min[1] = delta;
 skip_idle:
 #endif
@@ -141,8 +139,7 @@ skip_idle:
 			flags &= ~VXSF_ONHOLD;
 			sched_pc->hold_ticks +=
 				*norm_time - sched_pc->onhold;
-		}
-		else
+		} else
 			goto on_hold;
 	} else {
 		/* put on hold? */
@@ -220,7 +217,7 @@ static int do_set_sched(struct vx_info *
 	if (data->tokens_max <= 0)
 		data->tokens_max = HZ;
 	if (data->tokens_min < 0)
-		data->tokens_min = HZ/3;
+		data->tokens_min = HZ / 3;
 	if (data->tokens_min >= data->tokens_max)
 		data->tokens_min = data->tokens_max;
 
@@ -256,7 +253,7 @@ static int do_set_sched(struct vx_info *
 		vxi->sched.prio_bias = data->prio_bias;
 
 	/* Sanity check rate/interval */
-	for (i=0; i<2; i++) {
+	for (i = 0; i < 2; i++) {
 		if (data->fill_rate[i] < 0)
 			data->fill_rate[i] = 0;
 		if (data->interval[i] <= 0)
@@ -264,7 +261,7 @@ static int do_set_sched(struct vx_info *
 	}
 
 	update_mask = vxi->sched.update_mask & VXSM_SET_MASK;
-	update_mask |= (set_mask & (VXSM_SET_MASK|VXSM_IDLE_TIME));
+	update_mask |= (set_mask & (VXSM_SET_MASK | VXSM_IDLE_TIME));
 	vxi->sched.update_mask = update_mask;
 #ifdef	CONFIG_SMP
 	rmb();
@@ -272,8 +269,7 @@ static int do_set_sched(struct vx_info *
 		vxi->sched.update = cpumask_of_cpu(data->cpu_id);
 		cpus_and(vxi->sched.update, cpu_online_map,
 			vxi->sched.update);
-	}
-	else
+	} else
 		vxi->sched.update = cpu_online_map;
 
 	/* forced reload? */
@@ -327,7 +323,7 @@ int vc_set_sched_v2(struct vx_info *vxi,
 	struct vcmd_set_sched_v2 vc_data;
 	struct vcmd_set_sched_v4 vc_data_v4 = { .set_mask = 0 };
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	COPY_MASK_V2(fill_rate,	 VXSM_FILL_RATE);
@@ -347,7 +343,7 @@ int vc_set_sched_v3(struct vx_info *vxi,
 	struct vcmd_set_sched_v3 vc_data;
 	struct vcmd_set_sched_v4 vc_data_v4;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	/* structures are binary compatible */
@@ -362,7 +358,7 @@ int vc_set_sched_v4(struct vx_info *vxi,
 {
 	struct vcmd_set_sched_v4 vc_data;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	return do_set_sched_v4(vxi, &vc_data);
@@ -374,7 +370,7 @@ int vc_set_sched(struct vx_info *vxi, vo
 {
 	struct vcmd_sched_v5 vc_data;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	return do_set_sched(vxi, &vc_data);
@@ -385,7 +381,7 @@ int vc_get_sched(struct vx_info *vxi, vo
 {
 	struct vcmd_sched_v5 vc_data;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	if (vc_data.mask & VXSM_CPU_ID) {
@@ -415,7 +411,7 @@ int vc_get_sched(struct vx_info *vxi, vo
 		vc_data.interval[1] = ticks_to_msec(vc_data.interval[1]);
 	}
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return 0;
 }
@@ -426,7 +422,7 @@ int vc_sched_info(struct vx_info *vxi, v
 	struct vcmd_sched_info vc_data;
 	int cpu;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	cpu = vc_data.cpu_id;
@@ -444,7 +440,7 @@ int vc_sched_info(struct vx_info *vxi, v
 	}
 	vc_data.token_usec = ticks_to_usec(1);
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
 	return 0;
 }
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/sched_proc.h linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/sched_proc.h
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/sched_proc.h	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/sched_proc.h	2007-06-13 04:56:29 +0200
@@ -12,15 +12,14 @@ int vx_info_proc_sched(struct _vx_sched 
 		"Interval:\t%8d,%d\n"
 		"TokensMin:\t%8d\n"
 		"TokensMax:\t%8d\n"
-		"PrioBias:\t%8d\n"
-		,sched->fill_rate[0]
-		,sched->fill_rate[1]
-		,sched->interval[0]
-		,sched->interval[1]
-		,sched->tokens_min
-		,sched->tokens_max
-		,sched->prio_bias
-		);
+		"PrioBias:\t%8d\n",
+		sched->fill_rate[0],
+		sched->fill_rate[1],
+		sched->interval[0],
+		sched->interval[1],
+		sched->tokens_min,
+		sched->tokens_max,
+		sched->prio_bias);
 	return length;
 }
 
@@ -31,31 +30,27 @@ int vx_info_proc_sched_pc(struct _vx_sch
 	int length = 0;
 
 	length += sprintf(buffer + length,
-		"cpu %d: %lld %lld %lld %ld %ld"
-		,cpu
-		,(unsigned long long)sched_pc->user_ticks
-		,(unsigned long long)sched_pc->sys_ticks
-		,(unsigned long long)sched_pc->hold_ticks
-		,sched_pc->token_time
-		,sched_pc->idle_time
-		);
+		"cpu %d: %lld %lld %lld %ld %ld", cpu,
+		(unsigned long long)sched_pc->user_ticks,
+		(unsigned long long)sched_pc->sys_ticks,
+		(unsigned long long)sched_pc->hold_ticks,
+		sched_pc->token_time,
+		sched_pc->idle_time);
 	length += sprintf(buffer + length,
-		" %c%c %d %d %d %d/%d %d/%d"
-		,(sched_pc->flags & VXSF_ONHOLD) ? 'H' : 'R'
-		,(sched_pc->flags & VXSF_IDLE_TIME) ? 'I' : '-'
-		,sched_pc->tokens
-		,sched_pc->tokens_min
-		,sched_pc->tokens_max
-		,sched_pc->fill_rate[0]
-		,sched_pc->interval[0]
-		,sched_pc->fill_rate[1]
-		,sched_pc->interval[1]
-		);
+		" %c%c %d %d %d %d/%d %d/%d",
+		(sched_pc->flags & VXSF_ONHOLD) ? 'H' : 'R',
+		(sched_pc->flags & VXSF_IDLE_TIME) ? 'I' : '-',
+		sched_pc->tokens,
+		sched_pc->tokens_min,
+		sched_pc->tokens_max,
+		sched_pc->fill_rate[0],
+		sched_pc->interval[0],
+		sched_pc->fill_rate[1],
+		sched_pc->interval[1]);
 	length += sprintf(buffer + length,
-		" %d %d\n"
-		,sched_pc->prio_bias
-		,sched_pc->vavavoom
-		);
+		" %d %d\n",
+		sched_pc->prio_bias,
+		sched_pc->vavavoom);
 	return length;
 }
 
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/signal.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/signal.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/signal.c	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/signal.c	2007-06-14 19:52:20 +0200
@@ -22,7 +22,7 @@
 
 int vx_info_kill(struct vx_info *vxi, int pid, int sig)
 {
-	int retval, count=0;
+	int retval, count = 0;
 	struct task_struct *p;
 	struct siginfo *sip = SEND_SIG_PRIV;
 
@@ -77,7 +77,7 @@ int vc_ctx_kill(struct vx_info *vxi, voi
 {
 	struct vcmd_ctx_kill_v0 vc_data;
 
-	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	/* special check to allow guest shutdown */
@@ -101,7 +101,7 @@ static int __wait_exit(struct vx_info *v
 
 wait:
 	if (vx_info_state(vxi,
-		VXS_SHUTDOWN|VXS_HASHED|VXS_HELPER) == VXS_SHUTDOWN)
+		VXS_SHUTDOWN | VXS_HASHED | VXS_HELPER) == VXS_SHUTDOWN)
 		goto out;
 	if (signal_pending(current)) {
 		ret = -ERESTARTSYS;
@@ -127,7 +127,7 @@ int vc_wait_exit(struct vx_info *vxi, vo
 	vc_data.reboot_cmd = vxi->reboot_cmd;
 	vc_data.exit_code = vxi->exit_code;
 
-	if (copy_to_user (data, &vc_data, sizeof(vc_data)))
+	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		ret = -EFAULT;
 	return ret;
 }
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/space.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/space.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/space.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/space.c	2007-06-13 10:00:57 +0200
@@ -105,7 +105,7 @@ out:
  */
 
 static inline
-struct nsproxy * __vs_merge_nsproxy(struct nsproxy *old,
+struct nsproxy *__vs_merge_nsproxy(struct nsproxy *old,
 	struct nsproxy *proxy, unsigned long mask)
 {
 	struct nsproxy null_proxy = { .mnt_ns = NULL };
@@ -126,7 +126,7 @@ struct nsproxy * __vs_merge_nsproxy(stru
  */
 
 static inline
-struct fs_struct * __vs_merge_fs(struct fs_struct *old,
+struct fs_struct *__vs_merge_fs(struct fs_struct *old,
 	struct fs_struct *fs, unsigned long mask)
 {
 	if (!(mask & CLONE_FS)) {
@@ -254,7 +254,7 @@ int vc_enter_space(struct vx_info *vxi, 
 {
 	struct vcmd_space_mask vc_data = { .mask = 0 };
 
-	if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	return vx_enter_space(vxi, vc_data.mask);
@@ -264,7 +264,7 @@ int vc_set_space(struct vx_info *vxi, vo
 {
 	struct vcmd_space_mask vc_data = { .mask = 0 };
 
-	if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
+	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
 	return vx_set_space(vxi, vc_data.mask);
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/switch.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/switch.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/switch.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/switch.c	2007-06-13 19:05:35 +0200
@@ -62,10 +62,10 @@ int vc_get_vci(uint32_t id)
 
 #ifdef	CONFIG_COMPAT
 #define __COMPAT(name, id, data, compat)	\
-	(compat) ? name ## _x32 (id, data) : name (id, data)
+	(compat) ? name ## _x32(id, data) : name(id, data)
 #else
 #define __COMPAT(name, id, data, compat)	\
-	name (id, data)
+	name(id, data)
 #endif
 
 
@@ -310,7 +310,7 @@ long do_vserver(uint32_t cmd, uint32_t i
 	__VCMD(get_iattr,	 2, VCA_NONE,	0);
 	__VCMD(get_dlimit,	 3, VCA_NONE,	VCF_INFO);
 	__VCMD(get_sched,	 3, VCA_VXI,	VCF_INFO);
-	__VCMD(sched_info,	 3, VCA_VXI,	VCF_INFO|VCF_ZIDOK);
+	__VCMD(sched_info,	 3, VCA_VXI,	VCF_INFO | VCF_ZIDOK);
 
 	/* lower admin commands */
 	__VCMD(wait_exit,	 4, VCA_VXI,	VCF_INFO);
@@ -327,25 +327,25 @@ long do_vserver(uint32_t cmd, uint32_t i
 
 	/* higher admin commands */
 	__VCMD(ctx_kill,	 6, VCA_VXI,	VCF_ARES);
-	__VCMD(set_space_v0,	 7, VCA_VXI,	VCF_ARES|VCF_SETUP);
-	__VCMD(set_space,	 7, VCA_VXI,	VCF_ARES|VCF_SETUP);
+	__VCMD(set_space_v0,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
+	__VCMD(set_space,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
 
-	__VCMD(set_ccaps_v0,	 7, VCA_VXI,	VCF_ARES|VCF_SETUP);
-	__VCMD(set_ccaps,	 7, VCA_VXI,	VCF_ARES|VCF_SETUP);
-	__VCMD(set_bcaps,	 7, VCA_VXI,	VCF_ARES|VCF_SETUP);
-	__VCMD(set_cflags,	 7, VCA_VXI,	VCF_ARES|VCF_SETUP);
+	__VCMD(set_ccaps_v0,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
+	__VCMD(set_ccaps,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
+	__VCMD(set_bcaps,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
+	__VCMD(set_cflags,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
 
-	__VCMD(set_vhi_name,	 7, VCA_VXI,	VCF_ARES|VCF_SETUP);
-	__VCMD(set_rlimit,	 7, VCA_VXI,	VCF_ARES|VCF_SETUP);
-	__VCMD(set_sched,	 7, VCA_VXI,	VCF_ARES|VCF_SETUP);
-	__VCMD(set_sched_v2,	 7, VCA_VXI,	VCF_ARES|VCF_SETUP);
-	__VCMD(set_sched_v3,	 7, VCA_VXI,	VCF_ARES|VCF_SETUP);
-	__VCMD(set_sched_v4,	 7, VCA_VXI,	VCF_ARES|VCF_SETUP);
+	__VCMD(set_vhi_name,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
+	__VCMD(set_rlimit,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
+	__VCMD(set_sched,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
+	__VCMD(set_sched_v2,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
+	__VCMD(set_sched_v3,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
+	__VCMD(set_sched_v4,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
 
-	__VCMD(set_ncaps,	 7, VCA_NXI,	VCF_ARES|VCF_SETUP);
-	__VCMD(set_nflags,	 7, VCA_NXI,	VCF_ARES|VCF_SETUP);
-	__VCMD(net_add,		 8, VCA_NXI,	VCF_ARES|VCF_SETUP);
-	__VCMD(net_remove,	 8, VCA_NXI,	VCF_ARES|VCF_SETUP);
+	__VCMD(set_ncaps,	 7, VCA_NXI,	VCF_ARES | VCF_SETUP);
+	__VCMD(set_nflags,	 7, VCA_NXI,	VCF_ARES | VCF_SETUP);
+	__VCMD(net_add,		 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
+	__VCMD(net_remove,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
 
 	__VCMD(set_iattr,	 7, VCA_NONE,	0);
 	__VCMD(set_dlimit,	 7, VCA_NONE,	VCF_ARES);
@@ -387,7 +387,7 @@ long do_vserver(uint32_t cmd, uint32_t i
 #ifdef	CONFIG_VSERVER_LEGACY
 	if (!capable(CAP_CONTEXT) &&
 		/* dirty hack for capremove */
-		!(cmd==VCMD_new_s_context && id==-2))
+		!(cmd == VCMD_new_s_context && id == -2))
 		goto out;
 #else
 	if (!capable(CAP_CONTEXT))
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/kernel/vserver/sysctl.c linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/sysctl.c
--- linux-2.6.20.14-vs2.2.0/kernel/vserver/sysctl.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/kernel/vserver/sysctl.c	2007-06-14 19:54:28 +0200
@@ -90,7 +90,7 @@ static int proc_dodebug(ctl_table *table
 	if (write) {
 		if (!access_ok(VERIFY_READ, buffer, left))
 			return -EFAULT;
-		p = (char *) buffer;
+		p = (char *)buffer;
 		while (left && __get_user(c, p) >= 0 && isspace(c))
 			left--, p++;
 		if (!left)
@@ -108,11 +108,11 @@ static int proc_dodebug(ctl_table *table
 			return -EINVAL;
 		while (left && isspace(*p))
 			left--, p++;
-		*(unsigned int *) table->data = value;
+		*(unsigned int *)table->data = value;
 	} else {
 		if (!access_ok(VERIFY_WRITE, buffer, left))
 			return -EFAULT;
-		len = sprintf(tmpbuf, "%d", *(unsigned int *) table->data);
+		len = sprintf(tmpbuf, "%d", *(unsigned int *)table->data);
 		if (len > left)
 			len = left;
 		if (__copy_to_user(buffer, tmpbuf, len))
@@ -135,24 +135,24 @@ done:
 	{						\
 		.ctl_name	= ctl,			\
 		.procname	= #name,		\
-		.data		= &vx_##name,		\
+		.data		= &vx_ ## name,		\
 		.maxlen		= sizeof(int),		\
 		.mode		= 0644,			\
 		.proc_handler	= &proc_dodebug		\
 	}
 
 static ctl_table debug_table[] = {
-	CTL_ENTRY (CTL_DEBUG_SWITCH,	debug_switch),
-	CTL_ENTRY (CTL_DEBUG_XID,	debug_xid),
-	CTL_ENTRY (CTL_DEBUG_NID,	debug_nid),
-	CTL_ENTRY (CTL_DEBUG_TAG,	debug_tag),
-	CTL_ENTRY (CTL_DEBUG_NET,	debug_net),
-	CTL_ENTRY (CTL_DEBUG_LIMIT,	debug_limit),
-	CTL_ENTRY (CTL_DEBUG_CRES,	debug_cres),
-	CTL_ENTRY (CTL_DEBUG_DLIM,	debug_dlim),
-	CTL_ENTRY (CTL_DEBUG_QUOTA,	debug_quota),
-	CTL_ENTRY (CTL_DEBUG_CVIRT,	debug_cvirt),
-	CTL_ENTRY (CTL_DEBUG_MISC,	debug_misc),
+	CTL_ENTRY(CTL_DEBUG_SWITCH,	debug_switch),
+	CTL_ENTRY(CTL_DEBUG_XID,	debug_xid),
+	CTL_ENTRY(CTL_DEBUG_NID,	debug_nid),
+	CTL_ENTRY(CTL_DEBUG_TAG,	debug_tag),
+	CTL_ENTRY(CTL_DEBUG_NET,	debug_net),
+	CTL_ENTRY(CTL_DEBUG_LIMIT,	debug_limit),
+	CTL_ENTRY(CTL_DEBUG_CRES,	debug_cres),
+	CTL_ENTRY(CTL_DEBUG_DLIM,	debug_dlim),
+	CTL_ENTRY(CTL_DEBUG_QUOTA,	debug_quota),
+	CTL_ENTRY(CTL_DEBUG_CVIRT,	debug_cvirt),
+	CTL_ENTRY(CTL_DEBUG_MISC,	debug_misc),
 	{ .ctl_name = 0 }
 };
 
@@ -203,7 +203,7 @@ static int __init vs_debug_setup(char *s
 			continue;
 
 		token = match_token(p, tokens, args);
-		value = (token>0)?simple_strtoul(args[0].from, NULL, 0):0;
+		value = (token > 0) ? simple_strtoul(args[0].from, NULL, 0) : 0;
 
 		switch (token) {
 		HANDLE_CASE(SWITCH, switch, value);
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/net/ipv4/af_inet.c linux-2.6.20.14-vs2.2.0.0.6/net/ipv4/af_inet.c
--- linux-2.6.20.14-vs2.2.0/net/ipv4/af_inet.c	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/net/ipv4/af_inet.c	2007-06-13 03:44:01 +0200
@@ -424,10 +424,10 @@ int inet_bind(struct socket *sock, struc
 	s_addr2 = 0xffffffffl;
 
 	vxdprintk(VXD_CBIT(net, 3),
-		"inet_bind(%p)* %p,%p;%lx %d.%d.%d.%d",
+		"inet_bind(%p)* %p,%p;%lx " NIPQUAD_FMT,
 		sk, sk->sk_nx_info, sk->sk_socket,
 		(sk->sk_socket?sk->sk_socket->flags:0),
-		VXD_QUAD(s_addr));
+		NIPQUAD(s_addr));
 	if (nxi) {
 		__u32 v4_bcast = nxi->v4_bcast;
 		__u32 ipv4root = nxi->ipv4[0];
@@ -451,8 +451,8 @@ int inet_bind(struct socket *sock, struc
 	chk_addr_ret = inet_addr_type(s_addr);
 
 	vxdprintk(VXD_CBIT(net, 3),
-		"inet_bind(%p) %d.%d.%d.%d, %d.%d.%d.%d, %d.%d.%d.%d",
-		sk, VXD_QUAD(s_addr), VXD_QUAD(s_addr1), VXD_QUAD(s_addr2));
+		"inet_bind(%p) " NIPQUAD_FMT ", " NIPQUAD_FMT ", " NIPQUAD_FMT,
+		sk, NIPQUAD(s_addr), NIPQUAD(s_addr1), NIPQUAD(s_addr2));
 
 	/* Not specified by any standard per-se, however it breaks too
 	 * many applications when removed.  It is unfortunate since
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/net/ipv4/inet_diag.c linux-2.6.20.14-vs2.2.0.0.6/net/ipv4/inet_diag.c
--- linux-2.6.20.14-vs2.2.0/net/ipv4/inet_diag.c	2007-02-06 03:05:22 +0100
+++ linux-2.6.20.14-vs2.2.0.0.6/net/ipv4/inet_diag.c	2007-06-13 18:48:54 +0200
@@ -693,7 +693,7 @@ static int inet_diag_dump(struct sk_buff
 			sk_for_each(sk, node, &hashinfo->listening_hash[i]) {
 				struct inet_sock *inet = inet_sk(sk);
 
-				if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
+				if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
 					continue;
 				if (num < s_num) {
 					num++;
@@ -755,7 +755,7 @@ skip_listen_ht:
 		sk_for_each(sk, node, &head->chain) {
 			struct inet_sock *inet = inet_sk(sk);
 
-			if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
+			if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
 				continue;
 			if (num < s_num)
 				goto next_normal;
@@ -781,7 +781,7 @@ next_normal:
 			inet_twsk_for_each(tw, node,
 				    &hashinfo->ehash[i + hashinfo->ehash_size].chain) {
 
-				if (!nx_check(tw->tw_nid, VS_WATCH_P|VS_IDENT))
+				if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))
 					continue;
 				if (num < s_num)
 					goto next_dying;
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/net/ipv4/raw.c linux-2.6.20.14-vs2.2.0.0.6/net/ipv4/raw.c
--- linux-2.6.20.14-vs2.2.0/net/ipv4/raw.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/net/ipv4/raw.c	2007-06-13 18:49:11 +0200
@@ -828,7 +828,7 @@ static struct sock *raw_get_first(struct
 
 		sk_for_each(sk, node, &raw_v4_htable[state->bucket])
 			if (sk->sk_family == PF_INET &&
-				nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
+				nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
 				goto found;
 	}
 	sk = NULL;
@@ -845,7 +845,7 @@ static struct sock *raw_get_next(struct 
 try_again:
 		;
 	} while (sk && (sk->sk_family != PF_INET ||
-		!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT)));
+		!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)));
 
 	if (!sk && ++state->bucket < RAWV4_HTABLE_SIZE) {
 		sk = sk_head(&raw_v4_htable[state->bucket]);
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/net/ipv4/tcp_ipv4.c linux-2.6.20.14-vs2.2.0.0.6/net/ipv4/tcp_ipv4.c
--- linux-2.6.20.14-vs2.2.0/net/ipv4/tcp_ipv4.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/net/ipv4/tcp_ipv4.c	2007-06-13 18:50:24 +0200
@@ -1972,7 +1972,7 @@ static void *listening_get_next(struct s
 					"sk,req: %p [#%d] (from %d)", req->sk,
 					(req->sk)?req->sk->sk_nid:0, nx_current_nid());
 				if (req->sk &&
-					!nx_check(req->sk->sk_nid, VS_WATCH_P|VS_IDENT))
+					!nx_check(req->sk->sk_nid, VS_WATCH_P | VS_IDENT))
 					continue;
 				if (req->rsk_ops->family == st->family) {
 					cur = req;
@@ -2000,7 +2000,7 @@ get_sk:
 	sk_for_each_from(sk, node) {
 		vxdprintk(VXD_CBIT(net, 6), "sk: %p [#%d] (from %d)",
 			sk, sk->sk_nid, nx_current_nid());
-		if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
+		if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
 			continue;
 		if (sk->sk_family == st->family) {
 			cur = sk;
@@ -2056,7 +2056,7 @@ static void *established_get_first(struc
 			vxdprintk(VXD_CBIT(net, 6),
 				"sk,egf: %p [#%d] (from %d)",
 				sk, sk->sk_nid, nx_current_nid());
-			if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
+			if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
 				continue;
 			if (sk->sk_family != st->family)
 				continue;
@@ -2069,7 +2069,7 @@ static void *established_get_first(struc
 			vxdprintk(VXD_CBIT(net, 6),
 				"tw: %p [#%d] (from %d)",
 				tw, tw->tw_nid, nx_current_nid());
-			if (!nx_check(tw->tw_nid, VS_WATCH_P|VS_IDENT))
+			if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))
 				continue;
 			if (tw->tw_family != st->family)
 				continue;
@@ -2097,7 +2097,7 @@ static void *established_get_next(struct
 		tw = tw_next(tw);
 get_tw:
 		while (tw && (tw->tw_family != st->family ||
-			!nx_check(tw->tw_nid, VS_WATCH_P|VS_IDENT))) {
+			!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))) {
 			tw = tw_next(tw);
 		}
 		if (tw) {
@@ -2124,7 +2124,7 @@ get_tw:
 		vxdprintk(VXD_CBIT(net, 6),
 			"sk,egn: %p [#%d] (from %d)",
 			sk, sk->sk_nid, nx_current_nid());
-		if (!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
+		if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
 			continue;
 		if (sk->sk_family == st->family)
 			goto found;
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/net/ipv4/udp.c linux-2.6.20.14-vs2.2.0.0.6/net/ipv4/udp.c
--- linux-2.6.20.14-vs2.2.0/net/ipv4/udp.c	2007-04-01 16:26:13 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/net/ipv4/udp.c	2007-06-13 18:50:38 +0200
@@ -1558,7 +1558,7 @@ static struct sock *udp_get_first(struct
 		struct hlist_node *node;
 		sk_for_each(sk, node, state->hashtable + state->bucket) {
 			if (sk->sk_family == state->family &&
-				nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
+				nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
 				goto found;
 		}
 	}
@@ -1576,7 +1576,7 @@ static struct sock *udp_get_next(struct 
 try_again:
 		;
 	} while (sk && (sk->sk_family != state->family ||
-		!nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT)));
+		!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)));
 
 	if (!sk && ++state->bucket < UDP_HTABLE_SIZE) {
 		sk = sk_head(state->hashtable + state->bucket);
diff -NurpP --minimal linux-2.6.20.14-vs2.2.0/net/unix/af_unix.c linux-2.6.20.14-vs2.2.0.0.6/net/unix/af_unix.c
--- linux-2.6.20.14-vs2.2.0/net/unix/af_unix.c	2007-06-13 01:45:56 +0200
+++ linux-2.6.20.14-vs2.2.0.0.6/net/unix/af_unix.c	2007-06-13 18:50:45 +0200
@@ -255,7 +255,7 @@ static struct sock *__unix_find_socket_b
 	sk_for_each(s, node, &unix_socket_table[hash ^ type]) {
 		struct unix_sock *u = unix_sk(s);
 
-		if (!nx_check(s->sk_nid, VS_WATCH_P|VS_IDENT))
+		if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
 			continue;
 		if (u->addr->len == len &&
 		    !memcmp(u->addr->name, sunname, len))
