--- linux-2.6.8.1-vs1.9.2/fs/proc/array.c	2004-08-25 18:49:35.000000000 +0200
+++ linux-2.6.8.1-vs1.9.2.21/fs/proc/array.c	2004-09-02 20:06:38.000000000 +0200
@@ -158,12 +158,13 @@ static inline char * task_state(struct t
 {
 	struct group_info *group_info;
 	int g;
-	pid_t pid, ppid, tgid;
+	pid_t pid, ppid, tppid, tgid;
 
 	read_lock(&tasklist_lock);
 	tgid = vx_map_tgid(current->vx_info, p->tgid);
 	pid = vx_map_tgid(current->vx_info, p->pid);
 	ppid = vx_map_tgid(current->vx_info, p->real_parent->pid);
+	tppid = vx_map_tgid(current->vx_info, p->parent->pid);
 	buffer += sprintf(buffer,
 		"State:\t%s\n"
 		"SleepAVG:\t%lu%%\n"
@@ -176,7 +177,7 @@ static inline char * task_state(struct t
 		get_task_state(p),
 		(p->sleep_avg/1024)*100/(1020000000/1024),
 		tgid, pid, p->pid ? ppid : 0,
-		p->pid && p->ptrace ? p->parent->pid : 0,
+		p->pid && p->ptrace ? tppid : 0,
 		p->uid, p->euid, p->suid, p->fsuid,
 		p->gid, p->egid, p->sgid, p->fsgid);
 	read_unlock(&tasklist_lock);
@@ -409,7 +410,9 @@ int proc_pid_stat(struct task_struct *ta
 	nice = task_nice(task);
 
 	read_lock(&tasklist_lock);
-	ppid = task->pid ? task->real_parent->pid : 0;
+
+	ppid = (!task->pid) ? 0 :
+		vx_map_tgid(current->vx_info, task->real_parent->pid);
 	read_unlock(&tasklist_lock);
 
 	/* Temporary variable needed for gcc-2.96 */
--- linux-2.6.8.1-vs1.9.2/fs/proc/base.c	2004-08-25 18:49:35.000000000 +0200
+++ linux-2.6.8.1-vs1.9.2.21/fs/proc/base.c	2004-09-01 00:48:13.000000000 +0200
@@ -1583,9 +1583,11 @@ struct dentry *proc_pid_lookup(struct in
 		d_add(dentry, inode);
 		return NULL;
 	}
-	tgid = vx_rmap_tgid(current->vx_info, name_to_int(dentry));
+	tgid = name_to_int(dentry);
 	if (tgid == ~0U)
 		goto out;
+	if (vx_current_initpid(tgid))
+		goto out;
 
 	read_lock(&tasklist_lock);
 	task = find_task_by_pid(tgid);
@@ -1595,14 +1597,13 @@ struct dentry *proc_pid_lookup(struct in
 	if (!task)
 		goto out;
 
-	inode = NULL;
-	if (vx_check(vx_task_xid(task), VX_WATCH|VX_IDENT))
-		inode = proc_pid_make_inode(dir->i_sb, task, PROC_TGID_INO);
+	if (!vx_check(vx_task_xid(task), VX_WATCH|VX_IDENT))
+		goto out_drop_task;
+	
+	inode = proc_pid_make_inode(dir->i_sb, task, PROC_TGID_INO);
+	if (!inode)
+		goto out_drop_task;
 
-	if (!inode) {
-		put_task_struct(task);
-		goto out;
-	}
 	inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
 	inode->i_op = &proc_tgid_base_inode_operations;
 	inode->i_fop = &proc_tgid_base_operations;
@@ -1627,6 +1628,8 @@ struct dentry *proc_pid_lookup(struct in
 		goto out;
 	}
 	return NULL;
+out_drop_task:
+	put_task_struct(task);
 out:
 	return ERR_PTR(-ENOENT);
 }
@@ -1639,11 +1642,11 @@ static struct dentry *proc_task_lookup(s
 	struct inode *inode;
 	unsigned tid;
 
-	tid = vx_rmap_tgid(current->vx_info, name_to_int(dentry));
+	tid = name_to_int(dentry);
 	if (tid == ~0U)
 		goto out;
-
-/*	handle fakeinit */
+	if (vx_current_initpid(tid))
+		goto out;
 
 	read_lock(&tasklist_lock);
 	task = find_task_by_pid(tid);
@@ -1655,12 +1658,13 @@ static struct dentry *proc_task_lookup(s
 	if (leader->tgid != task->tgid)
 		goto out_drop_task;
 
-	inode = NULL;
-	if (vx_check(vx_task_xid(task), VX_WATCH|VX_IDENT))
-		inode = proc_pid_make_inode(dir->i_sb, task, PROC_TID_INO);
+	if (!vx_check(vx_task_xid(task), VX_WATCH|VX_IDENT))
+		goto out_drop_task;
 
+	inode = proc_pid_make_inode(dir->i_sb, task, PROC_TID_INO);
 	if (!inode)
 		goto out_drop_task;
+
 	inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
 	inode->i_op = &proc_tid_base_inode_operations;
 	inode->i_fop = &proc_tid_base_operations;