The branch, master has been updated
via 04967d6 s3: tdb: On some platforms pthread_mutex_trylock() returns
EBUSY not EDEADLK.
from ed4af82 s4/selftests: test net ads dns register/unregister.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 04967d6e886d42161320d79128f44fdc8dcabda7
Author: Jeremy Allison <j...@samba.org>
Date: Tue Jun 28 12:26:40 2016 -0700
s3: tdb: On some platforms pthread_mutex_trylock() returns EBUSY not
EDEADLK.
Signed-off-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Volker Lendecke <v...@samba.org>
Autobuild-User(master): Volker Lendecke <v...@samba.org>
Autobuild-Date(master): Wed Jun 29 15:14:44 CEST 2016 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
lib/tdb/common/mutex.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb/common/mutex.c b/lib/tdb/common/mutex.c
index c212842..280dec1 100644
--- a/lib/tdb/common/mutex.c
+++ b/lib/tdb/common/mutex.c
@@ -925,7 +925,7 @@ _PUBLIC_ bool tdb_runtime_check_for_robust_mutexes(void)
}
ret = pthread_mutex_trylock(m);
- if (ret != EDEADLK) {
+ if (ret != EDEADLK && ret != EBUSY) {
pthread_mutex_unlock(m);
goto cleanup;
}
--
Samba Shared Repository
