提交 8d42db18 编写于 作者: E Eric W. Biederman 提交者: Linus Torvalds

[PATCH] signal: rewrite kill_something_info so it uses newer helpers

The goal is to remove users of the old signal helper functions so they can be
removed.
Signed-off-by: NEric W. Biederman <ebiederm@xmission.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 0e25338b
...@@ -1191,8 +1191,10 @@ EXPORT_SYMBOL_GPL(kill_pid_info_as_uid); ...@@ -1191,8 +1191,10 @@ EXPORT_SYMBOL_GPL(kill_pid_info_as_uid);
static int kill_something_info(int sig, struct siginfo *info, int pid) static int kill_something_info(int sig, struct siginfo *info, int pid)
{ {
int ret;
rcu_read_lock();
if (!pid) { if (!pid) {
return kill_pg_info(sig, info, process_group(current)); ret = kill_pgrp_info(sig, info, task_pgrp(current));
} else if (pid == -1) { } else if (pid == -1) {
int retval = 0, count = 0; int retval = 0, count = 0;
struct task_struct * p; struct task_struct * p;
...@@ -1207,12 +1209,14 @@ static int kill_something_info(int sig, struct siginfo *info, int pid) ...@@ -1207,12 +1209,14 @@ static int kill_something_info(int sig, struct siginfo *info, int pid)
} }
} }
read_unlock(&tasklist_lock); read_unlock(&tasklist_lock);
return count ? retval : -ESRCH; ret = count ? retval : -ESRCH;
} else if (pid < 0) { } else if (pid < 0) {
return kill_pg_info(sig, info, -pid); ret = kill_pgrp_info(sig, info, find_pid(-pid));
} else { } else {
return kill_proc_info(sig, info, pid); ret = kill_pid_info(sig, info, find_pid(pid));
} }
rcu_read_unlock();
return ret;
} }
/* /*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册