From: Sage Weil <sage@redhat.com>
Date: Thu, 16 Feb 2017 22:56:57 +0000 (-0500)
Subject: osd: constify a bit
X-Git-Tag: v12.0.1~279^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=45426f7fdcc40814148abd2c3ee9a10c8a97d91c;p=ceph.git

osd: constify a bit

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 695386113862..fc7561685677 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3281,7 +3281,7 @@ PG *OSD::_create_lock_pg(
   vector<int>& up, int up_primary,
   vector<int>& acting, int acting_primary,
   pg_history_t history,
-  pg_interval_map_t& pi,
+  const pg_interval_map_t& pi,
   ObjectStore::Transaction& t)
 {
   assert(osd_lock.is_locked());
@@ -3669,7 +3669,7 @@ void OSD::build_past_intervals_parallel()
 void OSD::handle_pg_peering_evt(
   spg_t pgid,
   const pg_history_t& orig_history,
-  pg_interval_map_t& pi,
+  const pg_interval_map_t& pi,
   epoch_t epoch,
   PG::CephPeeringEvtRef evt)
 {
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 4b6755da9560..6d2de7ce6344 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -2063,7 +2063,7 @@ protected:
     vector<int>& up, int up_primary,
     vector<int>& acting, int acting_primary,
     pg_history_t history,
-    pg_interval_map_t& pi,
+    const pg_interval_map_t& pi,
     ObjectStore::Transaction& t);
   PG   *_lookup_qlock_pg(spg_t pgid);
 
@@ -2074,7 +2074,7 @@ protected:
   void handle_pg_peering_evt(
     spg_t pgid,
     const pg_history_t& orig_history,
-    pg_interval_map_t& pi,
+    const pg_interval_map_t& pi,
     epoch_t epoch,
     PG::CephPeeringEvtRef evt);
   
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index c47dac0b6495..c70ad9f5d58c 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2796,7 +2796,7 @@ void PG::init(
   const vector<int>& newup, int new_up_primary,
   const vector<int>& newacting, int new_acting_primary,
   const pg_history_t& history,
-  pg_interval_map_t& pi,
+  const pg_interval_map_t& pi,
   bool backfill,
   ObjectStore::Transaction *t)
 {
@@ -2815,7 +2815,7 @@ void PG::init(
     new_acting_primary);
 
   info.history = history;
-  past_intervals.swap(pi);
+  past_intervals = pi;
 
   info.stats.up = up;
   info.stats.up_primary = new_up_primary;
diff --git a/src/osd/PG.h b/src/osd/PG.h
index 1944bbc1bccc..74aa9631af1e 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -2180,7 +2180,7 @@ public:
     const vector<int>& acting,
     int acting_primary,
     const pg_history_t& history,
-    pg_interval_map_t& pim,
+    const pg_interval_map_t& pim,
     bool backfill,
     ObjectStore::Transaction *t);