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 <loic@dachary.org>

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 6666a054bb71ae01475874a21b709bca9d49b437..f1b0d6d3a47abb26bf73e227038bd6a64695425f 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -675,7 +675,7 @@ public:
     vector<int> 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 aa3b6d5ac71264d89fc0cea67872449ab9b39423..579c9153fdee5e449b6c360039798f5160c49fc9 100644 (file)
--- 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 1b7311d62528a8538f7c160e8fd41948da6d367c..8294d08d84efc0fa7bbd89475c79dd619a133530 100644 (file)
--- 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;