From: Sage Weil <sage@redhat.com>
Date: Wed, 9 Mar 2016 22:08:11 +0000 (-0500)
Subject: osd: drop unused from arg from handle_pg_peering_evt
X-Git-Tag: v10.1.0~96^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce33a41c2da17c28736c625aeca637dad3e88ad3;p=ceph.git

osd: drop unused from arg from handle_pg_peering_evt

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 6ec0e7b65e5a..48c9decdd7e4 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3329,7 +3329,6 @@ void OSD::handle_pg_peering_evt(
   const pg_history_t& orig_history,
   pg_interval_map_t& pi,
   epoch_t epoch,
-  pg_shard_t from,
   bool primary,
   PG::CephPeeringEvtRef evt)
 {
@@ -7594,7 +7593,8 @@ void OSD::handle_pg_notify(OpRequestRef op)
     handle_pg_peering_evt(
       spg_t(it->first.info.pgid.pgid, it->first.to),
       it->first.info.history, it->second,
-      it->first.query_epoch, pg_shard_t(from, it->first.from), true,
+      it->first.query_epoch,
+      true,
       PG::CephPeeringEvtRef(
 	new PG::CephPeeringEvt(
 	  it->first.epoch_sent, it->first.query_epoch,
@@ -7626,7 +7626,7 @@ void OSD::handle_pg_log(OpRequestRef op)
   handle_pg_peering_evt(
     spg_t(m->info.pgid.pgid, m->to),
     m->info.history, m->past_intervals, m->get_epoch(),
-    pg_shard_t(from, m->from), false,
+    false,
     PG::CephPeeringEvtRef(
       new PG::CephPeeringEvt(
 	m->get_epoch(), m->get_query_epoch(),
@@ -7660,7 +7660,7 @@ void OSD::handle_pg_info(OpRequestRef op)
     handle_pg_peering_evt(
       spg_t(p->first.info.pgid.pgid, p->first.to),
       p->first.info.history, p->second, p->first.epoch_sent,
-      pg_shard_t(from, p->first.from), false,
+      false,
       PG::CephPeeringEvtRef(
 	new PG::CephPeeringEvt(
 	  p->first.epoch_sent, p->first.query_epoch,
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 4ba54f491de4..58330d74aa6f 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1942,7 +1942,6 @@ protected:
     const pg_history_t& orig_history,
     pg_interval_map_t& pi,
     epoch_t epoch,
-    pg_shard_t from,
     bool primary,
     PG::CephPeeringEvtRef evt);