crimson/os/seastore: drop unnecessary do_omap_get_values()

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
Signed-off-by: Myoungwon Oh <ohmyoungwon@gmail.com>

diff --git a/src/crimson/os/seastore/seastore.cc b/src/crimson/os/seastore/seastore.cc
index 29fdf0f2ee80b520ff5341f206e1fa4d85007452..1fad68e6d576930ef457abf0fd7aa9642e831338 100644 (file)
--- a/src/crimson/os/seastore/seastore.cc
+++ b/src/crimson/os/seastore/seastore.cc
@@ -1393,23 +1393,6 @@ const omap_root_le_t& SeaStore::Shard::select_log_omap_root(Onode& onode)
   }
 }
 
-SeaStore::base_iertr::future<SeaStore::Shard::omap_values_t>
-SeaStore::Shard::do_omap_get_values(
-  Transaction& t,
-  Onode& onode,
-  const omap_keys_t& keys)
-{
-  LOG_PREFIX(SeaStoreS::do_omap_get_values);
-  DEBUGT("{} keys ...", t, keys.size());
-  laddr_t hint = onode.get_metadata_hint(device->get_block_size());
-  auto r = select_log_omap_root(onode);
-  omap_root_t root = r.get(hint);
-  return _omap_get_values(
-    t,
-    std::move(root),
-    keys);
-}
-
 SeaStore::Shard::read_errorator::future<SeaStore::Shard::omap_values_t>
 SeaStore::Shard::omap_get_values(
   CollectionRef ch,
@@ -1427,8 +1410,11 @@ SeaStore::Shard::omap_get_values(
     "omap_get_values",
     op_type_t::OMAP_GET_VALUES,
     op_flags,
-    [this, keys](auto &t, auto &onode) {
-    return do_omap_get_values(t, onode, keys);
+    [this, keys](auto &t, auto &onode)
+  {
+    auto r = select_log_omap_root(onode);
+    omap_root_t root = r.get(onode.get_metadata_hint(device->get_block_size()));
+    return _omap_get_values(t, std::move(root), keys);
   }).finally([this] {
     assert(shard_stats.pending_read_num);
     --(shard_stats.pending_read_num);

diff --git a/src/crimson/os/seastore/seastore.h b/src/crimson/os/seastore/seastore.h
index 66f49b55d84a47bfafda38bd5a4043e1cec979e2..1f5c964d6a27fd71383011ada0cfdb880b159dc1 100644 (file)
--- a/src/crimson/os/seastore/seastore.h
+++ b/src/crimson/os/seastore/seastore.h
@@ -394,11 +394,6 @@ public:
       Onode& onode,
       const ghobject_t& oid);
 
-    base_iertr::future<omap_values_t> do_omap_get_values(
-      Transaction& t,
-      Onode& onode,
-      const omap_keys_t& keys);
-
     base_iertr::future<omap_values_paged_t> do_omap_get_values(
       Transaction& t,
       Onode& onode,