From 5367d92e0bd2722a7fd8f9ef7f3b57d3a18b314c Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Wed, 18 Dec 2013 18:14:15 -0800 Subject: [PATCH] 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 --- src/osd/OSDMap.cc | 4 ++-- src/osd/OSDMap.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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& raw, vector& up) const } } -bool OSDMap::_raw_to_temp_osds(const pg_pool_t& pool, pg_t pg, vector& raw, vector& temp) const +bool OSDMap::_get_temp_osds(const pg_pool_t& pool, pg_t pg, vector& temp) const { pg = pool.raw_pg_to_pg(pg); map >::const_iterator p = pg_temp->find(pg); @@ -1196,7 +1196,7 @@ void OSDMap::_pg_to_up_acting_osds(pg_t pg, vector *up, vector& acting vector *_up = (up ? up : new vector); _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& raw, vector& up) const; - bool _raw_to_temp_osds(const pg_pool_t& pool, pg_t pg, vector& raw, vector& temp) const; + bool _get_temp_osds(const pg_pool_t& pool, pg_t pg, vector& 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 *up, -- 2.47.3