From f809a4fbd069dc2986677eabde50b1a253f6695f Mon Sep 17 00:00:00 2001
From: ryancaicse <73822648+ryancaicse@users.noreply.github.com>
Date: Wed, 10 Nov 2021 18:35:17 +0800
Subject: MDEV-26558 Fix a deadlock due to cyclic dependence

Fix a potential deadlock bug between locks ctrl_mutex and entry->mutex
---
 extra/mariabackup/xbstream.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/mariabackup/xbstream.cc b/extra/mariabackup/xbstream.cc
index 5d33f27cbb3..ef5e3bccd9c 100644
--- a/extra/mariabackup/xbstream.cc
+++ b/extra/mariabackup/xbstream.cc
@@ -443,8 +443,8 @@ extract_worker_thread_func(void *arg)
 		}
 
 		if (chunk.type == XB_CHUNK_TYPE_EOF) {
-			pthread_mutex_lock(ctxt->mutex);
 			pthread_mutex_unlock(&entry->mutex);
+			pthread_mutex_lock(ctxt->mutex);
 			my_hash_delete(ctxt->filehash, (uchar *) entry);
 			pthread_mutex_unlock(ctxt->mutex);
 
-- 
cgit v1.2.1