mds: Reorganize class members in FSMapUser header

Fixes: https://tracker.ceph.com/issues/41185
Signed-off-by: Varsha Rao <varao@redhat.com>

diff --git a/src/mds/FSMapUser.h b/src/mds/FSMapUser.h
index c02e3d53aa8b4216d3ff9af7661d89b72e177a92..30e5461594d856c91ddda51f4b1b4a972464243b 100644 (file)
--- a/src/mds/FSMapUser.h
+++ b/src/mds/FSMapUser.h
@@ -23,19 +23,14 @@
 class FSMapUser {
 public:
   struct fs_info_t {
-    fs_cluster_id_t cid;
-    std::string name;
-    fs_info_t() : cid(FS_CLUSTER_ID_NONE) {}
+    fs_info_t() {}
     void encode(bufferlist& bl, uint64_t features) const;
     void decode(bufferlist::const_iterator &bl);
+    std::string name;
+    fs_cluster_id_t cid = FS_CLUSTER_ID_NONE;
   };
 
-  epoch_t epoch;
-  fs_cluster_id_t legacy_client_fscid;
-  std::map<fs_cluster_id_t, fs_info_t> filesystems;
-
-  FSMapUser()
-    : epoch(0), legacy_client_fscid(FS_CLUSTER_ID_NONE) { }
+  FSMapUser() {}
 
   epoch_t get_epoch() const { return epoch; }
 
@@ -54,6 +49,10 @@ public:
   void print_summary(Formatter *f, ostream *out);
 
   static void generate_test_instances(std::list<FSMapUser*>& ls);
+
+  std::map<fs_cluster_id_t, fs_info_t> filesystems;
+  fs_cluster_id_t legacy_client_fscid = FS_CLUSTER_ID_NONE;
+  epoch_t epoch = 0;
 };
 WRITE_CLASS_ENCODER_FEATURES(FSMapUser::fs_info_t)
 WRITE_CLASS_ENCODER_FEATURES(FSMapUser)