From: Sage Weil Date: Tue, 16 Oct 2018 19:11:21 +0000 (-0500) Subject: kv: Mutex::Locker -> std::lock_guard X-Git-Tag: v14.1.0~1146^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=209ec5d4ec9d22cd3a518cb1c8a458f61ef861b6;p=ceph.git kv: Mutex::Locker -> std::lock_guard Signed-off-by: Sage Weil --- diff --git a/src/kv/LevelDBStore.cc b/src/kv/LevelDBStore.cc index bdd76e431835..d75b3a660682 100644 --- 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 f484fb20c5f1..2f47cb5358f8 100644 --- 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