There's two patterns to check signals in the __wait_event*() macros:
if (!signal_pending(current)) {
schedule();
continue;
}
ret = -ERESTARTSYS;
break;
And the more natural:
if (signal_pending(current)) {
ret = -ERESTARTSYS;
break;
}
schedule();
Change them all into the latter form.
Reviewed-by: Oleg Nesterov <o...@redhat.com>
Signed-off-by: Peter Zijlstra <pet...@infradead.org>
---
include/linux/tty.h | 13 ++++++-------
include/linux/wait.h | 35 ++++++++++++++++-------------------
2 files changed, 22 insertions(+), 26 deletions(-)
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -686,14 +686,13 @@ do {
\
prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE); \
if (condition) \
break; \
- if (!signal_pending(current)) { \
- tty_unlock(tty);
\
- schedule(); \
- tty_lock(tty); \
- continue; \
+ if (signal_pending(current)) { \
+ ret = -ERESTARTSYS; \
+ break; \
} \
- ret = -ERESTARTSYS; \
- break; \
+ tty_unlock(tty); \
+ schedule(); \
+ tty_lock(tty); \
} \
finish_wait(&wq, &__wait); \
} while (0)
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -261,12 +261,11 @@ do {
\
prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE); \
if (condition) \
break; \
- if (!signal_pending(current)) { \
- schedule(); \
- continue; \
+ if (signal_pending(current)) { \
+ ret = -ERESTARTSYS; \
+ break; \
} \
- ret = -ERESTARTSYS; \
- break; \
+ schedule(); \
} \
finish_wait(&wq, &__wait); \
} while (0)
@@ -302,14 +301,13 @@ do {
\
prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE); \
if (condition) \
break; \
- if (!signal_pending(current)) { \
- ret = schedule_timeout(ret); \
- if (!ret) \
- break; \
- continue; \
+ if (signal_pending(current)) { \
+ ret = -ERESTARTSYS; \
+ break; \
} \
- ret = -ERESTARTSYS; \
- break; \
+ ret = schedule_timeout(ret); \
+ if (!ret) \
+ break; \
} \
if (!ret && (condition)) \
ret = 1; \
@@ -439,14 +437,13 @@ do {
\
finish_wait(&wq, &__wait); \
break; \
} \
- if (!signal_pending(current)) { \
- schedule(); \
- continue; \
- } \
- ret = -ERESTARTSYS; \
- abort_exclusive_wait(&wq, &__wait, \
+ if (signal_pending(current)) { \
+ ret = -ERESTARTSYS; \
+ abort_exclusive_wait(&wq, &__wait, \
TASK_INTERRUPTIBLE, NULL); \
- break; \
+ break; \
+ } \
+ schedule(); \
} \
} while (0)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
