From: Varsha Rao <varao@redhat.com>
Date: Wed, 17 Jul 2019 11:33:37 +0000 (+0530)
Subject: mds: Move scalar type initializations of CDir data members to its header
X-Git-Tag: v15.1.0~2083^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F28860%2Fhead;p=ceph.git

mds: Move scalar type initializations of CDir data members to its header

Signed-off-by: Varsha Rao <varao@redhat.com>
---

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index 71c1d9db7e19..c2fe6b9d7318 100644
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -192,15 +192,9 @@ ostream& CDir::print_db_line_prefix(ostream& out)
 
 CDir::CDir(CInode *in, frag_t fg, MDCache *mdcache, bool auth) :
   cache(mdcache), inode(in), frag(fg),
-  first(2),
   dirty_rstat_inodes(member_offset(CInode, dirty_rstat_item)),
   dirty_dentries(member_offset(CDentry, item_dir_dirty)),
   item_dirty(this), item_new(this),
-  projected_version(0),
-  num_head_items(0), num_head_null(0),
-  num_snap_items(0), num_snap_null(0),
-  num_dirty(0), committing_version(0), committed_version(0),
-  dir_auth_pins(0),
   dir_rep(REP_NONE),
   pop_me(mdcache->decayrate),
   pop_nested(mdcache->decayrate),
@@ -208,8 +202,6 @@ CDir::CDir(CInode *in, frag_t fg, MDCache *mdcache, bool auth) :
   pop_auth_subtree_nested(mdcache->decayrate),
   pop_spread(mdcache->decayrate),
   pop_lru_subdirs(member_offset(CInode, item_pop_lru)),
-  num_dentries_nested(0), num_dentries_auth_subtree(0),
-  num_dentries_auth_subtree_nested(0),
   dir_auth(CDIR_AUTH_DEFAULT)
 {
   // auth
diff --git a/src/mds/CDir.h b/src/mds/CDir.h
index 7dffbc71e681..d2d109fea8a3 100644
--- a/src/mds/CDir.h
+++ b/src/mds/CDir.h
@@ -597,7 +597,7 @@ public:
   frag_t frag;   // my frag
 
   fnode_t fnode;
-  snapid_t first;
+  snapid_t first = 2;
   mempool::mds_co::compact_map<snapid_t,old_rstat_t> dirty_old_rstat;  // [value.first,key]
 
   // my inodes with dirty rstat data
@@ -661,25 +661,25 @@ protected:
   void _encode_dentry(CDentry *dn, bufferlist& bl, const std::set<snapid_t> *snaps);
   void _committed(int r, version_t v);
 
-  version_t projected_version;
+  version_t projected_version = 0;
   mempool::mds_co::list<fnode_t> projected_fnode;
 
   std::unique_ptr<scrub_info_t> scrub_infop; // FIXME not in mempool
 
   // contents of this directory
   dentry_key_map items;       // non-null AND null
-  unsigned num_head_items;
-  unsigned num_head_null;
-  unsigned num_snap_items;
-  unsigned num_snap_null;
+  unsigned num_head_items = 0;
+  unsigned num_head_null = 0;
+  unsigned num_snap_items = 0;
+  unsigned num_snap_null = 0;
 
-  int num_dirty;
+  int num_dirty = 0;
 
   int num_inodes_with_caps = 0;
 
   // state
-  version_t committing_version;
-  version_t committed_version;
+  version_t committing_version = 0;
+  version_t committed_version = 0;
 
   mempool::mds_co::compact_set<mempool::mds_co::string> stale_items;
 
@@ -687,7 +687,7 @@ protected:
   static int num_frozen_trees;
   static int num_freezing_trees;
 
-  int dir_auth_pins;
+  int dir_auth_pins = 0;
 
   // cache control  (defined for authority; hints for replicas)
   __s32      dir_rep;
@@ -706,9 +706,9 @@ protected:
   elist<CInode*> pop_lru_subdirs;
 
   // and to provide density
-  int num_dentries_nested;
-  int num_dentries_auth_subtree;
-  int num_dentries_auth_subtree_nested;
+  int num_dentries_nested = 0;
+  int num_dentries_auth_subtree = 0;
+  int num_dentries_auth_subtree_nested = 0;
 
   std::unique_ptr<bloom_filter> bloom; // XXX not part of mempool::mds_co
   /* If you set up the bloom filter, you must keep it accurate!