[PATCH 9/6] signals: fold sig_ignored() into prepare_signal()

[Oleg Nesterov]

(the last one on this)

Now that prepare_signal() returns int it can absorb the sig_ignored() check
to avoid the code duplication.

Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>

--- 25/kernel/signal.c~9_PS_CK_IGNORED	2008-03-09 23:07:26.000000000 +0300
+++ 25/kernel/signal.c	2008-03-10 00:11:50.000000000 +0300
@@ -645,7 +645,7 @@ static int prepare_signal(int sig, struc
 		}
 	}
 
-	return 1;
+	return !sig_ignored(p, sig);
 }
 
 /*
@@ -763,7 +763,7 @@ static int send_signal(int sig, struct s
 	 * exactly one non-rt signal, so that we can get more
 	 * detailed information about the cause of the signal.
 	 */
-	if (sig_ignored(t, sig) || legacy_queue(pending, sig))
+	if (legacy_queue(pending, sig))
 		return 0;
 
 	/*
@@ -1253,9 +1253,6 @@ int send_sigqueue(struct sigqueue *q, st
 	if (!likely(prepare_signal(sig, t)))
 		goto out;
 
-	if (sig_ignored(t, sig))
-		goto out;
-
 	ret = 0;
 	if (unlikely(!list_empty(&q->list))) {
 		/*

--
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/