From: Sage Weil <sage@redhat.com>
Date: Sat, 9 Aug 2014 01:08:23 +0000 (-0700)
Subject: osd/osd_types: s/int/int32_t/ in pg_stat_t
X-Git-Tag: v0.85~27^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ee790e36ddde883a4ee94796853c7d4cb025f874;p=ceph.git

osd/osd_types: s/int/int32_t/ in pg_stat_t

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index a7ebda474a27..25b69228a731 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -1625,15 +1625,15 @@ void pg_stat_t::dump(Formatter *f) const
   f->dump_stream("stats_invalid") << stats_invalid;
   stats.dump(f);
   f->open_array_section("up");
-  for (vector<int>::const_iterator p = up.begin(); p != up.end(); ++p)
+  for (vector<int32_t>::const_iterator p = up.begin(); p != up.end(); ++p)
     f->dump_int("osd", *p);
   f->close_section();
   f->open_array_section("acting");
-  for (vector<int>::const_iterator p = acting.begin(); p != acting.end(); ++p)
+  for (vector<int32_t>::const_iterator p = acting.begin(); p != acting.end(); ++p)
     f->dump_int("osd", *p);
   f->close_section();
   f->open_array_section("blocked_by");
-  for (vector<int>::const_iterator p = blocked_by.begin();
+  for (vector<int32_t>::const_iterator p = blocked_by.begin();
        p != blocked_by.end(); ++p)
     f->dump_int("osd", *p);
   f->close_section();
@@ -1645,11 +1645,11 @@ void pg_stat_t::dump_brief(Formatter *f) const
 {
   f->dump_string("state", pg_state_string(state));
   f->open_array_section("up");
-  for (vector<int>::const_iterator p = up.begin(); p != up.end(); ++p)
+  for (vector<int32_t>::const_iterator p = up.begin(); p != up.end(); ++p)
     f->dump_int("osd", *p);
   f->close_section();
   f->open_array_section("acting");
-  for (vector<int>::const_iterator p = acting.begin(); p != acting.end(); ++p)
+  for (vector<int32_t>::const_iterator p = acting.begin(); p != acting.end(); ++p)
     f->dump_int("osd", *p);
   f->close_section();
   f->dump_int("up_primary", up_primary);
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 30406853762d..90c0bd0049fe 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -1371,10 +1371,10 @@ struct pg_stat_t {
   int64_t log_size;
   int64_t ondisk_log_size;    // >= active_log_size
 
-  vector<int> up, acting;
+  vector<int32_t> up, acting;
   epoch_t mapping_epoch;
 
-  vector<int> blocked_by;  ///< osds on which the pg is blocked
+  vector<int32_t> blocked_by;  ///< osds on which the pg is blocked
 
   utime_t last_became_active;