OSD: get_or_create_pg doesn't need an op passed in

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 58894c8609de644c24377f5ee6cfdb9f3e2617bd..d1b8417346e4cb933a5981b04ef8286cbf4757d9 100644 (file)
--- 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 7afa1f9ac21ae32f5677ae8090608e77cb3b67cd..ce38739118066bb21d27886b0714525f29898d49 100644 (file)
--- 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();