From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Tue, 3 Nov 2020 02:28:29 +0000 (+0800)
Subject: crimson/onode-staged-tree: use Seastar API v6
X-Git-Tag: v16.1.0~359^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8482b43e17afb66359b6d8446d70cd363dcd1c4c;p=ceph.git

crimson/onode-staged-tree: use Seastar API v6

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

diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node.cc b/src/crimson/os/seastore/onode_manager/staged-fltree/node.cc
index 79e23c6aeb31..e1e73f69dd7a 100644
--- a/src/crimson/os/seastore/onode_manager/staged-fltree/node.cc
+++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node.cc
@@ -22,8 +22,8 @@ namespace {
 namespace crimson::os::seastore::onode {
 
 using node_ertr = Node::node_ertr;
-template <class... ValuesT>
-using node_future = Node::node_future<ValuesT...>;
+template <class ValueT=void>
+using node_future = Node::node_future<ValueT>;
 
 /*
  * tree_cursor_t
diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node.h b/src/crimson/os/seastore/onode_manager/staged-fltree/node.h
index 67f101fa9235..7b7531a3970b 100644
--- a/src/crimson/os/seastore/onode_manager/staged-fltree/node.h
+++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node.h
@@ -89,8 +89,8 @@ class Node
     crimson::ct_error::invarg,
     crimson::ct_error::enoent,
     crimson::ct_error::erange>;
-  template <class... ValuesT>
-  using node_future = node_ertr::future<ValuesT...>;
+  template <class ValueT=void>
+  using node_future = node_ertr::future<ValueT>;
   struct search_result_t {
     bool is_end() const { return p_cursor->is_end(); }
     Ref<tree_cursor_t> p_cursor;
diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager.h b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager.h
index a8c05d15b8af..06da4da10303 100644
--- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager.h
+++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager.h
@@ -59,8 +59,8 @@ class NodeExtentManager {
     crimson::ct_error::invarg,
     crimson::ct_error::enoent,
     crimson::ct_error::erange>;
-  template <class... ValuesT>
-  using tm_future = tm_ertr::future<ValuesT...>;
+  template <class ValueT=void>
+  using tm_future = tm_ertr::future<ValueT>;
 
   virtual bool is_read_isolated() const = 0;
   virtual tm_future<NodeExtentRef> read_extent(
diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/tree.cc b/src/crimson/os/seastore/onode_manager/staged-fltree/tree.cc
index a373cf7b40dd..a4e7ef451f49 100644
--- a/src/crimson/os/seastore/onode_manager/staged-fltree/tree.cc
+++ b/src/crimson/os/seastore/onode_manager/staged-fltree/tree.cc
@@ -11,8 +11,8 @@
 namespace crimson::os::seastore::onode {
 
 using btree_ertr = Btree::btree_ertr;
-template <class... ValuesT>
-using btree_future = Btree::btree_future<ValuesT...>;
+template <class ValueT=void>
+using btree_future = Btree::btree_future<ValueT>;
 using Cursor = Btree::Cursor;
 
 Cursor::Cursor(Btree* p_tree, Ref<tree_cursor_t> _p_cursor)
diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/tree.h b/src/crimson/os/seastore/onode_manager/staged-fltree/tree.h
index 24eae64f8779..a8c43f4fa6c5 100644
--- a/src/crimson/os/seastore/onode_manager/staged-fltree/tree.h
+++ b/src/crimson/os/seastore/onode_manager/staged-fltree/tree.h
@@ -29,8 +29,8 @@ class Btree {
     crimson::ct_error::invarg,
     crimson::ct_error::enoent,
     crimson::ct_error::erange>;
-  template <class... ValuesT>
-  using btree_future = btree_ertr::future<ValuesT...>;
+  template <class ValueT=void>
+  using btree_future = btree_ertr::future<ValueT>;
 
   Btree(NodeExtentManagerURef&& nm);
   Btree(const Btree&) = delete;
diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/tree_utils.h b/src/crimson/os/seastore/onode_manager/staged-fltree/tree_utils.h
index 23c1723589df..cdefd1ae1293 100644
--- a/src/crimson/os/seastore/onode_manager/staged-fltree/tree_utils.h
+++ b/src/crimson/os/seastore/onode_manager/staged-fltree/tree_utils.h
@@ -227,8 +227,8 @@ template <bool TRACK>
 class TreeBuilder {
  public:
   using ertr = Btree::btree_ertr;
-  template <class... ValuesT>
-  using future = ertr::future<ValuesT...>;
+  template <class ValueT=void>
+  using future = ertr::future<ValueT>;
 
   TreeBuilder(KVPool& kvs, NodeExtentManagerURef&& nm)
     : kvs{kvs}, ref_t{make_transaction()}, t{*ref_t}, tree{std::move(nm)} {}
diff --git a/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc b/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc
index 03793adf4f5f..3441a6698de9 100644
--- a/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc
+++ b/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc
@@ -822,8 +822,8 @@ class DummyChildPool {
 
  public:
   using node_ertr = Node::node_ertr;
-  template <class... ValuesT>
-  using node_future = Node::node_future<ValuesT...>;
+  template <class ValueT=void>
+  using node_future = Node::node_future<ValueT>;
 
   DummyChildPool() = default;
   ~DummyChildPool() { reset(); }