Commit a507bf7a authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] futex: remove redundant test

From: Jamie Lokier <jamie@shareable.org>

One of the tests in unqueue_me() is redundant.  If we acquire the spinlock,
the futex must be queued.
parent d2ca78bb
......@@ -430,11 +430,10 @@ static int unqueue_me(struct futex_q *q)
spin_unlock(lock_ptr);
goto retry;
}
if (likely(!list_empty(&q->list))) {
list_del(&q->list);
ret = 1;
}
WARN_ON(list_empty(&q->list));
list_del(&q->list);
spin_unlock(lock_ptr);
ret = 1;
}
drop_key_refs(&q->key);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment