From: Sage Weil <sage@redhat.com>
Date: Fri, 9 Feb 2018 22:00:10 +0000 (-0600)
Subject: osd/PG: drop unused activate() context list arg
X-Git-Tag: v13.1.0~390^2~63
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=643714ff96cf57024d1254aeb0158335552ccaa3;p=ceph.git

osd/PG: drop unused activate() context list arg

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 9c7abe98921..c9b533cbf24 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1753,7 +1753,6 @@ void PG::build_might_have_unfound()
 
 void PG::activate(ObjectStore::Transaction& t,
 		  epoch_t activation_epoch,
-		  list<Context*>& tfin,
 		  map<int, map<spg_t,pg_query_t> >& query_map,
 		  map<int,
 		      vector<
@@ -7822,7 +7821,6 @@ PG::RecoveryState::Active::Active(my_context ctx)
   pg->start_flush(context< RecoveryMachine >().get_cur_transaction());
   pg->activate(*context< RecoveryMachine >().get_cur_transaction(),
 	       pg->get_osdmap()->get_epoch(),
-	       *context< RecoveryMachine >().get_on_safe_context_list(),
 	       *context< RecoveryMachine >().get_query_map(),
 	       context< RecoveryMachine >().get_info_map(),
 	       context< RecoveryMachine >().get_recovery_ctx());
@@ -8241,7 +8239,6 @@ boost::statechart::result PG::RecoveryState::ReplicaActive::react(
   map<int, map<spg_t, pg_query_t> > query_map;
   pg->activate(*context< RecoveryMachine >().get_cur_transaction(),
 	       actevt.activation_epoch,
-	       *context< RecoveryMachine >().get_on_safe_context_list(),
 	       query_map, NULL, NULL);
   ldout(pg->cct, 10) << "Activate Finished" << dendl;
   return discard_event();
diff --git a/src/osd/PG.h b/src/osd/PG.h
index b269065acaf..de0e8b83289 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1469,7 +1469,6 @@ protected:
   void activate(
     ObjectStore::Transaction& t,
     epoch_t activation_epoch,
-    list<Context*>& tfin,
     map<int, map<spg_t,pg_query_t> >& query_map,
     map<int,
       vector<pair<pg_notify_t, PastIntervals> > > *activator_map,