]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: make mds_role_t member order match constructor 11389/head
authorJohn Spray <john.spray@redhat.com>
Fri, 30 Sep 2016 20:57:35 +0000 (21:57 +0100)
committerJohn Spray <john.spray@redhat.com>
Mon, 10 Oct 2016 11:22:37 +0000 (12:22 +0100)
Previously this was mildy confusing.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 63d711d4e9decd2940c55aa697e6a588593da23a)

src/mds/mdstypes.h

index b4195eb9c6940b5cfea3c2bd52eb8d4021f9ae58..98a732e81bb32046279b1042b0e2af2a776345d6 100644 (file)
@@ -90,13 +90,14 @@ extern const mds_rank_t MDS_RANK_NONE;
 class mds_role_t
 {
   public:
-  mds_rank_t rank;
   fs_cluster_id_t fscid;
+  mds_rank_t rank;
+
   mds_role_t(fs_cluster_id_t fscid_, mds_rank_t rank_)
-    : rank(rank_), fscid(fscid_)
+    : fscid(fscid_), rank(rank_)
   {}
   mds_role_t()
-    : rank(MDS_RANK_NONE), fscid(FS_CLUSTER_ID_NONE)
+    : fscid(FS_CLUSTER_ID_NONE), rank(MDS_RANK_NONE)
   {}
   bool operator<(mds_role_t const &rhs) const
   {