|
@@ -300,6 +300,8 @@ EXPORT_SYMBOL(try_wait_for_completion);
|
|
|
*/
|
|
|
bool completion_done(struct completion *x)
|
|
|
{
|
|
|
+ unsigned long flags;
|
|
|
+
|
|
|
if (!READ_ONCE(x->done))
|
|
|
return false;
|
|
|
|
|
@@ -307,14 +309,9 @@ bool completion_done(struct completion *x)
|
|
|
* If ->done, we need to wait for complete() to release ->wait.lock
|
|
|
* otherwise we can end up freeing the completion before complete()
|
|
|
* is done referencing it.
|
|
|
- *
|
|
|
- * The RMB pairs with complete()'s RELEASE of ->wait.lock and orders
|
|
|
- * the loads of ->done and ->wait.lock such that we cannot observe
|
|
|
- * the lock before complete() acquires it while observing the ->done
|
|
|
- * after it's acquired the lock.
|
|
|
*/
|
|
|
- smp_rmb();
|
|
|
- spin_unlock_wait(&x->wait.lock);
|
|
|
+ spin_lock_irqsave(&x->wait.lock, flags);
|
|
|
+ spin_unlock_irqrestore(&x->wait.lock, flags);
|
|
|
return true;
|
|
|
}
|
|
|
EXPORT_SYMBOL(completion_done);
|