From 6dd81485c31490f6b34ffc2e4ac90627599cdfc4 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 2 Dec 2011 15:24:00 -0800
Subject: [PATCH] osd: rename {take -> requeue}_object_waiters

It calls osd->requeue_ops(), so make naming more consistent and avoid
confusing people like me.

Signed-off-by: Sage Weil <sage@newdream.net>
---
 src/osd/PG.cc           | 2 +-
 src/osd/PG.h            | 2 +-
 src/osd/ReplicatedPG.cc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index aecffccc82c4a..a7565d1b7f758 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2468,7 +2468,7 @@ void PG::adjust_local_snaps()
   }
 }
 
-void PG::take_object_waiters(map<hobject_t, list<Message*> >& m)
+void PG::requeue_object_waiters(map<hobject_t, list<Message*> >& m)
 {
   for (map<hobject_t, list<Message*> >::iterator it = m.begin();
        it != m.end();
diff --git a/src/osd/PG.h b/src/osd/PG.h
index 5b6353bb2fd29..f95eb18dd2c56 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1373,7 +1373,7 @@ protected:
   map<eversion_t,list<Message*> > waiting_for_ondisk;
   map<eversion_t,class MOSDOp*>   replay_queue;
 
-  void take_object_waiters(map<hobject_t, list<Message*> >& m);
+  void requeue_object_waiters(map<hobject_t, list<Message*> >& m);
   
   bool block_if_wrlocked(MOSDOp* op, object_info_t& oi);
 
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index a04418902b2e1..1e705d15188ba 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -4727,8 +4727,8 @@ void ReplicatedPG::on_change()
   context_registry_on_change();
 
   // take object waiters
-  take_object_waiters(waiting_for_missing_object);
-  take_object_waiters(waiting_for_degraded_object);
+  requeue_object_waiters(waiting_for_missing_object);
+  requeue_object_waiters(waiting_for_degraded_object);
 
   // clear pushing/pulling maps
   pushing.clear();
-- 
2.39.5