sched/wait: Fix the signal handling fix
authorPeter Zijlstra <peterz@infradead.org>
Sun, 13 Dec 2015 21:11:16 +0000 (22:11 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Dec 2015 22:30:59 +0000 (14:30 -0800)
commitdfd01f026058a59a513f8a365b439a0681b803af
tree45f12f19bb6f9f3b7632134fbba32f2da584ef1f
parentfc89182834dbe84c7b876d8dbe4b8ee94b6fe22c
sched/wait: Fix the signal handling fix

Jan Stancek reported that I wrecked things for him by fixing things for
Vladimir :/

His report was due to an UNINTERRUPTIBLE wait getting -EINTR, which
should not be possible, however my previous patch made this possible by
unconditionally checking signal_pending().

We cannot use current->state as was done previously, because the
instruction after the store to that variable it can be changed.  We must
instead pass the initial state along and use that.

Fixes: 68985633bccb ("sched/wait: Fix signal handling in bit wait helpers")
Reported-by: Jan Stancek <jstancek@redhat.com>
Reported-by: Chris Mason <clm@fb.com>
Tested-by: Jan Stancek <jstancek@redhat.com>
Tested-by: Vladimir Murzin <vladimir.murzin@arm.com>
Tested-by: Chris Mason <clm@fb.com>
Reviewed-by: Paul Turner <pjt@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: tglx@linutronix.de
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: hpa@zytor.com
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/cifs/inode.c
fs/nfs/inode.c
fs/nfs/internal.h
fs/nfs/pagelist.c
fs/nfs/pnfs.c
include/linux/wait.h
kernel/sched/wait.c
net/sunrpc/sched.c