From: Kefu Chai <kchai@redhat.com>
Date: Sun, 7 Feb 2021 15:23:33 +0000 (+0800)
Subject: crimson/osd: do not pass oop as a const ref
X-Git-Tag: v17.1.0~3020^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=68af4a9f12e1ffbac30e27f399cb27cf5faddacf;p=ceph.git

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 c6516d50a8e8..96309c36622f 100644
--- 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 e15b19970cd3..2db1d88063b4 100644
--- 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 f0e92bf58e58..27d49ef1bc56 100644
--- 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 15a6dc8bf505..ec8d73a9175a 100644
--- 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 d43112670cff..d7cba8a1bc64 100644
--- 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 d8fa8b2ac836..01604a64410f 100644
--- 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 3a131278b0c3..91854bcab141 100644
--- 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 01c0bba6490e..aa6d0a09191e 100644
--- 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;