From: Adam C. Emerson <aemerson@redhat.com>
Date: Tue, 26 Sep 2017 17:04:35 +0000 (-0400)
Subject: {mgr,osd}: Remove pessimizing moves
X-Git-Tag: v13.0.1~639^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f7434f99591944658b0b32e02f253bd4db56fe8a;p=ceph.git

{mgr,osd}: Remove pessimizing moves

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/mgr/PyModules.cc b/src/mgr/PyModules.cc
index 290fa2a41888..4b3f5cc608b6 100644
--- a/src/mgr/PyModules.cc
+++ b/src/mgr/PyModules.cc
@@ -746,9 +746,9 @@ PyObject* PyModules::get_perf_schema_python(
   DaemonStateCollection daemons;
 
   if (svc_type == "") {
-    daemons = std::move(daemon_state.get_all());
+    daemons = daemon_state.get_all();
   } else if (svc_id.empty()) {
-    daemons = std::move(daemon_state.get_by_service(svc_type));
+    daemons = daemon_state.get_by_service(svc_type);
   } else {
     auto key = DaemonKey(svc_type, svc_id);
     // so that the below can be a loop in all cases
diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 0fbdf7da080b..6ae9c7cd8dd7 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -3727,7 +3727,7 @@ int PrimaryLogPG::trim_object(
     // save adjusted snaps for this object
     dout(10) << coid << " snaps " << old_snaps << " -> " << new_snaps << dendl;
     snapset.clone_snaps[coid.snap] =
-      std::move(vector<snapid_t>(new_snaps.rbegin(), new_snaps.rend()));
+      vector<snapid_t>(new_snaps.rbegin(), new_snaps.rend());
     // we still do a 'modify' event on this object just to trigger a
     // snapmapper.update ... :(