diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/exit.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 3fb9a77863d..650c1d1a55d 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -1101,17 +1101,15 @@ struct wait_opts { | |||
1101 | int notask_error; | 1101 | int notask_error; |
1102 | }; | 1102 | }; |
1103 | 1103 | ||
1104 | static struct pid *task_pid_type(struct task_struct *task, enum pid_type type) | 1104 | static inline |
1105 | struct pid *task_pid_type(struct task_struct *task, enum pid_type type) | ||
1105 | { | 1106 | { |
1106 | struct pid *pid = NULL; | 1107 | if (type != PIDTYPE_PID) |
1107 | if (type == PIDTYPE_PID) | 1108 | task = task->group_leader; |
1108 | pid = task->pids[type].pid; | 1109 | return task->pids[type].pid; |
1109 | else if (type < PIDTYPE_MAX) | ||
1110 | pid = task->group_leader->pids[type].pid; | ||
1111 | return pid; | ||
1112 | } | 1110 | } |
1113 | 1111 | ||
1114 | static inline int eligible_pid(struct wait_opts *wo, struct task_struct *p) | 1112 | static int eligible_pid(struct wait_opts *wo, struct task_struct *p) |
1115 | { | 1113 | { |
1116 | return wo->wo_type == PIDTYPE_MAX || | 1114 | return wo->wo_type == PIDTYPE_MAX || |
1117 | task_pid_type(p, wo->wo_type) == wo->wo_pid; | 1115 | task_pid_type(p, wo->wo_type) == wo->wo_pid; |