diff options
| author | kib <kib@FreeBSD.org> | 2016-06-25 20:20:24 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-06-25 20:20:24 +0000 |
| commit | 89e7e127596d1f7ed274816d890a0409f55bd788 (patch) | |
| tree | 85ffa3f8af536597a5b094397d78dd405815e9a8 /lib/libthr | |
| parent | 67b405af433a425dfcb0bbc9b934cf76a8e16a99 (diff) | |
| download | FreeBSD-src-89e7e127596d1f7ed274816d890a0409f55bd788.zip FreeBSD-src-89e7e127596d1f7ed274816d890a0409f55bd788.tar.gz | |
Revert r302194, there are issues with some applications after changing
the return value, in particular console-kit-daemon.
Reported by: Ivan Klymenko <fidaj@ukr.net>
Sponsored by: The FreeBSD Foundation
MFC after: 2 weeks
Approved by: re (gjb)
Diffstat (limited to 'lib/libthr')
| -rw-r--r-- | lib/libthr/thread/thr_mutex.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c index 2ad05ca..da53c85 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; |
