Skip to contentSkip to conversation

signals: change collect_signal() to return void

PATCH New Oleg Nesterov 1 participant 1 message May 27, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 signals: change collect_signal() to return void

With the recent changes collect_signal() always returns true. Change it to return void and update the single caller.

kernel/signal.c renamed from kernel/signal.c~4_CS_VOID +2 -4
@@ -338,7 +338,7 @@ unblock_all_signals(void)
 	spin_unlock_irqrestore(&current->sighand->siglock, flags);
 }
 
-static int collect_signal(int sig, struct sigpending *list, siginfo_t *info)
+static void collect_signal(int sig, struct sigpending *list, siginfo_t *info)
 {
 	struct sigqueue *q, *first = NULL;
 
@@ -372,7 +372,6 @@ still_pending:
 		info->si_pid = 0;
 		info->si_uid = 0;
 	}
-	return 1;
 }
 
 static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,
@@ -390,8 +389,7 @@ static int __dequeue_signal(struct sigpe
 			}
 		}
 
-		if (!collect_signal(sig, pending, info))
-			sig = 0;
+		collect_signal(sig, pending, info);
 	}
 
 	return sig;