sched/wait: Change the wait_exclusive control flow

Purely a preparatory patch; it changes the control flow to match what
will soon be generated by generic code so that that patch can be a
unity transform.

Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20131002092528.107994763@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/include/linux/wait.h b/include/linux/wait.h
index b2afd665e4ea288877e2315c8d9e3092ccd878f4..7d7819dafcc566ad4f77e0bf26a700bbf8e9e6d4 100644 (file)
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -428,23 +428,24 @@ do {                                                                      \
 
 #define __wait_event_interruptible_exclusive(wq, condition, ret)       \
 do {                                                                   \
+       __label__ __out;                                                \
        DEFINE_WAIT(__wait);                                            \
                                                                        \
        for (;;) {                                                      \
                prepare_to_wait_exclusive(&wq, &__wait,                 \
                                        TASK_INTERRUPTIBLE);            \
-               if (condition) {                                        \
-                       finish_wait(&wq, &__wait);                      \
+               if (condition)                                          \
                        break;                                          \
-               }                                                       \
                if (signal_pending(current)) {                          \
                        ret = -ERESTARTSYS;                             \
                        abort_exclusive_wait(&wq, &__wait,              \
                                TASK_INTERRUPTIBLE, NULL);              \
-                       break;                                          \
+                       goto __out;                                     \
                }                                                       \
                schedule();                                             \
        }                                                               \
+       finish_wait(&wq, &__wait);                                      \
+__out: ;                                                               \
 } while (0)
 
 #define wait_event_interruptible_exclusive(wq, condition)              \