Rename PG::peer to PG::do_peer

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index ef5dae6803eb41dac8a2d553e9df554f98adef0b..249aa57197a2a96878729df318b5d9fdd729841e 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3025,7 +3025,7 @@ void OSD::activate_map(ObjectStore::Transaction& t, list<Context*>& tfin)
       // i am (inactive) primary
       if (!pg->is_peering() || 
          (pg->need_up_thru && up_thru >= pg->info.history.same_acting_since))
-       pg->peer(t, tfin, query_map, &info_map);
+       pg->do_peer(t, tfin, query_map, &info_map);
     }
     else if (pg->is_stray() &&
             pg->get_primary() >= 0) {
@@ -3328,7 +3328,7 @@ void OSD::kick_pg_split_queue()
 
       wake_pg_waiters(pg->info.pgid);
 
-      pg->peer(*t, fin->contexts, query_map, &info_map);
+      pg->do_peer(*t, fin->contexts, query_map, &info_map);
       pg->update_stats();
       pg->unlock();
       created++;
@@ -3544,7 +3544,7 @@ void OSD::handle_pg_create(MOSDPGCreate *m)
       creating_pgs.erase(pgid);
 
       wake_pg_waiters(pg->info.pgid);
-      pg->peer(*t, fin->contexts, query_map, &info_map);
+      pg->do_peer(*t, fin->contexts, query_map, &info_map);
       pg->update_stats();
 
       int tr = store->queue_transaction(&pg->osr, t, new ObjectStore::C_DeleteTransaction(t), fin);
@@ -3741,7 +3741,7 @@ void OSD::handle_pg_notify(MOSDPGNotify *m)
        pg->state_clear(PG_STATE_CLEAN);
       }
       
-      pg->peer(*t, fin->contexts, query_map, &info_map);
+      pg->do_peer(*t, fin->contexts, query_map, &info_map);
       pg->update_stats();
     }
     int tr = store->queue_transaction(&pg->osr, t, new ObjectStore::C_DeleteTransaction(t), fin);
@@ -3840,7 +3840,7 @@ void OSD::_process_pg_info(epoch_t epoch, int from,
        
        // peer
        map< int, map<pg_t,PG::Query> > query_map;
-       pg->peer(*t, fin->contexts, query_map, info_map);
+       pg->do_peer(*t, fin->contexts, query_map, info_map);
        pg->update_stats();
        do_queries(query_map);
       }
@@ -4391,7 +4391,7 @@ void OSD::generate_backlog(PG *pg)
     map< int, map<pg_t,PG::Query> > query_map;    // peer -> PG -> get_summary_since
     ObjectStore::Transaction *t = new ObjectStore::Transaction;
     C_Contexts *fin = new C_Contexts;
-    pg->peer(*t, fin->contexts, query_map, NULL);
+    pg->do_peer(*t, fin->contexts, query_map, NULL);
     do_queries(query_map);
     if (pg->dirty_info)
       pg->write_info(*t);

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 21377286e9fbcde729bc6e924913e6c425f9cf0b..22caef509ff97ed436a49b96d53e41ad18ae22d8 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1303,7 +1303,7 @@ bool PG::recover_master_log(map< int, map<pg_t,Query> >& query_map)
 }
 
 
-void PG::peer(ObjectStore::Transaction& t, list<Context*>& tfin,
+void PG::do_peer(ObjectStore::Transaction& t, list<Context*>& tfin,
               map< int, map<pg_t,Query> >& query_map,
              map<int, MOSDPGInfo*> *activator_map)
 {

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 16cc471c3da852e0abdaf894a0d58c8b5b425bb2..ab32f5645ac8fa53df6b4eb3286bc5bf45596636 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -828,9 +828,9 @@ public:
 
   bool choose_acting(int newest_update_osd);
   bool recover_master_log(map< int, map<pg_t,Query> >& query_map);
-  void peer(ObjectStore::Transaction& t, list<Context*>& tfin,
-           map< int, map<pg_t,Query> >& query_map,
-           map<int, MOSDPGInfo*> *activator_map=0);
+  void do_peer(ObjectStore::Transaction& t, list<Context*>& tfin,
+             map< int, map<pg_t,Query> >& query_map,
+             map<int, MOSDPGInfo*> *activator_map=0);
   void activate(ObjectStore::Transaction& t, list<Context*>& tfin,
                map<int, MOSDPGInfo*> *activator_map=0);