]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
client: minor cleanup to MetaSession class
authorVenky Shankar <vshankar@redhat.com>
Wed, 30 Jan 2019 03:41:59 +0000 (22:41 -0500)
committerVenky Shankar <vshankar@redhat.com>
Wed, 29 Jul 2020 10:11:07 +0000 (06:11 -0400)
Signed-off-by: Venky Shankar <vshankar@redhat.com>
src/client/MetaSession.h

index c0901305a810481a61181764a3bf7b799b4973a0..7702b40e33a51c05580754fb9f0fb19719650dbf 100644 (file)
@@ -19,10 +19,10 @@ struct MetaRequest;
 struct MetaSession {
   mds_rank_t mds_num;
   ConnectionRef con;
-  version_t seq;
-  uint64_t cap_gen;
+  version_t seq = 0;
+  uint64_t cap_gen = 0;
   utime_t cap_ttl, last_cap_renew_request;
-  uint64_t cap_renew_seq;
+  uint64_t cap_renew_seq = 0;
   entity_addrvec_t addrs;
   feature_bitset_t mds_features;
 
@@ -34,17 +34,17 @@ struct MetaSession {
     STATE_CLOSED,
     STATE_STALE,
     STATE_REJECTED,
-  } state;
+  } state = STATE_OPENING;
 
   enum {
     RECLAIM_NULL,
     RECLAIMING,
     RECLAIM_OK,
     RECLAIM_FAIL,
-  } reclaim_state;
+  } reclaim_state = RECLAIM_NULL;
 
-  int mds_state;
-  bool readonly;
+  int mds_state = MDSMap::STATE_NULL;
+  bool readonly = false;
 
   list<Context*> waiting_for_open;
 
@@ -56,13 +56,9 @@ struct MetaSession {
 
   ceph::ref_t<MClientCapRelease> release;
 
-  MetaSession(mds_rank_t mds_num, ConnectionRef con,
-             const entity_addrvec_t& addrs)
-    : mds_num(mds_num), con(con),
-      seq(0), cap_gen(0), cap_renew_seq(0), addrs(addrs),
-      state(STATE_OPENING), reclaim_state(RECLAIM_NULL),
-      mds_state(MDSMap::STATE_NULL), readonly(false)
-  {}
+  MetaSession(mds_rank_t mds_num, ConnectionRef con, const entity_addrvec_t& addrs)
+    : mds_num(mds_num), con(con), addrs(addrs) {
+  }
 
   const char *get_state_name() const;