X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_mutex_lock.c;h=42b5af640c3f7eaf8ff08c85c3700ecaee69f049;hp=56111ec84f8951c09bd06c54731a3a3085c1bf07;hb=b6218764ebca59ff5dae0e87b696188c8de0119e;hpb=b1c43161c2b37e35eae60fa61621a24a5d820d83

diff --git a/src/thread/pthread_mutex_lock.c b/src/thread/pthread_mutex_lock.c
index 56111ec8..42b5af64 100644
--- a/src/thread/pthread_mutex_lock.c
+++ b/src/thread/pthread_mutex_lock.c
@@ -2,13 +2,8 @@
 
 int pthread_mutex_lock(pthread_mutex_t *m)
 {
-	int r;
-	while ((r=pthread_mutex_trylock(m)) == EBUSY) {
-		if (!(r=m->_m_lock)) continue;
-		if (m->_m_type == PTHREAD_MUTEX_ERRORCHECK
-		 && r == pthread_self()->tid)
-			return EDEADLK;
-		__wait(&m->_m_lock, &m->_m_waiters, r, 0);
-	}
-	return r;
+	if (m->_m_type == PTHREAD_MUTEX_NORMAL && !a_cas(&m->_m_lock, 0, EBUSY))
+		return 0;
+
+	return pthread_mutex_timedlock(m, 0);
 }