From: Kefu Chai <kchai@redhat.com>
Date: Sun, 7 Feb 2021 06:46:12 +0000 (+0800)
Subject: crimson/osd: do not move op_params_p in fill_op_params_bump_pg_version()
X-Git-Tag: v17.1.0~3020^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c6dd356e4c2b9f043f753474e9f8562747c12c19;p=ceph.git

crimson/osd: do not move op_params_p in fill_op_params_bump_pg_version()

it's confusing to move the parameter for updating it.

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

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index 874a8b227030..4aeec8dd6ac5 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -620,8 +620,8 @@ seastar::future<> PG::submit_transaction(const OpInfo& op_info,
   });
 }
 
-osd_op_params_t&& PG::fill_op_params_bump_pg_version(
-  osd_op_params_t&& osd_op_p,
+void PG::fill_op_params_bump_pg_version(
+  osd_op_params_t& osd_op_p,
   Ref<MOSDOp> m,
   const bool user_modify)
 {
@@ -633,7 +633,6 @@ osd_op_params_t&& PG::fill_op_params_bump_pg_version(
   if (user_modify) {
     osd_op_p.user_at_version = osd_op_p.at_version.version;
   }
-  return std::move(osd_op_p);
 }
 
 seastar::future<Ref<MOSDOpReply>> PG::handle_failed_op(
@@ -736,16 +735,13 @@ PG::do_osd_ops(
 	  "do_osd_ops: {} - object {} submitting txn",
 	  *m,
 	  obc->obs.oi.soid);
-        auto filled_osd_op_p = fill_op_params_bump_pg_version(
-          std::move(osd_op_p),
-          std::move(m),
-          user_modify);
+        fill_op_params_bump_pg_version(osd_op_p, std::move(m), user_modify);
 	return submit_transaction(
           op_info,
-          filled_osd_op_p.req->ops,
+          osd_op_p.req->ops,
           std::move(obc),
           std::move(txn),
-          std::move(filled_osd_op_p));
+          std::move(osd_op_p));
       });
   }).safe_then([this, m, obc, rvec = op_info.allows_returnvec()] {
     // TODO: should stop at the first op which returns a negative retval,
diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
index 38fb3613aecc..4c9e74d9fcb8 100644
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@ -518,8 +518,8 @@ private:
   void do_peering_event(
     const boost::statechart::event_base &evt,
     PeeringCtx &rctx);
-  osd_op_params_t&& fill_op_params_bump_pg_version(
-    osd_op_params_t&& osd_op_p,
+  void fill_op_params_bump_pg_version(
+    osd_op_params_t& osd_op_p,
     Ref<MOSDOp> m,
     const bool user_modify);
   seastar::future<Ref<MOSDOpReply>> handle_failed_op(