From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 6 Nov 2007 19:16:02 +0000 (+0000)
Subject: Merged revisions 89045 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~975
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c9bc8827bec5c1903ec16d9a019de8a5f6d6f67;p=thirdparty%2Fasterisk.git

Merged revisions 89045 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89045 | tilghman | 2007-11-06 13:09:06 -0600 (Tue, 06 Nov 2007) | 2 lines

We went to the trouble of creating a method of tracking failed trylocks, then never turned it on (oops).

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89049 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index abd91fb307..2a2ec9b174 100644
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -422,7 +422,7 @@ static inline int __ast_pthread_mutex_trylock(const char *filename, int lineno,
 		if (t->track)
 			ast_mark_lock_acquired();
 	} else if (t->track) {
-			ast_remove_lock_info(&t->mutex);
+		ast_mark_lock_failed();
 	}
 
 	return res;