From: Sage Weil <sage@redhat.com>
Date: Tue, 16 Oct 2018 14:12:34 +0000 (-0500)
Subject: common/AsyncOpTracker: Mutex -> ceph::mutex
X-Git-Tag: v14.1.0~820^2~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=98ccadfc412683e22f0ae46db03fdad78953ed23;p=ceph.git

common/AsyncOpTracker: Mutex -> ceph::mutex

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

diff --git a/src/common/AsyncOpTracker.cc b/src/common/AsyncOpTracker.cc
index 6d78368f8e72..fb6439d384cc 100644
--- a/src/common/AsyncOpTracker.cc
+++ b/src/common/AsyncOpTracker.cc
@@ -5,23 +5,23 @@
 #include "include/Context.h"
 
 AsyncOpTracker::AsyncOpTracker()
-  : m_lock("AsyncOpTracker::m_lock", false, false) {
+{
 }
 
 AsyncOpTracker::~AsyncOpTracker() {
-  std::lock_guard<Mutex> locker(m_lock);
+  std::lock_guard locker(m_lock);
   ceph_assert(m_pending_ops == 0);
 }
 
 void AsyncOpTracker::start_op() {
-  std::lock_guard<Mutex> locker(m_lock);
+  std::lock_guard locker(m_lock);
   ++m_pending_ops;
 }
 
 void AsyncOpTracker::finish_op() {
   Context *on_finish = nullptr;
   {
-    std::lock_guard<Mutex> locker(m_lock);
+    std::lock_guard locker(m_lock);
     ceph_assert(m_pending_ops > 0);
     if (--m_pending_ops == 0) {
       std::swap(on_finish, m_on_finish);
@@ -35,7 +35,7 @@ void AsyncOpTracker::finish_op() {
 
 void AsyncOpTracker::wait_for_ops(Context *on_finish) {
   {
-    std::lock_guard<Mutex> locker(m_lock);
+    std::lock_guard locker(m_lock);
     ceph_assert(m_on_finish == nullptr);
     if (m_pending_ops > 0) {
       m_on_finish = on_finish;
@@ -46,7 +46,7 @@ void AsyncOpTracker::wait_for_ops(Context *on_finish) {
 }
 
 bool AsyncOpTracker::empty() {
-  std::lock_guard<Mutex> locker(m_lock);
+  std::lock_guard locker(m_lock);
   return (m_pending_ops == 0);
 }
 
diff --git a/src/common/AsyncOpTracker.h b/src/common/AsyncOpTracker.h
index f600cbd7f243..d913032aa56a 100644
--- a/src/common/AsyncOpTracker.h
+++ b/src/common/AsyncOpTracker.h
@@ -4,7 +4,7 @@
 #ifndef CEPH_ASYNC_OP_TRACKER_H
 #define CEPH_ASYNC_OP_TRACKER_H
 
-#include "common/Mutex.h"
+#include "common/ceph_mutex.h"
 
 struct Context;
 
@@ -21,7 +21,7 @@ public:
   bool empty();
 
 private:
-  Mutex m_lock;
+  ceph::mutex m_lock = ceph::make_mutex("AsyncOpTracker::m_lock");
   uint32_t m_pending_ops = 0;
   Context *m_on_finish = nullptr;