summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Just <sam.just@inktank.com>2012-12-10 19:03:55 -0800
committerSamuel Just <sam.just@inktank.com>2012-12-10 19:03:55 -0800
commit1699b7dc5e946fc40101cec5a21dcaed3bb69c7a (patch)
tree696143684d2c333416a6a8a0723b2253b3e8de1b
parent6a4fa89afa6b7cdd45fff8b2e3a9f49a217de184 (diff)
downloadceph-1699b7dc5e946fc40101cec5a21dcaed3bb69c7a.tar.gz
OSD: get_or_create_pg doesn't need an op passed in
Signed-off-by: Samuel Just <sam.just@inktank.com>
-rw-r--r--src/osd/OSD.cc9
-rw-r--r--src/osd/OSD.h3
2 files changed, 5 insertions, 7 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 58894c8609d..d1b8417346e 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1672,8 +1672,7 @@ void OSD::build_past_intervals_parallel()
*/
PG *OSD::get_or_create_pg(
const pg_info_t& info, pg_interval_map_t& pi,
- epoch_t epoch, int from, int& created, bool primary,
- OpRequestRef op)
+ epoch_t epoch, int from, int& created, bool primary)
{
PG *pg;
@@ -5036,7 +5035,7 @@ void OSD::handle_pg_notify(OpRequestRef op)
}
pg = get_or_create_pg(it->first.info, it->second,
- it->first.query_epoch, from, created, true, op);
+ it->first.query_epoch, from, created, true);
if (!pg)
continue;
pg->queue_notify(it->first.epoch_sent, it->first.query_epoch, from, it->first);
@@ -5072,7 +5071,7 @@ void OSD::handle_pg_log(OpRequestRef op)
int created = 0;
PG *pg = get_or_create_pg(m->info, m->past_intervals, m->get_epoch(),
- from, created, false, op);
+ from, created, false);
if (!pg)
return;
op->mark_started();
@@ -5113,7 +5112,7 @@ void OSD::handle_pg_info(OpRequestRef op)
continue;
}
PG *pg = get_or_create_pg(p->first.info, p->second, p->first.epoch_sent,
- from, created, false, op);
+ from, created, false);
if (!pg)
continue;
pg->queue_info(p->first.epoch_sent, p->first.query_epoch, from,
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 7afa1f9ac21..ce387391180 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -847,8 +847,7 @@ protected:
PG *get_or_create_pg(const pg_info_t& info,
pg_interval_map_t& pi,
epoch_t epoch, int from, int& pcreated,
- bool primary,
- OpRequestRef op);
+ bool primary);
void load_pgs();
void build_past_intervals_parallel();