From: Kefu Chai <kchai@redhat.com>
Date: Wed, 9 Sep 2020 03:25:03 +0000 (+0800)
Subject: crimson/os: instantiate future_type<> with future_stored_type
X-Git-Tag: v16.1.0~1157^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ebfed2b1acc9ef5fd9479ebccba30893b65a3254;p=ceph.git

crimson/os: instantiate future_type<> with future_stored_type

to accommodate the change on seastar's side, which started to use
monostate for representing `void` return type, and hide this convention
using future_stored_type_t.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/os/alienstore/thread_pool.h b/src/crimson/os/alienstore/thread_pool.h
index f8d773319c78..27840da18910 100644
--- a/src/crimson/os/alienstore/thread_pool.h
+++ b/src/crimson/os/alienstore/thread_pool.h
@@ -24,9 +24,10 @@ struct WorkItem {
 template<typename Func>
 struct Task final : WorkItem {
   using T = std::invoke_result_t<Func>;
-  using future_state_t = std::conditional_t<std::is_void_v<T>,
-					    seastar::future_state<>,
-					    seastar::future_state<T>>;
+  using future_stored_type_t =
+    std::conditional_t<std::is_void_v<T>,
+		       seastar::internal::future_stored_type_t<>,
+		       seastar::internal::future_stored_type_t<T>>;
   using futurator_t = seastar::futurize<T>;
 public:
   explicit Task(Func&& f)
@@ -56,7 +57,7 @@ public:
   }
 private:
   Func func;
-  future_state_t state;
+  seastar::future_state<future_stored_type_t> state;
   seastar::readable_eventfd on_done;
 };