update ceph source to reef 18.1.2

[ceph.git] / ceph / src / crimson / os / futurized_store.cc

diff --git a/ceph/src/crimson/os/futurized_store.cc b/ceph/src/crimson/os/futurized_store.cc
index e072c0d262bd70154ee5871c943450afef426252..bc47ec78fde74e30b029bba5246114bafe52fd3f 100644 (file)
--- a/ceph/src/crimson/os/futurized_store.cc
+++ b/ceph/src/crimson/os/futurized_store.cc
@@ -10,26 +10,22 @@
 
 namespace crimson::os {
 
-seastar::future<std::unique_ptr<FuturizedStore>>
+std::unique_ptr<FuturizedStore>
 FuturizedStore::create(const std::string& type,
                        const std::string& data,
                        const ConfigValues& values)
 {
   if (type == "cyanstore") {
-    return seastar::make_ready_future<std::unique_ptr<FuturizedStore>>(
-      std::make_unique<crimson::os::CyanStore>(data));
+    using crimson::os::CyanStore;
+    return std::make_unique<CyanStore>(data);
   } else if (type == "seastore") {
     return crimson::os::seastore::make_seastore(
-      data, values
-    ).then([] (auto seastore) {
-      return seastar::make_ready_future<std::unique_ptr<FuturizedStore>>(
-       seastore.release());
-    });
+      data);
   } else {
+    using crimson::os::AlienStore;
 #ifdef WITH_BLUESTORE
     // use AlienStore as a fallback. It adapts e.g. BlueStore.
-    return seastar::make_ready_future<std::unique_ptr<FuturizedStore>>(
-      std::make_unique<crimson::os::AlienStore>(type, data, values));
+    return std::make_unique<AlienStore>(type, data, values);
 #else
     ceph_abort_msgf("unsupported objectstore type: %s", type.c_str());
     return {};