From: Josh Durgin <josh.durgin@dreamhost.com>
Date: Wed, 18 May 2011 23:46:25 +0000 (-0700)
Subject: PG: remove unused argument to adjust_need_up_thru
X-Git-Tag: v0.28.1~26^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2a0f0cd1793932ee10ab3be4f5aab878adeb53b0;p=ceph.git

PG: remove unused argument to adjust_need_up_thru

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 07bd8f73d93c4..59410ed5aebbd 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -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();
 }
diff --git a/src/osd/PG.h b/src/osd/PG.h
index ccd79952ceca5..ffa847703ce6e 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -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,