From: Jeremy Allison <jra@samba.org>
Date: Tue, 28 Jun 2016 19:26:40 +0000 (-0700)
Subject: s3: tdb: On some platforms pthread_mutex_trylock() returns EBUSY not EDEADLK.
X-Git-Tag: tdb-1.3.10~646
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04967d6e886d42161320d79128f44fdc8dcabda7;p=thirdparty%2Fsamba.git

s3: tdb: On some platforms pthread_mutex_trylock() returns EBUSY not EDEADLK.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Wed Jun 29 15:14:44 CEST 2016 on sn-devel-144
---

diff --git a/lib/tdb/common/mutex.c b/lib/tdb/common/mutex.c
index c2128427468..280dec1f6b8 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;
 	}