sched/wait: Make the signal_pending() checks consistent

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 <oleg@redhat.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20131002092527.956416254@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 6 insertions, 7 deletions

diff --git a/include/linux/tty.h b/include/linux/tty.h
index 64f864651d86..050372979076 100644
--- 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)