Get rid of the kill_pgrp_info() function
PATCH 4/4 Get rid of the kill_pgrp_info() function
There's only one caller left - the kill_pgrp one - so merge these two functions and forget the kill_pgrp_info one.
Signed-off-by Pavel Emelyanov <[email protected]>
Reviewed-by Oleg Nesterov <[email protected]>
--
include/linux/sched.h | 1 - kernel/signal.c | 19 +++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-)
include/linux/sched.h +0 -1
@@ -1680,7 +1680,6 @@ extern int send_sig_info(int, struct siginfo *, struct task_struct *);extern int force_sigsegv (int ,struct task_struct *);extern int force_sig_info (int ,struct siginfo *,struct task_struct *);extern int __kill_pgrp_info (int sig,struct siginfo *info,struct pid *pgrp); -extern int kill_pgrp_info (int sig,struct siginfo *info,struct pid *pgrp);extern int kill_pid_info (int sig,struct siginfo *info,struct pid *pid);extern int kill_pid_info_as_uid (int ,struct siginfo *,struct pid *,uid_t ,uid_t ,u32 );extern int kill_pgrp (struct pid *pid,int sig,int priv);
kernel/signal.c +7 -12
@@ -1036,17 +1036,6 @@ int __kill_pgrp_info(int sig, struct siginfo *info, struct pid *pgrp)return success ?0 : retval; } -int kill_pgrp_info (int sig,struct siginfo *info,struct pid *pgrp) -{ -int retval; - -read_lock (&tasklist_lock); - retval =__kill_pgrp_info (sig, info, pgrp); -read_unlock (&tasklist_lock); - -return retval; -} -int kill_pid_info (int sig,struct siginfo *info,struct pid *pid) {int error = -ESRCH ;
@@ -1235,7 +1224,13 @@ force_sigsegv(int sig, struct task_struct *p)int kill_pgrp (struct pid *pid,int sig,int priv) { -return kill_pgrp_info (sig,__si_special (priv), pid); +int ret; + +read_lock (&tasklist_lock); + ret =__kill_pgrp_info (sig,__si_special (priv), pid); +read_unlock (&tasklist_lock); + +return ret; }EXPORT_SYMBOL (kill_pgrp);
Signature · 1 line
1.5.3.4