crimson/os/seastore: drop unnecessary _omap_set_kvs()

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

diff --git a/src/crimson/os/seastore/seastore.cc b/src/crimson/os/seastore/seastore.cc
index 4cbf67513516dc90707905131cb17204adbddafd..0e9137af1326df7ef92b485a961add47913f7aa5 100644 (file)
--- a/src/crimson/os/seastore/seastore.cc
+++ b/src/crimson/os/seastore/seastore.cc
@@ -2271,17 +2271,18 @@ SeaStore::Shard::_zero(
   });
 }
 
-SeaStore::Shard::omap_set_kvs_ret
-SeaStore::Shard::_omap_set_kvs(
-  const OnodeRef &onode,
-  const omap_root_le_t& omap_root,
-  Transaction& t,
-  std::map<std::string, ceph::bufferlist>&& kvs)
+SeaStore::Shard::tm_ret
+SeaStore::Shard::_omap_set_values(
+  internal_context_t &ctx,
+  OnodeRef &onode,
+  std::map<std::string, ceph::bufferlist> &&kvs,
+  const omap_root_le_t &omap_root)
 {
+  Transaction& t = *ctx.transaction;
   return seastar::do_with(
     BtreeOMapManager(*transaction_manager),
     omap_root.get(onode->get_metadata_hint(device->get_block_size())),
-    [&t, &onode, kvs=std::move(kvs)]
+    [this, &t, &onode, kvs=std::move(kvs)]
     (auto &omap_manager, auto &root) mutable
   {
     assert(root.get_type() < omap_type_t::NONE);
@@ -2301,30 +2302,15 @@ SeaStore::Shard::_omap_set_kvs(
     }).si_then([&root] {
       return tm_iertr::make_ready_future<omap_root_t>(std::move(root));
     });
-  });
-}
-
-SeaStore::Shard::tm_ret
-SeaStore::Shard::_omap_set_values(
-  internal_context_t &ctx,
-  OnodeRef &onode,
-  std::map<std::string, ceph::bufferlist> &&aset,
-  const omap_root_le_t &omap_root)
-{
-  return _omap_set_kvs(
-    onode,
-    omap_root,
-    *ctx.transaction,
-    std::move(aset)
-  ).si_then([onode, &ctx](auto root) {
+  }).si_then([&onode, &t](auto root) {
     if (root.must_update()) {
       if (root.get_type() == omap_type_t::OMAP) {
-       onode->update_omap_root(*ctx.transaction, root);
+       onode->update_omap_root(t, root);
       } else if (root.get_type() == omap_type_t::XATTR) {
-       onode->update_xattr_root(*ctx.transaction, root);
+       onode->update_xattr_root(t, root);
       } else {
        ceph_assert(root.get_type() == omap_type_t::LOG);
-       onode->update_log_root(*ctx.transaction, root);
+       onode->update_log_root(t, root);
       }
     }
   });

diff --git a/src/crimson/os/seastore/seastore.h b/src/crimson/os/seastore/seastore.h
index 1f5c964d6a27fd71383011ada0cfdb880b159dc1..dbefc1f53f68d969a88f01875df35617d3e2a460 100644 (file)
--- a/src/crimson/os/seastore/seastore.h
+++ b/src/crimson/os/seastore/seastore.h
@@ -497,12 +497,6 @@ public:
     tm_ret _remove_collection(
       internal_context_t &ctx,
       const coll_t& cid);
-    using omap_set_kvs_ret = tm_iertr::future<omap_root_t>;
-    omap_set_kvs_ret _omap_set_kvs(
-      const OnodeRef &onode,
-      const omap_root_le_t& omap_root,
-      Transaction& t,
-      std::map<std::string, ceph::bufferlist>&& kvs);
 
     boost::intrusive_ptr<SeastoreCollection> _get_collection(const coll_t& cid);