From 4edfc1e3bfbe5d57f5f1758d51c6b6117bb46cc8 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Sat, 25 Jun 2016 20:20:24 +0000 Subject: [PATCH] Revert r302194, there are issues with some applications after changing the return value, in particular console-kit-daemon. Reported by: Ivan Klymenko Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Approved by: re (gjb) --- lib/libthr/thread/thr_mutex.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c index 2ad05ca89a4c..da53c851e511 100644 --- a/lib/libthr/thread/thr_mutex.c +++ b/lib/libthr/thread/thr_mutex.c @@ -850,11 +850,8 @@ mutex_self_trylock(struct pthread_mutex *m) switch (PMUTEX_TYPE(m->m_flags)) { case PTHREAD_MUTEX_ERRORCHECK: - case PTHREAD_MUTEX_ADAPTIVE_NP: - ret = EDEADLK; - break; - case PTHREAD_MUTEX_NORMAL: + case PTHREAD_MUTEX_ADAPTIVE_NP: ret = EBUSY; break;