Commit a26fd335 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

[PATCH] sigprocmask: kill unneeded temp var



Cleanup, remove unneeded double copying of current->blocked.
Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 40953ed8
...@@ -2101,10 +2101,11 @@ long do_no_restart_syscall(struct restart_block *param) ...@@ -2101,10 +2101,11 @@ long do_no_restart_syscall(struct restart_block *param)
int sigprocmask(int how, sigset_t *set, sigset_t *oldset) int sigprocmask(int how, sigset_t *set, sigset_t *oldset)
{ {
int error; int error;
sigset_t old_block;
spin_lock_irq(&current->sighand->siglock); spin_lock_irq(&current->sighand->siglock);
old_block = current->blocked; if (oldset)
*oldset = current->blocked;
error = 0; error = 0;
switch (how) { switch (how) {
case SIG_BLOCK: case SIG_BLOCK:
...@@ -2121,8 +2122,7 @@ int sigprocmask(int how, sigset_t *set, sigset_t *oldset) ...@@ -2121,8 +2122,7 @@ int sigprocmask(int how, sigset_t *set, sigset_t *oldset)
} }
recalc_sigpending(); recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock); spin_unlock_irq(&current->sighand->siglock);
if (oldset)
*oldset = old_block;
return error; return error;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment