osd: rename op_waiters -> waiting_for_map

That's what it is used for; make the name descriptive.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index e0d0c94bce887838393cd995ec03b321c8a09206..bfa37cb85aa0fc52f095ab263380a6f6dec20a9d 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1518,7 +1518,7 @@ void PG::do_request(OpRequestRef op)
   // do any pending flush
   do_pending_flush();
   if (must_delay_request(op)) {
-    op_waiters.push_back(op);
+    waiting_for_map.push_back(op);
     return;
   } else if (can_discard_request(op)) {
     return;
@@ -4115,7 +4115,7 @@ void PG::queue_op(OpRequestRef op)
 void PG::take_waiters()
 {
   dout(10) << "take_waiters" << dendl;
-  requeue_ops(op_waiters);
+  requeue_ops(waiting_for_map);
   for (list<CephPeeringEvtRef>::iterator i = peering_waiters.begin();
        i != peering_waiters.end();
        ++i) osd->queue_for_peering(this);

diff --git a/src/osd/PG.h b/src/osd/PG.h
index fc3050ca198a00f077d31622051ed48c92c19731..2be781f47698704baf8d157561c5524dd821c40f 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -395,7 +395,6 @@ public:
   }
 
 
-  list<OpRequestRef> op_waiters;
   list<OpRequestRef> op_queue;  // op queue
 
   bool dirty_info, dirty_log;
@@ -625,6 +624,7 @@ protected:
 
   // pg waiters
   bool flushed;
+  list<OpRequestRef> waiting_for_map;
   list<OpRequestRef>            waiting_for_active;
   list<OpRequestRef>            waiting_for_all_missing;
   map<hobject_t, list<OpRequestRef> > waiting_for_missing_object,

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index ee1f85971625cd7c72c44e50e1cd27d1a36af8d5..1d4abf99ff5dd00e10983ca8e21892660dfda286 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5737,7 +5737,7 @@ void ReplicatedPG::apply_and_flush_repops(bool requeue)
   }
 
   if (requeue) {
-    op_waiters.splice(op_waiters.end(), rq);
+    waiting_for_map.splice(waiting_for_map.end(), rq);
   }
 }