mds: Move log_segment_seq_t into class LogSegment

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 3ec71f994d54038567bb575b141e150dbd45ac4d)

diff --git a/src/mds/LogSegment.h b/src/mds/LogSegment.h
index eb3ee623509d3f01831fc35cc1b687ebc5ab42e7..bf647135ab3d08a4722387845df8c27068908f34 100644 (file)
--- a/src/mds/LogSegment.h
+++ b/src/mds/LogSegment.h
@@ -26,8 +26,6 @@
 
 #include "include/unordered_set.h"
 
-typedef uint64_t log_segment_seq_t;
-
 using ceph::unordered_set;
 
 class CDir;
@@ -38,6 +36,8 @@ struct MDSlaveUpdate;
 
 class LogSegment {
  public:
+  using seq_t = uint64_t;
+
   LogSegment(uint64_t _seq, loff_t off=-1) :
     seq(_seq), offset(off), end(off),
     dirty_dirfrags(member_offset(CDir, item_dirty)),
@@ -60,7 +60,7 @@ class LogSegment {
     expiry_waiters.push_back(c);
   }
 
-  const log_segment_seq_t seq;
+  const seq_t seq;
   uint64_t offset, end;
   int num_events = 0;
 

diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index 07fddead765b82a32e44d2ee6b011bf9a698adc4..5277f9af941fc43f58e57d9ff4ec30c3c49a58fb 100644 (file)
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -1152,7 +1152,7 @@ void MDLog::_reformat_journal(JournalPointer const &jp_in, Journaler *old_journa
   // a log segment.  Because we change serialization, this will end up changing
   // for us, so we have to explicitly update the fields that point back to that
   // log segment.
-  std::map<log_segment_seq_t, log_segment_seq_t> segment_pos_rewrite;
+  std::map<LogSegment::seq_t, LogSegment::seq_t> segment_pos_rewrite;
 
   // The logic in here borrowed from replay_thread expects mds_lock to be held,
   // e.g. between checking readable and doing wait_for_readable so that journaler

diff --git a/src/mds/MDLog.h b/src/mds/MDLog.h
index e503e57caf1f3ad18f15e9ad0d85ac3485eeb3ac..ea74180b25bc69a8c698c4d82f5b03d57c0077eb 100644 (file)
--- a/src/mds/MDLog.h
+++ b/src/mds/MDLog.h
@@ -243,7 +243,7 @@ public:
     return segments.rbegin()->second;
   }
 
-  LogSegment *get_segment(log_segment_seq_t seq) {
+  LogSegment *get_segment(LogSegment::seq_t seq) {
     if (segments.count(seq))
       return segments[seq];
     return NULL;

diff --git a/src/mds/events/EMetaBlob.h b/src/mds/events/EMetaBlob.h
index 199e5fa865c155543a8731f01c988e36d024ae5c..ac09a8fe9f58ba924733f098c7e2c86a27b0c5f2 100644 (file)
--- a/src/mds/events/EMetaBlob.h
+++ b/src/mds/events/EMetaBlob.h
@@ -322,7 +322,7 @@ private:
 
   // inodes i've truncated
   vector<inodeno_t> truncate_start;        // start truncate
-  map<inodeno_t, log_segment_seq_t> truncate_finish;  // finished truncate (started in segment blah)
+  map<inodeno_t, LogSegment::seq_t> truncate_finish;  // finished truncate (started in segment blah)
 
 public:
   vector<inodeno_t> destroyed_inodes;

diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index c117b024401bf271c850f360375dbb4cfc8f7ff3..991b91cc13f94fc7d12949984664792cd42d45b1 100644 (file)
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -3118,10 +3118,10 @@ void ENoOp::replay(MDSRank *mds)
  * True if the event was modified.
  */
 bool EMetaBlob::rewrite_truncate_finish(MDSRank const *mds,
-    std::map<log_segment_seq_t, log_segment_seq_t> const &old_to_new)
+    std::map<LogSegment::seq_t, LogSegment::seq_t> const &old_to_new)
 {
   bool modified = false;
-  map<inodeno_t, log_segment_seq_t> new_trunc_finish;
+  map<inodeno_t, LogSegment::seq_t> new_trunc_finish;
   for (const auto& p : truncate_finish) {
     auto q = old_to_new.find(p.second);
     if (q != old_to_new.end()) {