import 15.2.0 Octopus source

[ceph.git] / ceph / src / librbd / ManagedLock.h

diff --git a/ceph/src/librbd/ManagedLock.h b/ceph/src/librbd/ManagedLock.h
index b27e549dab470db0c7a09230306f7cd5bddd55a2..3e03d00ed2da2c3abf2a63c06f8b2966ff5d35a2 100644 (file)
--- a/ceph/src/librbd/ManagedLock.h
+++ b/ceph/src/librbd/ManagedLock.h
@@ -8,7 +8,6 @@
 #include "include/Context.h"
 #include "include/rados/librados.hpp"
 #include "common/AsyncOpTracker.h"
-#include "common/Mutex.h"
 #include "cls/lock/cls_lock_types.h"
 #include "librbd/watcher/Types.h"
 #include "librbd/managed_lock/Types.h"
@@ -63,67 +62,67 @@ public:
   int assert_header_locked();
 
   bool is_shutdown() const {
-    Mutex::Locker l(m_lock);
+    std::lock_guard l{m_lock};
     return is_state_shutdown();
   }
 
 protected:
-  mutable Mutex m_lock;
+  mutable ceph::mutex m_lock;
 
   inline void set_state_uninitialized() {
-    ceph_assert(m_lock.is_locked());
+    ceph_assert(ceph_mutex_is_locked(m_lock));
     ceph_assert(m_state == STATE_UNLOCKED);
     m_state = STATE_UNINITIALIZED;
   }
   inline void set_state_initializing() {
-    ceph_assert(m_lock.is_locked());
+    ceph_assert(ceph_mutex_is_locked(m_lock));
     ceph_assert(m_state == STATE_UNINITIALIZED);
     m_state = STATE_INITIALIZING;
   }
   inline void set_state_unlocked() {
-    ceph_assert(m_lock.is_locked());
+    ceph_assert(ceph_mutex_is_locked(m_lock));
     ceph_assert(m_state == STATE_INITIALIZING || m_state == STATE_RELEASING);
     m_state = STATE_UNLOCKED;
   }
   inline void set_state_waiting_for_lock() {
-    ceph_assert(m_lock.is_locked());
+    ceph_assert(ceph_mutex_is_locked(m_lock));
     ceph_assert(m_state == STATE_ACQUIRING);
     m_state = STATE_WAITING_FOR_LOCK;
   }
   inline void set_state_post_acquiring() {
-    ceph_assert(m_lock.is_locked());
+    ceph_assert(ceph_mutex_is_locked(m_lock));
     ceph_assert(m_state == STATE_ACQUIRING);
     m_state = STATE_POST_ACQUIRING;
   }
 
   bool is_state_shutdown() const;
   inline bool is_state_acquiring() const {
-    ceph_assert(m_lock.is_locked());
+    ceph_assert(ceph_mutex_is_locked(m_lock));
     return m_state == STATE_ACQUIRING;
   }
   inline bool is_state_post_acquiring() const {
-    ceph_assert(m_lock.is_locked());
+    ceph_assert(ceph_mutex_is_locked(m_lock));
     return m_state == STATE_POST_ACQUIRING;
   }
   inline bool is_state_releasing() const {
-    ceph_assert(m_lock.is_locked());
+    ceph_assert(ceph_mutex_is_locked(m_lock));
     return m_state == STATE_RELEASING;
   }
   inline bool is_state_pre_releasing() const {
-    ceph_assert(m_lock.is_locked());
+    ceph_assert(ceph_mutex_is_locked(m_lock));
     return m_state == STATE_PRE_RELEASING;
   }
   inline bool is_state_locked() const {
-    ceph_assert(m_lock.is_locked());
+    ceph_assert(ceph_mutex_is_locked(m_lock));
     return m_state == STATE_LOCKED;
   }
   inline bool is_state_waiting_for_lock() const {
-    ceph_assert(m_lock.is_locked());
+    ceph_assert(ceph_mutex_is_locked(m_lock));
     return m_state == STATE_WAITING_FOR_LOCK;
   }
 
   inline bool is_action_acquire_lock() const {
-    ceph_assert(m_lock.is_locked());
+    ceph_assert(ceph_mutex_is_locked(m_lock));
     return get_active_action() == ACTION_ACQUIRE_LOCK;
   }
 
@@ -228,7 +227,7 @@ private:
   ActionsContexts m_actions_contexts;
   AsyncOpTracker m_async_op_tracker;
 
-  bool is_lock_owner(Mutex &lock) const;
+  bool is_lock_owner(ceph::mutex &lock) const;
   bool is_transition_state() const;
 
   void append_context(Action action, Context *ctx);