aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-02-08 07:19:22 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 12:22:29 -0500
commitd5df763b81946a405837b80874516dfc2a8f7ebf (patch)
tree6fdf06b2cda81d91e8aef03af4d880fc4a6cad72 /kernel
parent56496c1d83dfae0c74e2f43adb45d2d95e16c0d5 (diff)
Clean up the kill_something_info
This is the first step (of two) in removing the kill_pgrp_info. All the users of this function are in kernel/signal.c, but all they need is to call __kill_pgrp_info() with the tasklist_lock read-locked. Fortunately, one of its users is the kill_something_info(), which already needs this lock in one of its branches, so clean these branches up and call the __kill_pgrp_info() directly. Based on Oleg's view of how this function should look. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/signal.c26
1 files changed, 15 insertions, 11 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index cc45a6b69134..a805c7417cd0 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1134,14 +1134,22 @@ EXPORT_SYMBOL_GPL(kill_pid_info_as_uid);
1134static int kill_something_info(int sig, struct siginfo *info, int pid) 1134static int kill_something_info(int sig, struct siginfo *info, int pid)
1135{ 1135{
1136 int ret; 1136 int ret;
1137 rcu_read_lock(); 1137
1138 if (!pid) { 1138 if (pid > 0) {
1139 ret = kill_pgrp_info(sig, info, task_pgrp(current)); 1139 rcu_read_lock();
1140 } else if (pid == -1) { 1140 ret = kill_pid_info(sig, info, find_vpid(pid));
1141 rcu_read_unlock();
1142 return ret;
1143 }
1144
1145 read_lock(&tasklist_lock);
1146 if (pid != -1) {
1147 ret = __kill_pgrp_info(sig, info,
1148 pid ? find_vpid(-pid) : task_pgrp(current));
1149 } else {
1141 int retval = 0, count = 0; 1150 int retval = 0, count = 0;
1142 struct task_struct * p; 1151 struct task_struct * p;
1143 1152
1144 read_lock(&tasklist_lock);
1145 for_each_process(p) { 1153 for_each_process(p) {
1146 if (p->pid > 1 && !same_thread_group(p, current)) { 1154 if (p->pid > 1 && !same_thread_group(p, current)) {
1147 int err = group_send_sig_info(sig, info, p); 1155 int err = group_send_sig_info(sig, info, p);
@@ -1150,14 +1158,10 @@ static int kill_something_info(int sig, struct siginfo *info, int pid)
1150 retval = err; 1158 retval = err;
1151 } 1159 }
1152 } 1160 }
1153 read_unlock(&tasklist_lock);
1154 ret = count ? retval : -ESRCH; 1161 ret = count ? retval : -ESRCH;
1155 } else if (pid < 0) {
1156 ret = kill_pgrp_info(sig, info, find_vpid(-pid));
1157 } else {
1158 ret = kill_pid_info(sig, info, find_vpid(pid));
1159 } 1162 }
1160 rcu_read_unlock(); 1163 read_unlock(&tasklist_lock);
1164
1161 return ret; 1165 return ret;
1162} 1166}
1163 1167