]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
OSD::calc_priors_during: fix confusing for loop bracing (cosmetic)
authorSamuel Just <sam.just@inktank.com>
Tue, 3 Jun 2014 23:11:32 +0000 (16:11 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 25 Jun 2014 18:29:39 +0000 (11:29 -0700)
Confusing lack of braces is confusing.

Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit d76936b92300be5cc403fd5a36616a2424c7877d)

Conflicts:
src/osd/OSD.cc

src/osd/OSD.cc

index 608b188a7e0d5baa83b226b00b008b557e416f60..6f3c36f92821c1558083092c44d0d2e6d9e73f7a 100644 (file)
@@ -2505,7 +2505,7 @@ void OSD::calc_priors_during(
     oldmap->pg_to_acting_osds(pgid.pgid, acting);
     dout(20) << "  " << pgid << " in epoch " << e << " was " << acting << dendl;
     int up = 0;
-    for (unsigned i=0; i<acting.size(); i++)
+    for (unsigned i=0; i<acting.size(); i++) {
       if (osdmap->is_up(acting[i])) {
        if (acting[i] != whoami) {
          pset.insert(
@@ -2515,14 +2515,17 @@ void OSD::calc_priors_during(
        }
        up++;
       }
+    }
     if (!up && !acting.empty()) {
       // sucky.  add down osds, even tho we can't reach them right now.
-      for (unsigned i=0; i<acting.size(); i++)
-       if (acting[i] != whoami)
+      for (unsigned i=0; i<acting.size(); i++) {
+       if (acting[i] != whoami) {
          pset.insert(
            pg_shard_t(
              acting[i],
              osdmap->pg_is_ec(pgid.pgid) ? i : ghobject_t::NO_SHARD));
+       }
+      }
     }
   }
   dout(10) << "calc_priors_during " << pgid