---

yaml --- r: 165677 b: refs/heads/master c: 989264f h: refs/heads/master i: 165675: 6d581f6 v: v3
git-mirror · Sep 24, 2009 · 20434df · 20434df
1 parent 229b160
commit 20434df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c01ba49e6647d86bc7576105f82027200d1f303
+refs/heads/master: 989264f4645c183331a1279d513f4b1ddc06e1f5
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
@@ -1101,17 +1101,15 @@ struct wait_opts {
 	int			notask_error;
 };
 
-static struct pid *task_pid_type(struct task_struct *task, enum pid_type type)
+static inline
+struct pid *task_pid_type(struct task_struct *task, enum pid_type type)
 {
-	struct pid *pid = NULL;
-	if (type == PIDTYPE_PID)
-		pid = task->pids[type].pid;
-	else if (type < PIDTYPE_MAX)
-		pid = task->group_leader->pids[type].pid;
-	return pid;
+	if (type != PIDTYPE_PID)
+		task = task->group_leader;
+	return task->pids[type].pid;
 }
 
-static inline int eligible_pid(struct wait_opts *wo, struct task_struct *p)
+static int eligible_pid(struct wait_opts *wo, struct task_struct *p)
 {
 	return	wo->wo_type == PIDTYPE_MAX ||
 		task_pid_type(p, wo->wo_type) == wo->wo_pid;