osd: PG::PriorSet: make debug_pg arg const

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index c4f73c7e1b79b69c1053f39415bad353f754fcc3..3b4b2d18162346069a1928a26418df3da665faf4 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4768,11 +4768,11 @@ void PG::RecoveryState::handle_create(RecoveryCtx *rctx)
 #define dout_prefix (*_dout << (debug_pg ? debug_pg->gen_prefix() : string()) << " PriorSet: ")
 
 PG::PriorSet::PriorSet(const OSDMap &osdmap,
-                          const map<epoch_t, Interval> &past_intervals,
-                          const vector<int> &up,
-                          const vector<int> &acting,
-                          const PG::Info &info,
-                          PG *debug_pg)
+                      const map<epoch_t, Interval> &past_intervals,
+                      const vector<int> &up,
+                      const vector<int> &acting,
+                      const PG::Info &info,
+                      const PG *debug_pg)
   : crashed(false), pg_down(false)
 {
   /*
@@ -4935,7 +4935,7 @@ PG::PriorSet::PriorSet(const OSDMap &osdmap,
 }
 
 // true if the given map affects the prior set
-bool PG::PriorSet::affected_by_map(const OSDMap *osdmap, PG *debug_pg) const
+bool PG::PriorSet::affected_by_map(const OSDMap *osdmap, const PG *debug_pg) const
 {
   for (set<int>::iterator p = probe.begin();
        p != probe.end();

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 75d337b2962ceee4f0e5d2ee2de8058327048872..f2003bbb462b108e6d3ca06832ab8ed6851fd615 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -850,13 +850,13 @@ public:
     bool crashed;   /// true if past osd failures were such that clients may need to replay requests.
     bool pg_down;   /// some down osds are included in @cur; the DOWN pg state bit should be set.
     PriorSet(const OSDMap &osdmap,
-              const map<epoch_t, Interval> &past_intervals,
-              const vector<int> &up,
-              const vector<int> &acting,
-              const Info &info,
-              PG *debug_pg=0);
+            const map<epoch_t, Interval> &past_intervals,
+            const vector<int> &up,
+            const vector<int> &acting,
+            const Info &info,
+            const PG *debug_pg=NULL);
 
-    bool affected_by_map(const OSDMap *osdmap, PG *debug_pg=0) const;
+    bool affected_by_map(const OSDMap *osdmap, const PG *debug_pg=0) const;
   };
 
   friend std::ostream& operator<<(std::ostream& oss,