crimson/osd: do not pass oop as a const ref

before this change, std::move(oop) will create a copy of oop.
after this change, std::move(oop) actually moves oop.

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

diff --git a/src/crimson/osd/ec_backend.cc b/src/crimson/osd/ec_backend.cc
index c6516d50a8e8fdc60f0d28594c6127114a8cde1e..96309c36622f3cc181a6e1acdce3342f2687d2cb 100644 (file)
--- a/src/crimson/osd/ec_backend.cc
+++ b/src/crimson/osd/ec_backend.cc
@@ -26,7 +26,7 @@ seastar::future<crimson::osd::acked_peers_t>
 ECBackend::_submit_transaction(std::set<pg_shard_t>&& pg_shards,
                                const hobject_t& hoid,
                                ceph::os::Transaction&& txn,
-                               const osd_op_params_t& osd_op_p,
+                               osd_op_params_t&& osd_op_p,
                                epoch_t min_epoch, epoch_t max_epoch,
                               std::vector<pg_log_entry_t>&& log_entries)
 {

diff --git a/src/crimson/osd/ec_backend.h b/src/crimson/osd/ec_backend.h
index e15b19970cd321f0d8624c136c1aac0361b0c8fe..2db1d88063b42c495e22caad207685528d2a2d39 100644 (file)
--- a/src/crimson/osd/ec_backend.h
+++ b/src/crimson/osd/ec_backend.h
@@ -30,7 +30,7 @@ private:
   _submit_transaction(std::set<pg_shard_t>&& pg_shards,
                      const hobject_t& hoid,
                      ceph::os::Transaction&& txn,
-                     const osd_op_params_t& req,
+                     osd_op_params_t&& req,
                      epoch_t min_epoch, epoch_t max_epoch,
                      std::vector<pg_log_entry_t>&& log_entries) final;
   CollectionRef coll;

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index f0e92bf58e58cf22a4e805fca5c94802cccdac48..27d49ef1bc5666b1f1aae000fc52dde826f5410f 100644 (file)
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -569,7 +569,7 @@ seastar::future<> PG::WaitForActiveBlocker::stop()
 seastar::future<> PG::submit_transaction(const OpInfo& op_info,
                                         ObjectContextRef&& obc,
                                         ceph::os::Transaction&& txn,
-                                        const osd_op_params_t& osd_op_p)
+                                        osd_op_params_t&& osd_op_p)
 {
   if (__builtin_expect(stopping, false)) {
     return seastar::make_exception_future<>(

diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
index 15a6dc8bf505c93fc1f49dc99d69c9108d9314c8..ec8d73a9175a1850fa32cfe206373691e06a59a6 100644 (file)
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@ -537,7 +537,7 @@ private:
   seastar::future<> submit_transaction(const OpInfo& op_info,
                                       ObjectContextRef&& obc,
                                       ceph::os::Transaction&& txn,
-                                      const osd_op_params_t& oop);
+                                      osd_op_params_t&& oop);
   seastar::future<> repair_object(Ref<MOSDOp> m,
                const hobject_t& oid,
                eversion_t& v);

diff --git a/src/crimson/osd/pg_backend.cc b/src/crimson/osd/pg_backend.cc
index d43112670cff3fd65e9039b6978d9761658c8378..d7cba8a1bc64ab8a601f99e56ccdaf6e6e5ae4d0 100644 (file)
--- a/src/crimson/osd/pg_backend.cc
+++ b/src/crimson/osd/pg_backend.cc
@@ -125,7 +125,7 @@ PGBackend::mutate_object(
   std::set<pg_shard_t> pg_shards,
   crimson::osd::ObjectContextRef &&obc,
   ceph::os::Transaction&& txn,
-  const osd_op_params_t& osd_op_p,
+  osd_op_params_t&& osd_op_p,
   epoch_t min_epoch,
   epoch_t map_epoch,
   std::vector<pg_log_entry_t>&& log_entries)

diff --git a/src/crimson/osd/pg_backend.h b/src/crimson/osd/pg_backend.h
index d8fa8b2ac836e36172fbb612a579e3f55a4f7238..01604a64410f8a41f27034a4166e991ee676e3aa 100644 (file)
--- a/src/crimson/osd/pg_backend.h
+++ b/src/crimson/osd/pg_backend.h
@@ -123,7 +123,7 @@ public:
     std::set<pg_shard_t> pg_shards,
     crimson::osd::ObjectContextRef &&obc,
     ceph::os::Transaction&& txn,
-    const osd_op_params_t& osd_op_p,
+    osd_op_params_t&& osd_op_p,
     epoch_t min_epoch,
     epoch_t map_epoch,
     std::vector<pg_log_entry_t>&& log_entries);
@@ -228,7 +228,7 @@ private:
   _submit_transaction(std::set<pg_shard_t>&& pg_shards,
                      const hobject_t& hoid,
                      ceph::os::Transaction&& txn,
-                     const osd_op_params_t& osd_op_p,
+                     osd_op_params_t&& osd_op_p,
                      epoch_t min_epoch, epoch_t max_epoch,
                      std::vector<pg_log_entry_t>&& log_entries) = 0;
   friend class ReplicatedRecoveryBackend;

diff --git a/src/crimson/osd/replicated_backend.cc b/src/crimson/osd/replicated_backend.cc
index 3a131278b0c37708f25576fd32ea6a0ee77c3574..91854bcab141da0bb69296a7908969162ca6e9ad 100644 (file)
--- a/src/crimson/osd/replicated_backend.cc
+++ b/src/crimson/osd/replicated_backend.cc
@@ -43,7 +43,7 @@ seastar::future<crimson::osd::acked_peers_t>
 ReplicatedBackend::_submit_transaction(std::set<pg_shard_t>&& pg_shards,
                                        const hobject_t& hoid,
                                        ceph::os::Transaction&& txn,
-                                       const osd_op_params_t& osd_op_p,
+                                       osd_op_params_t&& osd_op_p,
                                        epoch_t min_epoch, epoch_t map_epoch,
                                       std::vector<pg_log_entry_t>&& log_entries)
 {

diff --git a/src/crimson/osd/replicated_backend.h b/src/crimson/osd/replicated_backend.h
index 01c0bba6490ef13ec88f31aa980b26938bd400a4..aa6d0a09191e93c4a8967065257aa7c3915737ec 100644 (file)
--- a/src/crimson/osd/replicated_backend.h
+++ b/src/crimson/osd/replicated_backend.h
@@ -34,7 +34,7 @@ private:
   _submit_transaction(std::set<pg_shard_t>&& pg_shards,
                      const hobject_t& hoid,
                      ceph::os::Transaction&& txn,
-                     const osd_op_params_t& osd_op_p,
+                     osd_op_params_t&& osd_op_p,
                      epoch_t min_epoch, epoch_t max_epoch,
                      std::vector<pg_log_entry_t>&& log_entries) final;
   const pg_t pgid;