X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fproc%2Farray.c;h=d00c864a1787f6abc2b13b952c10beb497ee3bed;hb=40b5a8819a087d0a4ad418754432e71c49f98ae2;hp=47e254345312513c2b80ebf54b74f77580e68dfd;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 47e254345..d00c864a1 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -142,7 +142,6 @@ static inline const char * get_task_state(struct task_struct *tsk)
 					   TASK_INTERRUPTIBLE |
 					   TASK_UNINTERRUPTIBLE |
 					   TASK_ZOMBIE |
-					   TASK_DEAD |
 					   TASK_STOPPED |
 					   TASK_ONHOLD);
 	const char **p = &task_state_array[0];
@@ -158,11 +157,9 @@ static inline char * task_state(struct task_struct *p, char *buffer)
 {
 	struct group_info *group_info;
 	int g;
-	pid_t pid, ppid, tgid;
+	pid_t ppid;
 
 	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);
 	buffer += sprintf(buffer,
 		"State:\t%s\n"
@@ -175,7 +172,8 @@ static inline char * task_state(struct task_struct *p, char *buffer)
 		"Gid:\t%d\t%d\t%d\t%d\n",
 		get_task_state(p),
 		(p->sleep_avg/1024)*100/(1020000000/1024),
-		tgid, pid, p->pid ? ppid : 0,
+	       	p->tgid,
+		p->pid, p->pid ? ppid : 0,
 		p->pid && p->ptrace ? p->parent->pid : 0,
 		p->uid, p->euid, p->suid, p->fsuid,
 		p->gid, p->egid, p->sgid, p->fsgid);
@@ -352,7 +350,7 @@ int proc_pid_stat(struct task_struct *task, char * buffer)
 	sigset_t sigign, sigcatch;
 	char state;
 	int res;
-	pid_t pid, ppid, pgid = -1, sid = -1;
+ 	pid_t ppid, pgid = -1, sid = -1;
 	int num_threads = 0;
 	struct mm_struct *mm;
 	unsigned long long start_time;
@@ -368,7 +366,6 @@ int proc_pid_stat(struct task_struct *task, char * buffer)
 		if (bias_jiffies > task->start_time)
 			bias_jiffies = task->start_time;
 	}
-	pid = vx_map_tgid(task->vx_info, task->pid);
 
 	mm = task->mm;
 	if(mm)
@@ -421,7 +418,7 @@ int proc_pid_stat(struct task_struct *task, char * buffer)
 	res = sprintf(buffer,"%d (%s) %c %d %d %d %d %d %lu %lu \
 %lu %lu %lu %lu %lu %ld %ld %ld %ld %d %ld %llu %lu %ld %lu %lu %lu %lu %lu \
 %lu %lu %lu %lu %lu %lu %lu %lu %d %d %lu %lu\n",
-		pid,
+		task->pid,
 		task->comm,
 		state,
 		ppid,