From 5511309fe95ea5b31ed4e4b75dc9ae3227dcc0eb Mon Sep 17 00:00:00 2001 From: Brad Hubbard Date: Wed, 14 Jun 2017 18:40:35 +1000 Subject: [PATCH] osd: Change *pg_to_* to return void Returning the number of items in the vector is not required and can be calculated since the caller has access to the vector. Signed-off-by: Brad Hubbard --- src/osd/OSDMap.cc | 13 +++++-------- src/osd/OSDMap.h | 21 ++++++++++----------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 7a712901a4c..5737cef0d5e 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -1861,7 +1861,7 @@ void OSDMap::_remove_nonexistent_osds(const pg_pool_t& pool, } } -int OSDMap::_pg_to_raw_osds( +void OSDMap::_pg_to_raw_osds( const pg_pool_t& pool, pg_t pg, vector *osds, ps_t *ppps) const @@ -1879,8 +1879,6 @@ int OSDMap::_pg_to_raw_osds( if (ppps) *ppps = pps; - - return osds->size(); } int OSDMap::_pick_primary(const vector& osds) const @@ -2053,17 +2051,16 @@ void OSDMap::_get_temp_osds(const pg_pool_t& pool, pg_t pg, } } -int OSDMap::pg_to_raw_osds(pg_t pg, vector *raw, int *primary) const +void OSDMap::pg_to_raw_osds(pg_t pg, vector *raw, int *primary) const { *primary = -1; raw->clear(); const pg_pool_t *pool = get_pg_pool(pg.pool()); if (!pool) - return 0; - int r = _pg_to_raw_osds(*pool, pg, raw, NULL); + return; + _pg_to_raw_osds(*pool, pg, raw, NULL); if (primary) *primary = _pick_primary(*raw); - return r; } void OSDMap::pg_to_raw_up(pg_t pg, vector *up, int *primary) const @@ -2084,7 +2081,7 @@ void OSDMap::pg_to_raw_up(pg_t pg, vector *up, int *primary) const *primary = _pick_primary(raw); _apply_primary_affinity(pps, *pool, up, primary); } - + void OSDMap::_pg_to_up_acting_osds( const pg_t& pg, vector *up, int *up_primary, vector *acting, int *acting_primary, diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index 2b5d15790d3..3e9752a9cb0 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -940,7 +940,7 @@ public: private: /// pg -> (raw osd list) - int _pg_to_raw_osds( + void _pg_to_raw_osds( const pg_pool_t& pool, pg_t pg, vector *osds, ps_t *ppps) const; @@ -981,14 +981,13 @@ public: * by anybody for data mapping purposes. * raw and primary must be non-NULL */ - int pg_to_raw_osds(pg_t pg, vector *raw, int *primary) const; + void pg_to_raw_osds(pg_t pg, vector *raw, int *primary) const; /// map a pg to its acting set. @return acting set size - int pg_to_acting_osds(const pg_t& pg, vector *acting, + void pg_to_acting_osds(const pg_t& pg, vector *acting, int *acting_primary) const { _pg_to_up_acting_osds(pg, NULL, NULL, acting, acting_primary); - return acting->size(); } - int pg_to_acting_osds(pg_t pg, vector& acting) const { + void pg_to_acting_osds(pg_t pg, vector& acting) const { return pg_to_acting_osds(pg, &acting, NULL); } /** @@ -1124,26 +1123,26 @@ public: /* rank is -1 (stray), 0 (primary), 1,2,3,... (replica) */ int get_pg_acting_rank(pg_t pg, int osd) const { vector group; - int nrep = pg_to_acting_osds(pg, group); - return calc_pg_rank(osd, group, nrep); + pg_to_acting_osds(pg, group); + return calc_pg_rank(osd, group, group.size()); } /* role is -1 (stray), 0 (primary), 1 (replica) */ int get_pg_acting_role(const pg_t& pg, int osd) const { vector group; - int nrep = pg_to_acting_osds(pg, group); - return calc_pg_role(osd, group, nrep); + pg_to_acting_osds(pg, group); + return calc_pg_role(osd, group, group.size()); } bool osd_is_valid_op_target(pg_t pg, int osd) const { int primary; vector group; - int nrep = pg_to_acting_osds(pg, &group, &primary); + pg_to_acting_osds(pg, &group, &primary); if (osd == primary) return true; if (pg_is_ec(pg)) return false; - return calc_pg_role(osd, group, nrep) >= 0; + return calc_pg_role(osd, group, group.size()) >= 0; } int clean_pg_upmaps( -- 2.39.5