Author: kib Date: Sat Jun 25 20:20:24 2016 New Revision: 302201 URL: https://svnweb.freebsd.org/changeset/base/302201
Log: Revert r302194, there are issues with some applications after changing the return value, in particular console-kit-daemon. Reported by: Ivan Klymenko <[email protected]> Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Approved by: re (gjb) Modified: head/lib/libthr/thread/thr_mutex.c Modified: head/lib/libthr/thread/thr_mutex.c ============================================================================== --- head/lib/libthr/thread/thr_mutex.c Sat Jun 25 14:20:34 2016 (r302200) +++ head/lib/libthr/thread/thr_mutex.c Sat Jun 25 20:20:24 2016 (r302201) @@ -850,11 +850,8 @@ mutex_self_trylock(struct pthread_mutex 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; _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "[email protected]"
