From 20e66d16094b1ef5e1038485f264a446016201ea Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Wed, 28 May 2014 15:36:57 +0200 Subject: [PATCH] osd: loop over uint8_t instead of shard_id_t When looping in the range [0,number of shards[ using a uint8_t variable which is an integer instead of shard_id_t. The alternative would be define the ++ operator on shard_id_t but since the two are used interchangeably in a number of places, that seems unnecessary. Signed-off-by: Loic Dachary --- src/osd/OSDMap.h | 2 +- src/osd/PG.cc | 4 ++-- src/osd/PG.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index 6666a054bb71a..f1b0d6d3a47ab 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -675,7 +675,7 @@ public: vector acting; pg_to_acting_osds(pgid, &acting, &primary); if (i->second.ec_pool()) { - for (shard_id_t i = 0; i < acting.size(); ++i) { + for (uint8_t i = 0; i < acting.size(); ++i) { if (acting[i] == primary) { *out = spg_t(pgid, i); return true; diff --git a/src/osd/PG.cc b/src/osd/PG.cc index aa3b6d5ac7126..579c9153fdee5 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -953,7 +953,7 @@ void PG::calc_ec_acting( ++i) { all_info_by_shard[i->first.shard].insert(i->first); } - for (shard_id_t i = 0; i < want.size(); ++i) { + for (uint8_t i = 0; i < want.size(); ++i) { ss << "For position " << (unsigned)i << ": "; if (up.size() > (unsigned)i && up[i] != CRUSH_ITEM_NONE && !all_info.find(pg_shard_t(up[i], i))->second.is_incomplete() && @@ -997,7 +997,7 @@ void PG::calc_ec_acting( } bool found_primary = false; - for (shard_id_t i = 0; i < want.size(); ++i) { + for (uint8_t i = 0; i < want.size(); ++i) { if (want[i] != CRUSH_ITEM_NONE) { acting_backfill->insert(pg_shard_t(want[i], i)); if (!found_primary) { diff --git a/src/osd/PG.h b/src/osd/PG.h index 1b7311d62528a..8294d08d84efc 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -1889,7 +1889,7 @@ public: int new_acting_primary) { actingset.clear(); acting = newacting; - for (shard_id_t i = 0; i < acting.size(); ++i) { + for (uint8_t i = 0; i < acting.size(); ++i) { if (acting[i] != CRUSH_ITEM_NONE) actingset.insert( pg_shard_t( @@ -1904,13 +1904,13 @@ public: } up_primary = pg_shard_t(); primary = pg_shard_t(); - for (shard_id_t i = 0; i < up.size(); ++i) { + for (uint8_t i = 0; i < up.size(); ++i) { if (up[i] == new_up_primary) { up_primary = pg_shard_t(up[i], i); break; } } - for (shard_id_t i = 0; i < acting.size(); ++i) { + for (uint8_t i = 0; i < acting.size(); ++i) { if (acting[i] == new_acting_primary) { primary = pg_shard_t(acting[i], i); break; -- 2.39.5