From 0eaa709b0a556accd7cd8cfc3dfa9ad98847c3f3 Mon Sep 17 00:00:00 2001
From: Varsha Rao <varao@redhat.com>
Date: Mon, 26 Aug 2019 04:57:27 -0400
Subject: [PATCH] mds: Reorganize class members in JournalPointer header

Fixes: https://tracker.ceph.com/issues/41430
Signed-off-by: Varsha Rao <varao@redhat.com>
---
 src/mds/JournalPointer.h | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/mds/JournalPointer.h b/src/mds/JournalPointer.h
index 1881f41d3a057..8d4708e1d0919 100644
--- a/src/mds/JournalPointer.h
+++ b/src/mds/JournalPointer.h
@@ -24,18 +24,9 @@ class Objecter;
 // This always lives in the same location for a given MDS
 // instance, it tells the daemon where to look for the journal.
 class JournalPointer {
-  // MDS rank
-  int node_id;
-  // Metadata pool ID
-  int64_t pool_id;
-
-  std::string get_object_id() const;
-
   public:
-  // The currently active journal
-  inodeno_t front;
-  // The backup journal, if any (may be 0)
-  inodeno_t back;
+  JournalPointer(int node_id_, int64_t pool_id_) : node_id(node_id_), pool_id(pool_id_) {}
+  JournalPointer() {}
 
   void encode(bufferlist &bl) const {
     ENCODE_START(1, 1, bl);
@@ -51,11 +42,6 @@ class JournalPointer {
     DECODE_FINISH(bl);
   }
 
-  JournalPointer(int node_id_, int64_t pool_id_) : node_id(node_id_), pool_id(pool_id_),
-    front(0), back(0) {}
-
-  JournalPointer() : node_id(-1), pool_id(-1), front(0), back(0) {}
-
   int load(Objecter *objecter);
   int save(Objecter *objecter) const;
   void save(Objecter *objecter, Context *completion) const;
@@ -80,6 +66,19 @@ class JournalPointer {
     ls.back()->front = 0xdeadbeef;
     ls.back()->back = 0xfeedbead;
   }
+
+  // The currently active journal
+  inodeno_t front = 0;
+  // The backup journal, if any (may be 0)
+  inodeno_t back = 0;
+
+  private:
+  // MDS rank
+  int node_id = -1;
+  // Metadata pool ID
+  int64_t pool_id = -1;
+
+  std::string get_object_id() const;
 };
 WRITE_CLASS_ENCODER(JournalPointer)
 
-- 
2.39.5