From: Adam Kupczyk <akupczyk@mirantis.com>
Date: Mon, 27 Jun 2016 08:04:39 +0000 (+0200)
Subject: common: When conf "lockdep = true", recursive mutexes always caused check asserts.
X-Git-Tag: v12.0.1~3^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c0aa6d80357a1b61e1d4ae34acc37176bf743f78;p=ceph.git

common: When conf "lockdep = true", recursive mutexes always caused check asserts.

Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>
---

diff --git a/src/common/Mutex.cc b/src/common/Mutex.cc
index ef2a0f6f7f2..c70724d2c27 100644
--- a/src/common/Mutex.cc
+++ b/src/common/Mutex.cc
@@ -92,7 +92,7 @@ Mutex::~Mutex() {
 void Mutex::Lock(bool no_lockdep) {
   int r;
 
-  if (lockdep && g_lockdep && !no_lockdep) _will_lock();
+  if (lockdep && g_lockdep && !no_lockdep && !recursive) _will_lock();
 
   if (logger && cct && cct->_conf->mutex_perf_counter) {
     utime_t start;