From: Greg Farnum <greg@inktank.com>
Date: Thu, 19 Dec 2013 02:14:15 +0000 (-0800)
Subject: OSDMap: rename _raw_to_temp_osds() -> _get_temp_osds()
X-Git-Tag: v0.78~329^2~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5367d92e0bd2722a7fd8f9ef7f3b57d3a18b314c;p=ceph.git

OSDMap: rename _raw_to_temp_osds() -> _get_temp_osds()

This function does not (and never has!) used the raw vector, so remove it
and don't use a name which implies it is doing any sort of conversion.

Signed-off-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 55742d9fc7c..7c0f5dbb240 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1153,7 +1153,7 @@ void OSDMap::_raw_to_up_osds(pg_t pg, vector<int>& raw, vector<int>& up) const
   }
 }
   
-bool OSDMap::_raw_to_temp_osds(const pg_pool_t& pool, pg_t pg, vector<int>& raw, vector<int>& temp) const
+bool OSDMap::_get_temp_osds(const pg_pool_t& pool, pg_t pg, vector<int>& temp) const
 {
   pg = pool.raw_pg_to_pg(pg);
   map<pg_t,vector<int> >::const_iterator p = pg_temp->find(pg);
@@ -1196,7 +1196,7 @@ void OSDMap::_pg_to_up_acting_osds(pg_t pg, vector<int> *up, vector<int>& acting
   vector<int> *_up = (up ? up : new vector<int>);
   _pg_to_osds(*pool, pg, raw);
   _raw_to_up_osds(pg, raw, *up);
-  if (!_raw_to_temp_osds(*pool, pg, raw, acting))
+  if (!_get_temp_osds(*pool, pg, acting))
     acting = *_up;
   if (_up != up)
     delete _up;
diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index cfc9e0df4ca..e44faf0c982 100644
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -504,7 +504,7 @@ private:
   /// pg -> (up osd list)
   void _raw_to_up_osds(pg_t pg, vector<int>& raw, vector<int>& up) const;
 
-  bool _raw_to_temp_osds(const pg_pool_t& pool, pg_t pg, vector<int>& raw, vector<int>& temp) const;
+  bool _get_temp_osds(const pg_pool_t& pool, pg_t pg, vector<int>& temp) const;
 
   /// map to up and acting. Only provides up if pointer is non-NULL
   void _pg_to_up_acting_osds(pg_t pg, vector<int> *up,