From: Sage Weil <sage@redhat.com>
Date: Wed, 26 Apr 2017 16:38:51 +0000 (-0400)
Subject: mon/PGMap: inline init for a few fields
X-Git-Tag: v12.0.3~124^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2bba6491a3cb8d505a37db469d59d469ad57af6;p=ceph.git

mon/PGMap: inline init for a few fields

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

diff --git a/src/mon/PGMap.h b/src/mon/PGMap.h
index 506f86d9300c..c09a5f72dedb 100644
--- a/src/mon/PGMap.h
+++ b/src/mon/PGMap.h
@@ -117,11 +117,11 @@ public:
 
   // aggregate stats (soft state), generated by calc_stats()
   ceph::unordered_map<int,int> num_pg_by_state;
-  int64_t num_pg, num_osd;
+  int64_t num_pg = 0, num_osd = 0;
   ceph::unordered_map<int,pool_stat_t> pg_pool_sum;
   pool_stat_t pg_sum;
   osd_stat_t osd_sum;
-  mutable epoch_t min_last_epoch_clean;
+  mutable epoch_t min_last_epoch_clean = 0;
   ceph::unordered_map<int,int> blocked_by_sum;
   ceph::unordered_map<int,set<pg_t> > pg_by_osd;
 
@@ -198,10 +198,7 @@ public:
   PGMap()
     : version(0),
       last_osdmap_epoch(0), last_pg_scan(0),
-      full_ratio(0), nearfull_ratio(0),
-      num_pg(0),
-      num_osd(0),
-      min_last_epoch_clean(0)
+      full_ratio(0), nearfull_ratio(0)
   {}
 
   void set_full_ratios(float full, float nearfull) {