update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / common / AsyncOpTracker.cc

diff --git a/ceph/src/common/AsyncOpTracker.cc b/ceph/src/common/AsyncOpTracker.cc
index 10a72d2b135bb6472d762348e46f87ce2d271752..fb6439d384cc7e1712f9479b4906290fe70b2245 100644 (file)
--- a/ceph/src/common/AsyncOpTracker.cc
+++ b/ceph/src/common/AsyncOpTracker.cc
@@ -5,24 +5,24 @@
 #include "include/Context.h"
 
 AsyncOpTracker::AsyncOpTracker()
-  : m_lock("AsyncOpTracker::m_lock", false, false) {
+{
 }
 
 AsyncOpTracker::~AsyncOpTracker() {
-  Mutex::Locker locker(m_lock);
-  assert(m_pending_ops == 0);
+  std::lock_guard locker(m_lock);
+  ceph_assert(m_pending_ops == 0);
 }
 
 void AsyncOpTracker::start_op() {
-  Mutex::Locker locker(m_lock);
+  std::lock_guard locker(m_lock);
   ++m_pending_ops;
 }
 
 void AsyncOpTracker::finish_op() {
   Context *on_finish = nullptr;
   {
-    Mutex::Locker locker(m_lock);
-    assert(m_pending_ops > 0);
+    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,8 +35,8 @@ void AsyncOpTracker::finish_op() {
 
 void AsyncOpTracker::wait_for_ops(Context *on_finish) {
   {
-    Mutex::Locker locker(m_lock);
-    assert(m_on_finish == nullptr);
+    std::lock_guard locker(m_lock);
+    ceph_assert(m_on_finish == nullptr);
     if (m_pending_ops > 0) {
       m_on_finish = on_finish;
       return;
@@ -46,7 +46,7 @@ void AsyncOpTracker::wait_for_ops(Context *on_finish) {
 }
 
 bool AsyncOpTracker::empty() {
-  Mutex::Locker locker(m_lock);
+  std::lock_guard locker(m_lock);
   return (m_pending_ops == 0);
 }