update ceph source to reef 18.1.2

[ceph.git] / ceph / src / crimson / osd / pg_interval_interrupt_condition.h

diff --git a/ceph/src/crimson/osd/pg_interval_interrupt_condition.h b/ceph/src/crimson/osd/pg_interval_interrupt_condition.h
index a59e479638ca754dee6b0a8f3980325a53c8501d..a3a0a1edbcf5aa90298199ba9f8461a42c9bcf78 100644 (file)
--- a/ceph/src/crimson/osd/pg_interval_interrupt_condition.h
+++ b/ceph/src/crimson/osd/pg_interval_interrupt_condition.h
@@ -24,16 +24,16 @@ public:
   bool is_primary();
 
   template <typename Fut>
-  std::pair<bool, std::optional<Fut>> may_interrupt() {
+  std::optional<Fut> may_interrupt() {
     if (new_interval_created()) {
-      return {true, seastar::futurize<Fut>::make_exception_future(
-        ::crimson::common::actingset_changed(is_primary()))};
+      return seastar::futurize<Fut>::make_exception_future(
+        ::crimson::common::actingset_changed(is_primary()));
     }
     if (is_stopping()) {
-      return {true, seastar::futurize<Fut>::make_exception_future(
-        ::crimson::common::system_shutdown_exception())};
+      return seastar::futurize<Fut>::make_exception_future(
+        ::crimson::common::system_shutdown_exception());
     }
-    return {false, std::optional<Fut>()};
+    return std::optional<Fut>();
   }
 
   template <typename T>