kv: Mutex::Locker -> std::lock_guard

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

diff --git a/src/kv/LevelDBStore.cc b/src/kv/LevelDBStore.cc
index bdd76e431835307f3cdafc907efa14e2a274afd5..d75b3a6606825f85082a8e0396eb61030e3e573b 100644 (file)
--- a/src/kv/LevelDBStore.cc
+++ b/src/kv/LevelDBStore.cc
@@ -409,7 +409,7 @@ void LevelDBStore::compact_thread_entry()
 
 void LevelDBStore::compact_range_async(const string& start, const string& end)
 {
-  Mutex::Locker l(compact_queue_lock);
+  std::lock_guard l(compact_queue_lock);
 
   // try to merge adjacent ranges.  this is O(n), but the queue should
   // be short.  note that we do not cover all overlap cases and merge

diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc
index f484fb20c5f1f2d4c62c999e7120c06a769784ee..2f47cb5358f80def84e3b5dccc6d7dd82b32df8e 100644 (file)
--- a/src/kv/RocksDBStore.cc
+++ b/src/kv/RocksDBStore.cc
@@ -1213,7 +1213,7 @@ void RocksDBStore::compact_thread_entry()
 
 void RocksDBStore::compact_range_async(const string& start, const string& end)
 {
-  Mutex::Locker l(compact_queue_lock);
+  std::lock_guard l(compact_queue_lock);
 
   // try to merge adjacent ranges.  this is O(n), but the queue should
   // be short.  note that we do not cover all overlap cases and merge