futex: fix restart for early wakeup in futex_wait_requeue_pi()

The futex_wait_requeue_pi op should restart unconditionally like
futex_lock_pi. The user of that function e.g. pthread_cond_wait can
not be interrupted so we do not care about the SA_RESTART flag of the
signal. Clean up the FIXMEs.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 3 insertions, 10 deletions

diff --git a/kernel/futex.c b/kernel/futex.c
index 381125a9f1e0..2aa216e5b594 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2060,7 +2060,7 @@ pi_faulted:
  *
  * Returns
  *  0 - no early wakeup detected
- * <0 - -ETIMEDOUT or -ERESTARTSYS (FIXME: or ERESTARTNOINTR?)
+ * <0 - -ETIMEDOUT or -ERESTARTNOINTR
  */
 static inline
 int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb,
@@ -2087,15 +2087,8 @@ int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb,
 
                 if (timeout && !timeout->task)
                         ret = -ETIMEDOUT;
-                else {
-                        /*
-                         * We expect signal_pending(current), but another
-                         * thread may have handled it for us already.
-                         */
-                        /* FIXME: ERESTARTSYS or ERESTARTNOINTR?  Do we care if
-                         * the user specified SA_RESTART or not? */
-                        ret = -ERESTARTSYS;
-                }
+                else
+                        ret = -ERESTARTNOINTR;
         }
         return ret;
 }