Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5df763b authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Linus Torvalds
Browse files

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: default avatarOleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 56496c1d

kernel/signal.c

+15 −11
Original line number Diff line number Diff line
@@ -1134,14 +1134,22 @@ EXPORT_SYMBOL_GPL(kill_pid_info_as_uid); 
static int kill_something_info(int sig, struct siginfo *info, int pid)

{

	int ret;



	if (pid > 0) {

		rcu_read_lock();

	if (!pid) {

		ret = kill_pgrp_info(sig, info, task_pgrp(current));

	} else if (pid == -1) {

		ret = kill_pid_info(sig, info, find_vpid(pid));

		rcu_read_unlock();

		return ret;

	}



	read_lock(&tasklist_lock);

	if (pid != -1) {

		ret = __kill_pgrp_info(sig, info,

				pid ? find_vpid(-pid) : task_pgrp(current));

	} else {

		int retval = 0, count = 0;

		struct task_struct * p;



		read_lock(&tasklist_lock);

		for_each_process(p) {

			if (p->pid > 1 && !same_thread_group(p, current)) {

				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) 
					retval = err;

			}

		}

		read_unlock(&tasklist_lock);

		ret = count ? retval : -ESRCH;

	} else if (pid < 0) {

		ret = kill_pgrp_info(sig, info, find_vpid(-pid));

	} else {

		ret = kill_pid_info(sig, info, find_vpid(pid));

	}

	rcu_read_unlock();

	read_unlock(&tasklist_lock);



	return ret;

}