evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

futex: fix restart for early wakeup in futex_wait_requeue_pi()

Browse source 
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>
This commit is contained in:
Thomas Gleixner 2009-05-20 09:22:40 +02:00
parent c8b15a706d
commit 1c840c1490
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kernel/futex.c
View file

@ -2060,7 +2060,7 @@ pi_faulted:
* *
* Returns * Returns
* 0 - no early wakeup detected * 0 - no early wakeup detected
* <0 - -ETIMEDOUT or -ERESTARTSYS (FIXME: or ERESTARTNOINTR?) * <0 - -ETIMEDOUT or -ERESTARTNOINTR
*/ */
static inline static inline
int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb, 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) if (timeout && !timeout->task)
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
else { else
/* ret = -ERESTARTNOINTR;
* 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;
}
} }
return ret; return ret;
} }