common/mutex_debug: add lockdep support for recursive_mutex_debug

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/mutex_debug.cc b/src/common/mutex_debug.cc
index a7b2bb697a0fd39f8602e3ee8b5b5f38f1a10b74..c9c8a7e6b0c7e4f12799d075829cc770dfe4542a 100644 (file)
--- a/src/common/mutex_debug.cc
+++ b/src/common/mutex_debug.cc
@@ -48,8 +48,8 @@ mutex_debugging_base::~mutex_debugging_base() {
 void mutex_debugging_base::_register() {
   id = lockdep_register(name.c_str());
 }
-void mutex_debugging_base::_will_lock() { // about to lock
-  id = lockdep_will_lock(name.c_str(), id, backtrace);
+void mutex_debugging_base::_will_lock(bool recursive) { // about to lock
+  id = lockdep_will_lock(name.c_str(), id, backtrace, recursive);
 }
 void mutex_debugging_base::_locked() {    // just locked
   id = lockdep_locked(name.c_str(), id, backtrace);

diff --git a/src/common/mutex_debug.h b/src/common/mutex_debug.h
index 4782803827feff74cd4a6b4a36248e18ada4c2a9..4c8d6ff74d55917fd9bf6d62782aea6e6fdc2b20 100644 (file)
--- a/src/common/mutex_debug.h
+++ b/src/common/mutex_debug.h
@@ -44,7 +44,7 @@ protected:
 
 
   void _register();
-  void _will_lock(); // about to lock
+  void _will_lock(bool recursive=false); // about to lock
   void _locked(); // just locked
   void _will_unlock(); // about to unlock
 
@@ -165,7 +165,7 @@ public:
 
   void lock(bool no_lockdep = false) {
     if (g_lockdep && !no_lockdep)
-      _will_lock();
+      _will_lock(recursive);
 
     if (try_lock())
       return;