os/bluestore/FreelistManager: switch to std::mutex

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

diff --git a/src/os/bluestore/FreelistManager.cc b/src/os/bluestore/FreelistManager.cc
index eaf011f59117dc3507be6aa8c3200aaf25d6254f..a9385ad8142a9fc935ca799b100a316768ab53a1 100644 (file)
--- a/src/os/bluestore/FreelistManager.cc
+++ b/src/os/bluestore/FreelistManager.cc
@@ -77,7 +77,7 @@ void FreelistManager::shutdown()
 
 void FreelistManager::dump()
 {
-  Mutex::Locker l(lock);
+  std::lock_guard<std::mutex> l(lock);
   _dump();
 }
 
@@ -94,7 +94,6 @@ void FreelistManager::_dump()
 
 void FreelistManager::_audit()
 {
-  assert(lock.is_locked());
   uint64_t sum = 0;
   for (auto& p : kv_free) {
     sum += p.second;
@@ -111,7 +110,7 @@ int FreelistManager::allocate(
   uint64_t offset, uint64_t length,
   KeyValueDB::Transaction txn)
 {
-  Mutex::Locker l(lock);
+  std::lock_guard<std::mutex> l(lock);
   dout(10) << __func__ << " " << offset << "~" << length << dendl;
   total_free -= length;
   auto p = kv_free.lower_bound(offset);
@@ -184,7 +183,7 @@ int FreelistManager::release(
   uint64_t offset, uint64_t length,
   KeyValueDB::Transaction txn)
 {
-  Mutex::Locker l(lock);
+  std::lock_guard<std::mutex> l(lock);
   dout(10) << __func__ << " " << offset << "~" << length << dendl;
   total_free += length;
   auto p = kv_free.lower_bound(offset);

diff --git a/src/os/bluestore/FreelistManager.h b/src/os/bluestore/FreelistManager.h
index a7c1330c32005fa4da205098e13a1a4a2c149a10..b0115e54831e9f667bf0bd2d0759ed96e0ba1ac9 100644 (file)
--- a/src/os/bluestore/FreelistManager.h
+++ b/src/os/bluestore/FreelistManager.h
@@ -6,13 +6,13 @@
 
 #include <string>
 #include <map>
+#include <mutex>
 #include <ostream>
-#include "common/Mutex.h"
 #include "kv/KeyValueDB.h"
 
 class FreelistManager {
   std::string prefix;
-  Mutex lock;
+  std::mutex lock;
   uint64_t total_free;
 
   std::map<uint64_t, uint64_t> kv_free;    ///< mirrors our kv values in the db
@@ -22,7 +22,6 @@ class FreelistManager {
 
 public:
   FreelistManager() :
-    lock("FreelistManager::lock"),
     total_free(0) {
   }
 
@@ -32,7 +31,7 @@ public:
   void dump();
 
   uint64_t get_total_free() {
-    Mutex::Locker l(lock);
+    std::lock_guard<std::mutex> l(lock);
     return total_free;
   }