remove will_become_orphaned_pgrp()
will_become_orphaned_pgrp()'s sole use is is_orphaned_pgrp(). Fold its body into is_orphaned_pgrp(), rename __will_become_orphaned_pgrp(), and adjust callers. Code shrinkage plus some relief from underscore-itis.
$ diffstat ~/patches/orphan-2.5.59 exit.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-)
===== kernel/exit.c 1.80 vs edited =====
kernel/exit.c +5 -10
@@ -156,7 +156,7 @@* * "I ask you, have you ever known what it is to be an orphan?" */ -static int __will_become_orphaned_pgrp (int pgrp,task_t *ignored_task) +static int will_become_orphaned_pgrp (int pgrp,task_t *ignored_task) {struct task_struct *p;struct list_head *l;
@@ -177,22 +177,17 @@return ret;/* (sighing) "Often!" */ } -static int will_become_orphaned_pgrp (int pgrp,struct task_struct * ignored_task) +int is_orphaned_pgrp (int pgrp) {int retval;read_lock (&tasklist_lock); - retval =__will_become_orphaned_pgrp (pgrp, ignored_task); + retval =will_become_orphaned_pgrp (pgrp,NULL );read_unlock (&tasklist_lock);return retval; } -int is_orphaned_pgrp (int pgrp) -{ -return will_become_orphaned_pgrp (pgrp,0 ); -} -static inline int has_stopped_jobs (int pgrp) {int retval =0 ;
@@ -495,7 +490,7 @@ (p->session == father->session)) {int pgrp = p->pgrp; -if (__will_become_orphaned_pgrp (pgrp,0 ) &&has_stopped_jobs (pgrp)) { +if (will_become_orphaned_pgrp (pgrp,NULL ) &&has_stopped_jobs (pgrp)) {__kill_pg_info (SIGHUP , (void *)1 , pgrp);__kill_pg_info (SIGCONT , (void *)1 , pgrp); }
@@ -579,7 +574,7 @@if ((t->pgrp != current->pgrp) && (t->session == current->session) && -__will_become_orphaned_pgrp (current->pgrp, current) && +will_become_orphaned_pgrp (current->pgrp, current) &&has_stopped_jobs (current->pgrp)) {__kill_pg_info (SIGHUP , (void *)1 , current->pgrp);__kill_pg_info (SIGCONT , (void *)1 , current->pgrp);