commit b7f9a11a6cf1ea9ee6be3eb2b90d91327a09ad14
author Al Viro <viro@zeniv.linux.org.uk> Wed May 02 09:59:21 2012 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Fri Jun 01 12:58:48 2012 -0400
tree 7d5a5f469aea8ac2b3e1ab41e05a6abafcb2b694
parent 51a7b448d4134e3e8eec633435e3e8faee14a828

new helper: sigmask_to_save()

replace boilerplate "should we use ->saved_sigmask or ->blocked?"
with calls of obvious inlined helper...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

include/linux/sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index f1b46b8..ded3fb6 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2213,6 +2213,14 @@
 		set_current_blocked(&current->saved_sigmask);
 }
 
+static inline sigset_t *sigmask_to_save(void)
+{
+	sigset_t *res = &current->blocked;
+	if (unlikely(test_restore_sigmask()))
+		res = &current->saved_sigmask;
+	return res;
+}
+
 static inline int kill_cad_pid(int sig, int priv)
 {
 	return kill_pid(cad_pid, sig, priv);