[PATCH] consolidate-checking-for-ignored-legacy-signals-simplify

[Oleg Nesterov]

Every user of send_signal() must check ret twice. Change the meaning of the
returned value, so that ret <= 0 means we can just return, and ret == 1 means
the signal was queued. Saves a couple of if's and imho makes the code more
logical.

Also, remove now unneeded "ret = 0" initializions.

Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Acked-by: Pavel Emelyanov <xemul@xxxxxxxxxx>

--- t/kernel/signal.c	2008-02-12 15:10:07.814848687 +0300
+++ t/kernel/signal.c	2008-02-12 15:09:14.000000000 +0300
@@ -673,7 +673,7 @@ static int send_signal(int sig, struct s
 	 * detailed information about the cause of the signal.
 	 */
 	if (sig_ignored(t, sig) || legacy_queue(signals, sig))
-		return 1;
+		return 0;
 
 	/*
 	 * Deliver the signal to listening signalfds. This must be called
@@ -731,7 +731,7 @@ static int send_signal(int sig, struct s
 
 out_set:
 	sigaddset(&signals->signal, sig);
-	return 0;
+	return 1;
 }
 
 int print_fatal_signals;
@@ -769,16 +769,16 @@ __setup("print-fatal-signals=", setup_pr
 static int
 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
 {
-	int ret = 0;
+	int ret;
 
 	BUG_ON(!irqs_disabled());
 	assert_spin_locked(&t->sighand->siglock);
 
 	ret = send_signal(sig, info, t, &t->pending);
-	if (ret < 0)
+	if (ret <= 0)
 		return ret;
 
-	if (!ret && !sigismember(&t->blocked, sig))
+	if (!sigismember(&t->blocked, sig))
 		signal_wake_up(t, sig == SIGKILL);
 	return 0;
 }
@@ -946,7 +946,7 @@ __group_complete_signal(int sig, struct 
 int
 __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
 {
-	int ret = 0;
+	int ret;
 
 	assert_spin_locked(&p->sighand->siglock);
 	handle_stop_signal(sig, p);
@@ -957,11 +957,10 @@ __group_send_sig_info(int sig, struct si
 	 * to avoid several races.
 	 */
 	ret = send_signal(sig, info, p, &p->signal->shared_pending);
-	if (unlikely(ret < 0))
+	if (ret <= 0)
 		return ret;
 
-	if (!ret)
-		__group_complete_signal(sig, p);
+	__group_complete_signal(sig, p);
 	return 0;
 }
 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/