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)
This commit is contained in:
parent
87dd365e3d
commit
4edfc1e3bf
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user