From: Varsha Rao <varao@redhat.com>
Date: Mon, 26 Aug 2019 07:27:15 +0000 (-0400)
Subject: mds: Reorganize class members in InoTable header
X-Git-Tag: v15.1.0~1578^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F29883%2Fhead;p=ceph.git

mds: Reorganize class members in InoTable header

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

diff --git a/src/mds/InoTable.h b/src/mds/InoTable.h
index f16531c53aef..a7f0b090bd30 100644
--- a/src/mds/InoTable.h
+++ b/src/mds/InoTable.h
@@ -22,11 +22,9 @@
 class MDSRank;
 
 class InoTable : public MDSTable {
-  interval_set<inodeno_t> free;   // unused ids
-  interval_set<inodeno_t> projected_free;
-
  public:
-  explicit InoTable(MDSRank *m) : MDSTable(m, "inotable", true) { }
+  explicit InoTable(MDSRank *m) : MDSTable(m, "inotable", true) {}
+  InoTable() : MDSTable(NULL, "inotable", true) {}
 
   inodeno_t project_alloc_id(inodeno_t id=0);
   void apply_alloc_id(inodeno_t id);
@@ -61,7 +59,6 @@ class InoTable : public MDSTable {
   }
 
   // To permit enc/decoding in isolation in dencoder
-  InoTable() : MDSTable(NULL, "inotable", true) {}
   void encode(bufferlist& bl) const {
     encode_state(bl);
   }
@@ -97,6 +94,10 @@ class InoTable : public MDSTable {
    * @return true if the table was modified
    */
   bool force_consume_to(inodeno_t ino);
+
+ private:
+  interval_set<inodeno_t> free;   // unused ids
+  interval_set<inodeno_t> projected_free;
 };
 WRITE_CLASS_ENCODER(InoTable)