mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
signal: rename signandsets() to sigandnsets()
As Tejun and Linus pointed out, "nand" is the wrong name for "x & ~y", it should be "andn". Rename signandsets() as suggested. Suggested-by: Tejun Heo <tj@kernel.org> Signed-off-by: Oleg Nesterov <oleg@redhat.com> Acked-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
parent
b182801ab3
commit
702a5073fd
@ -123,13 +123,13 @@ _SIG_SET_BINOP(sigorsets, _sig_or)
|
||||
#define _sig_and(x,y) ((x) & (y))
|
||||
_SIG_SET_BINOP(sigandsets, _sig_and)
|
||||
|
||||
#define _sig_nand(x,y) ((x) & ~(y))
|
||||
_SIG_SET_BINOP(signandsets, _sig_nand)
|
||||
#define _sig_andn(x,y) ((x) & ~(y))
|
||||
_SIG_SET_BINOP(sigandnsets, _sig_andn)
|
||||
|
||||
#undef _SIG_SET_BINOP
|
||||
#undef _sig_or
|
||||
#undef _sig_and
|
||||
#undef _sig_nand
|
||||
#undef _sig_andn
|
||||
|
||||
#define _SIG_SET_OP(name, op) \
|
||||
static inline void name(sigset_t *set) \
|
||||
|
@ -669,7 +669,7 @@ static int rm_from_queue_full(sigset_t *mask, struct sigpending *s)
|
||||
if (sigisemptyset(&m))
|
||||
return 0;
|
||||
|
||||
signandsets(&s->signal, &s->signal, mask);
|
||||
sigandnsets(&s->signal, &s->signal, mask);
|
||||
list_for_each_entry_safe(q, n, &s->list, list) {
|
||||
if (sigismember(mask, q->info.si_signo)) {
|
||||
list_del_init(&q->list);
|
||||
@ -2304,7 +2304,7 @@ static void __set_task_blocked(struct task_struct *tsk, const sigset_t *newset)
|
||||
if (signal_pending(tsk) && !thread_group_empty(tsk)) {
|
||||
sigset_t newblocked;
|
||||
/* A set of now blocked but previously unblocked signals. */
|
||||
signandsets(&newblocked, newset, ¤t->blocked);
|
||||
sigandnsets(&newblocked, newset, ¤t->blocked);
|
||||
retarget_shared_pending(tsk, &newblocked);
|
||||
}
|
||||
tsk->blocked = *newset;
|
||||
@ -2349,7 +2349,7 @@ int sigprocmask(int how, sigset_t *set, sigset_t *oldset)
|
||||
sigorsets(&newset, &tsk->blocked, set);
|
||||
break;
|
||||
case SIG_UNBLOCK:
|
||||
signandsets(&newset, &tsk->blocked, set);
|
||||
sigandnsets(&newset, &tsk->blocked, set);
|
||||
break;
|
||||
case SIG_SETMASK:
|
||||
newset = *set;
|
||||
|
Loading…
Reference in New Issue
Block a user