]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
common: When conf "lockdep = true", recursive mutexes always caused check asserts.
authorAdam Kupczyk <akupczyk@mirantis.com>
Mon, 27 Jun 2016 08:04:39 +0000 (10:04 +0200)
committerAdam Kupczyk <akupczyk@mirantis.com>
Mon, 13 Mar 2017 16:39:29 +0000 (17:39 +0100)
Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>
src/common/Mutex.cc

index ef2a0f6f7f27009aa72c1d2646dc42e7a199d938..c70724d2c278b7b80a77f5e411a0e80fcfe7c569 100644 (file)
@@ -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;