]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
PG: remove unused argument to adjust_need_up_thru
authorJosh Durgin <josh.durgin@dreamhost.com>
Wed, 18 May 2011 23:46:25 +0000 (16:46 -0700)
committerJosh Durgin <josh.durgin@dreamhost.com>
Thu, 19 May 2011 00:04:17 +0000 (17:04 -0700)
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
src/osd/PG.cc
src/osd/PG.h

index 07bd8f73d93c4f4ac62fb659625339dc8cef696a..59410ed5aebbdd14942fba3b2d294e674b5ccdaf 100644 (file)
@@ -1032,7 +1032,7 @@ bool PG::prior_set_affected(PgPriorSet &prior, const OSDMap *osdmap) const
   return false;
 }
 
-bool PG::adjust_need_up_thru(PgPriorSet &prior, const OSDMap *osdmap)
+bool PG::adjust_need_up_thru(const OSDMap *osdmap)
 {
   epoch_t up_thru = osd->osdmap->get_up_thru(osd->whoami);
   if (need_up_thru &&
@@ -3998,7 +3998,7 @@ boost::statechart::result PG::RecoveryState::Peering::react(const AdvMap& advmap
     return transit< Reset >();
   }
   
-  pg->adjust_need_up_thru(*prior_set.get(), &advmap.osdmap);
+  pg->adjust_need_up_thru(&advmap.osdmap);
   
   return forward_event();
 }
index ccd79952ceca5b3d4cecd15cc7899ce26fba9683..ffa847703ce6ef3fbc684ae5a8d64ab76ab86d98 100644 (file)
@@ -1326,7 +1326,7 @@ public:
   void clear_prior();
   bool prior_set_affected(PgPriorSet &prior, const OSDMap *osdmap) const;
 
-  bool adjust_need_up_thru(PgPriorSet &prior, const OSDMap *osdmap);
+  bool adjust_need_up_thru(const OSDMap *osdmap);
 
   bool all_unfound_are_lost(const OSDMap* osdmap) const;
   void mark_obj_as_lost(ObjectStore::Transaction& t,