From 4ed894da358672b2bb0f5707f1b2b08309a2b0e4 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 10 Mar 2016 11:26:30 -0500 Subject: [PATCH] osd: drop unused primary arg to handle_pg_peering_evt Signed-off-by: Sage Weil --- src/osd/OSD.cc | 5 ----- src/osd/OSD.h | 1 - 2 files changed, 6 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index b013285ac5602..077a3d3461fbb 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, - bool primary, PG::CephPeeringEvtRef evt) { if (service.splitting(pgid)) { @@ -7351,7 +7350,6 @@ void OSD::handle_pg_create(OpRequestRef op) history, pi, m->epoch, - false, PG::CephPeeringEvtRef( new PG::CephPeeringEvt( m->epoch, @@ -7584,7 +7582,6 @@ void OSD::handle_pg_notify(OpRequestRef op) spg_t(it->first.info.pgid.pgid, it->first.to), it->first.info.history, it->second, it->first.query_epoch, - true, PG::CephPeeringEvtRef( new PG::CephPeeringEvt( it->first.epoch_sent, it->first.query_epoch, @@ -7616,7 +7613,6 @@ 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(), - false, PG::CephPeeringEvtRef( new PG::CephPeeringEvt( m->get_epoch(), m->get_query_epoch(), @@ -7650,7 +7646,6 @@ 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, - 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 58330d74aa6f2..57feb8dbd494c 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, - bool primary, PG::CephPeeringEvtRef evt); void load_pgs(); -- 2.39.5