mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: ebiederm@xmission.com (Eric W. Biederman)
To: <linux-kernel@vger.kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH 3/4] signal: Remove specific_send_sig_info
Date: Sun, 16 Sep 2018 20:06:18 +0200	[thread overview]
Message-ID: <874leppbad.fsf_-_@xmission.com> (raw)
In-Reply-To: <87lg81pbe2.fsf@xmission.com> (Eric W. Biederman's message of "Sun, 16 Sep 2018 20:04:05 +0200")


This function is static and it only has two callers.  As
specific_send_sig_info is only called twice remembering what
specific_send_sig_info does when reading the code is difficutl and it
makes it hard to see which sending sending functions are equivalent to
which others.

So remove specific_send_sig_info to make the code easier to read.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---
 kernel/signal.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/kernel/signal.c b/kernel/signal.c
index ec136fda457a..99e91163c9a3 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1199,12 +1199,6 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
 	return send_signal(sig, info, p, PIDTYPE_TGID);
 }
 
-static int
-specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
-{
-	return send_signal(sig, info, t, PIDTYPE_PID);
-}
-
 int do_send_sig_info(int sig, struct siginfo *info, struct task_struct *p,
 			enum pid_type type)
 {
@@ -1254,7 +1248,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
 	 */
 	if (action->sa.sa_handler == SIG_DFL && !t->ptrace)
 		t->signal->flags &= ~SIGNAL_UNKILLABLE;
-	ret = specific_send_sig_info(sig, info, t);
+	ret = send_signal(sig, info, t, PIDTYPE_PID);
 	spin_unlock_irqrestore(&t->sighand->siglock, flags);
 
 	return ret;
@@ -2330,7 +2324,7 @@ static int ptrace_signal(int signr, siginfo_t *info)
 
 	/* If the (new) signal is now blocked, requeue it.  */
 	if (sigismember(&current->blocked, signr)) {
-		specific_send_sig_info(signr, info, current);
+		send_signal(signr, info, current, PIDTYPE_PID);
 		signr = 0;
 	}
 
-- 
2.17.1


  parent reply	other threads:[~2018-09-16 18:06 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-03 20:41 [PATCH 00/10] Removing SEND_SIG_FORCED Eric W. Biederman
2018-09-03 20:44 ` [PATCH 01/10] signal: Always ignore SIGKILL and SIGSTOP sent to the global init Eric W. Biederman
2018-09-03 20:44 ` [PATCH 02/10] signal: Properly deliver SIGILL from uprobes Eric W. Biederman
2018-09-03 20:44 ` [PATCH 03/10] signal: Properly deliver SIGSEGV from x86 uprobes Eric W. Biederman
2018-09-03 20:44 ` [PATCH 04/10] signal: Always deliver the kernel's SIGKILL and SIGSTOP to a pid namespace init Eric W. Biederman
2018-09-03 20:44 ` [PATCH 05/10] signal: send_sig_all no longer needs SEND_SIG_FORCED Eric W. Biederman
2018-09-03 20:44 ` [PATCH 06/10] signal: Remove the siginfo paramater from kernel_dqueue_signal Eric W. Biederman
2018-09-03 20:44 ` [PATCH 07/10] signal: Don't send siginfo to kthreads Eric W. Biederman
2018-09-03 20:44 ` [PATCH 08/10] signal: Never allocate siginfo for SIGKILL or SIGSTOP Eric W. Biederman
2018-09-03 20:44 ` [PATCH 09/10] signal: Use SEND_SIG_PRIV not SEND_SIG_FORCED with SIGKILL and SIGSTOP Eric W. Biederman
2018-09-03 20:44 ` [PATCH 10/10] signal: Remove SEND_SIG_FORCED Eric W. Biederman
2018-09-08 11:03 ` [PATCH 00/10] Removing SEND_SIG_FORCED Thomas Gleixner
2018-09-16 18:04 ` [PATCH 0/4] signal: Cleanups Eric W. Biederman
2018-09-16 18:04   ` [PATCH 1/4] tty_io: Use group_send_sig_info in __do_SACK to note it is a session being killed Eric W. Biederman
2018-09-16 18:05   ` [PATCH 2/4] signal: Use group_send_sig_info to kill all processes in a pid namespace Eric W. Biederman
2018-09-16 18:06   ` Eric W. Biederman [this message]
2018-09-16 18:06   ` [PATCH 4/4] signal: Pair exports with their functions Eric W. Biederman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=874leppbad.fsf_-_@xmission.com \
    --to=ebiederm@xmission.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=oleg@redhat.com \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome