From 4213b43a41265a498fcdf412345e74e4241c2b56 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Thu, 22 Sep 2016 11:26:48 +0800 Subject: [PATCH] os/bluestore: move lookup() of SharedBlobSet back into .h Because the lookup() method is simple and easy, and requires no dout for debugging. Signed-off-by: xie xingguo --- src/os/bluestore/BlueStore.cc | 18 ------------------ src/os/bluestore/BlueStore.h | 10 +++++++++- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index ee4f3eb55d284..adc6e843d8cf1 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -1208,24 +1208,6 @@ void BlueStore::SharedBlob::put() } } - -// SharedBlobSet - -#undef dout_prefix -#define dout_prefix *_dout << "bluestore.sharedblobset(" << this << ") " - -BlueStore::SharedBlobRef BlueStore::SharedBlobSet::lookup(uint64_t sbid) -{ - std::lock_guard l(lock); - dummy.sbid = sbid; - auto p = uset.find(dummy); - if (p == uset.end()) { - return nullptr; - } - return &*p; -} - - // Blob #undef dout_prefix diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index a734c023d7beb..9222f4699d82b 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -357,7 +357,15 @@ public: assert(n > 0); } - SharedBlobRef lookup(uint64_t sbid); + SharedBlobRef lookup(uint64_t sbid) { + std::lock_guard l(lock); + dummy.sbid = sbid; + auto p = uset.find(dummy); + if (p == uset.end()) { + return nullptr; + } + return &*p; + } void add(SharedBlob *sb) { std::lock_guard l(lock); -- 2.39.5