shift security_task_wait() from eligible_child() to wait_consider_task()
PATCH 1/3 shift security_task_wait() from eligible_child() to wait_consider_task()
Preparation, no functional changes.
eligible_child() has a single caller, wait_consider_task(). We can move security_task_wait() out from eligible_child(), this allows us to use it for filtered wake_up().
Signed-off-by Oleg Nesterov <[email protected]>
---
kernel/exit.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
kernel/exit.c renamed from kernel/exit.c~1_SPLIT_ELIGIBLE +1 -6
@@ -1104,8 +1104,6 @@ static struct pid *task_pid_type(structstatic int eligible_child (struct wait_opts *wo,struct task_struct *p) { -int err; -if (wo->wo_type <PIDTYPE_MAX ) {if (task_pid_type (p, wo->wo_type) != wo->wo_pid)return 0 ;
@@ -1120,10 +1118,6 @@ static int eligible_child(struct wait_op && !(wo->wo_flags & __WALL))return 0 ; - err =security_task_wait (p); -if (err) -return err; -return 1 ; }
@@ -1480,6 +1474,7 @@ static int wait_consider_task(struct waiif (!ret)return ret; + ret =security_task_wait (p);if (unlikely (ret <0 )) {/* * If we have not yet seen any eligible child,