From a2eab7165d0f323a2f2664f9367b180f5a02c649 Mon Sep 17 00:00:00 2001 From: Varsha Rao Date: Fri, 9 Aug 2019 16:32:00 +0530 Subject: [PATCH] mds: Reorganize class members in FSMapUser header Fixes: https://tracker.ceph.com/issues/41185 Signed-off-by: Varsha Rao --- src/mds/FSMapUser.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/mds/FSMapUser.h b/src/mds/FSMapUser.h index c02e3d53aa8..30e5461594d 100644 --- 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 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& ls); + + std::map 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) -- 2.39.5