From 03af6bc5d764eaa5867a3180bd27a4a7ca49fd34 Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <campbell@mumble.net>
Date: Tue, 9 Jun 2015 04:21:50 +0000
Subject: [PATCH] No recursion needed: use WITH-THREAD-MUTEX-LOCK.

---
 src/mhash/mhash.scm | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/mhash/mhash.scm b/src/mhash/mhash.scm
index cc9eadd9c..fc0da45a4 100644
--- a/src/mhash/mhash.scm
+++ b/src/mhash/mhash.scm
@@ -37,29 +37,34 @@ USA.
 (define mhash-hmac-contexts '())
 (define mhash-contexts-mutex)
 
+;;; Lock order:
+;;;
+;;;     {mhash-context-mutex, mhash-hmac-context-mutex}
+;;;     -> mhash-contexts-mutex
+
 (define (add-context-cleanup context)
-  (with-thread-mutex-locked mhash-contexts-mutex
+  (with-thread-mutex-lock mhash-contexts-mutex
     (lambda ()
       (set! mhash-contexts
 	    (cons (weak-cons context (mhash-context-alien context))
 		  mhash-contexts)))))
 
 (define (add-hmac-context-cleanup context)
-  (with-thread-mutex-locked mhash-contexts-mutex
+  (with-thread-mutex-lock mhash-contexts-mutex
     (lambda ()
       (set! mhash-hmac-contexts
 	    (cons (weak-cons context (mhash-hmac-context-alien context))
 		  mhash-contexts)))))
 
 (define (remove-context-cleanup context)
-  (with-thread-mutex-locked mhash-contexts-mutex
+  (with-thread-mutex-lock mhash-contexts-mutex
     (lambda ()
       (let ((entry (weak-assq context mhash-contexts)))
 	(if entry
 	    (set! mhash-contexts (delq! context mhash-contexts)))))))
 
 (define (remove-hmac-context-cleanup context)
-  (with-thread-mutex-locked mhash-contexts-mutex
+  (with-thread-mutex-lock mhash-contexts-mutex
     (lambda ()
       (let ((entry (weak-assq context mhash-hmac-contexts)))
 	(if entry
@@ -138,13 +143,13 @@ USA.
       (error:bad-range-argument object procedure)))
 
 (define (with-context-locked context thunk)
-  (with-thread-mutex-locked (mhash-context-mutex context) thunk))
+  (with-thread-mutex-lock (mhash-context-mutex context) thunk))
 
 (define (with-hmac-context-locked context thunk)
-  (with-thread-mutex-locked (mhash-hmac-context-mutex context) thunk))
+  (with-thread-mutex-lock (mhash-hmac-context-mutex context) thunk))
 
 (define (with-context-locked-open context operator receiver)
-  (with-thread-mutex-locked (mhash-context-mutex context)
+  (with-thread-mutex-lock (mhash-context-mutex context)
     (lambda ()
       (let ((alien (mhash-context-alien context)))
 	(if (alien-null? alien)
@@ -152,7 +157,7 @@ USA.
 	(receiver alien)))))
 
 (define (with-hmac-context-locked-open context operator receiver)
-  (with-thread-mutex-locked (mhash-hmac-context-mutex context)
+  (with-thread-mutex-lock (mhash-hmac-context-mutex context)
     (lambda ()
       (let ((alien (mhash-hmac-context-alien context)))
 	(if (alien-null? alien)
-- 
2.25.1