diff options
author | Mikulas Patocka <mpatocka@redhat.com> | 2015-02-02 09:39:02 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-02-03 06:14:25 -0500 |
commit | 3e87523897e18a3e17fc8955ed795188be737ff1 (patch) | |
tree | ef9955c7911ca95c7881f8e0371115a6d16fdf0b | |
parent | bb2bc55a694d45cdeda91b6f28ab2adec28125ef (diff) |
sched/wait: Remove might_sleep() from wait_event_cmd()
The patch e22b886a8a43 ("sched/wait: Add might_sleep() checks")
introduced a bug in the raid5 subsystem.
The function raid5_quiesce() (and resize_stripes()) uses the 'cmd'
part to release and acquire a spinlock (so we call the sleep
primitives in atomic context), and therefore we cannot do the
might_sleep() check.
Remove it.
Fixes: e22b886a8a43 ("sched/wait: Add might_sleep() checks")
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/alpine.LRH.2.02.1502020935580.13510@file01.intranet.prod.int.rdu2.redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | include/linux/wait.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h index 2232ed16635a..37423e0e1379 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h | |||
@@ -363,7 +363,6 @@ do { \ | |||
363 | */ | 363 | */ |
364 | #define wait_event_cmd(wq, condition, cmd1, cmd2) \ | 364 | #define wait_event_cmd(wq, condition, cmd1, cmd2) \ |
365 | do { \ | 365 | do { \ |
366 | might_sleep(); \ | ||
367 | if (condition) \ | 366 | if (condition) \ |
368 | break; \ | 367 | break; \ |
369 | __wait_event_cmd(wq, condition, cmd1, cmd2); \ | 368 | __wait_event_cmd(wq, condition, cmd1, cmd2); \ |