]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
{mgr,osd}: Remove pessimizing moves
authorAdam C. Emerson <aemerson@redhat.com>
Tue, 26 Sep 2017 17:04:35 +0000 (13:04 -0400)
committerAdam C. Emerson <aemerson@redhat.com>
Thu, 5 Oct 2017 16:25:13 +0000 (12:25 -0400)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/mgr/PyModules.cc
src/osd/PrimaryLogPG.cc

index 290fa2a41888f9bfd65accbe7bc4149998071a3f..4b3f5cc608b65743b1fbd26b5964201a40bd6b70 100644 (file)
@@ -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
index 0fbdf7da080b37071a8ad7f6443ed4e8bad79dc9..6ae9c7cd8dd7b16ac9851807e2e8ecfce5457754 100644 (file)
@@ -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 ... :(