From: Radosław Zarzyński <rzarzyns@redhat.com>
Date: Fri, 18 Mar 2022 13:12:53 +0000 (+0100)
Subject: crimson/common: pass rvalue reference to future::set_callback().
X-Git-Tag: v18.0.0~1233^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=873b5edf40fcd39897925cd52bb8c21df32f88b4;p=ceph.git

crimson/common: pass rvalue reference to future::set_callback().

It's necessary since 710a1bfdc02202fe9e59df8ea31de5b82b893fb4
in Seastar.

This change is a part of ongoing upgrade of Seastar which will
be completed in a follow-up PR, after merging another change
with the Seastar's upstream.

Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
---

diff --git a/src/crimson/common/errorator-loop.h b/src/crimson/common/errorator-loop.h
index b17217276e89..bb3b7fb15c60 100644
--- a/src/crimson/common/errorator-loop.h
+++ b/src/crimson/common/errorator-loop.h
@@ -24,7 +24,8 @@ private:
       _incomplete.pop_back();
     }
     if (!_incomplete.empty()) {
-      seastar::internal::set_callback(_incomplete.back(), static_cast<continuation_base<>*>(this));
+      seastar::internal::set_callback(std::move(_incomplete.back()),
+                                      static_cast<continuation_base<>*>(this));
       _incomplete.pop_back();
       return;
     }
diff --git a/src/crimson/common/interruptible_future.h b/src/crimson/common/interruptible_future.h
index 6818ea9dddc7..5abb652dca01 100644
--- a/src/crimson/common/interruptible_future.h
+++ b/src/crimson/common/interruptible_future.h
@@ -341,7 +341,8 @@ private:
       _incomplete.pop_back();
     }
     if (!_incomplete.empty()) {
-      seastar::internal::set_callback(_incomplete.back(), static_cast<continuation_base<>*>(this));
+      seastar::internal::set_callback(std::move(_incomplete.back()),
+		                      static_cast<continuation_base<>*>(this));
       _incomplete.pop_back();
       return;
     }