From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 25 Aug 2017 17:45:25 +0000 (-0700)
Subject: mds: move EMetaBlob cons to header
X-Git-Tag: v13.0.1~1039^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c0d33925e64632e7711ddcdad008dca180d9d022;p=ceph-ci.git

mds: move EMetaBlob cons to header

Also, remove unused mdlog parameter.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/src/mds/events/EExport.h b/src/mds/events/EExport.h
index 9c53c447a90..1de05449c18 100644
--- a/src/mds/events/EExport.h
+++ b/src/mds/events/EExport.h
@@ -35,7 +35,7 @@ public:
   EExport() :
     LogEvent(EVENT_EXPORT), target(MDS_RANK_NONE) { }
   EExport(MDLog *mdlog, CDir *dir, mds_rank_t t) :
-    LogEvent(EVENT_EXPORT), metablob(mdlog),
+    LogEvent(EVENT_EXPORT),
     base(dir->dirfrag()), target(t) { }
   
   set<dirfrag_t> &get_bounds() { return bounds; }
diff --git a/src/mds/events/EFragment.h b/src/mds/events/EFragment.h
index 2ebf0812df5..aa3ed0ba897 100644
--- a/src/mds/events/EFragment.h
+++ b/src/mds/events/EFragment.h
@@ -38,7 +38,7 @@ public:
 
   EFragment() : LogEvent(EVENT_FRAGMENT) { }
   EFragment(MDLog *mdlog, int o, dirfrag_t df, int b) :
-    LogEvent(EVENT_FRAGMENT), metablob(mdlog), 
+    LogEvent(EVENT_FRAGMENT),
     op(o), ino(df.ino), basefrag(df.frag), bits(b) { }
 
   void print(ostream& out) const override {
diff --git a/src/mds/events/EImportStart.h b/src/mds/events/EImportStart.h
index ab83df91741..970b35faab9 100644
--- a/src/mds/events/EImportStart.h
+++ b/src/mds/events/EImportStart.h
@@ -37,7 +37,7 @@ public:
 
   EImportStart(MDLog *log, dirfrag_t di, vector<dirfrag_t>& b, mds_rank_t f) :
     LogEvent(EVENT_IMPORTSTART),
-    base(di), bounds(b), from(f), metablob(log) { }
+    base(di), bounds(b), from(f) { }
   EImportStart() :
     LogEvent(EVENT_IMPORTSTART), from(MDS_RANK_NONE) { }
   
diff --git a/src/mds/events/EMetaBlob.h b/src/mds/events/EMetaBlob.h
index 28db4fc2b0e..c9ab9dde531 100644
--- a/src/mds/events/EMetaBlob.h
+++ b/src/mds/events/EMetaBlob.h
@@ -335,7 +335,10 @@ private:
   // for replay, in certain cases
   //LogSegment *_segment;
 
-  explicit EMetaBlob(MDLog *mdl = 0);  // defined in journal.cc
+  EMetaBlob() : opened_ino(0), renamed_dirino(0),
+                inotablev(0), sessionmapv(0), allocated_ino(0),
+                last_subtree_map(0), event_seq(0)
+                {}
   ~EMetaBlob() { }
 
   void print(ostream& out) {
diff --git a/src/mds/events/EOpen.h b/src/mds/events/EOpen.h
index b529f05c787..655f97841fd 100644
--- a/src/mds/events/EOpen.h
+++ b/src/mds/events/EOpen.h
@@ -26,7 +26,7 @@ public:
 
   EOpen() : LogEvent(EVENT_OPEN) { }
   explicit EOpen(MDLog *mdlog) :
-    LogEvent(EVENT_OPEN), metablob(mdlog) { }
+    LogEvent(EVENT_OPEN) { }
 
   void print(ostream& out) const override {
     out << "EOpen " << metablob << ", " << inos.size() << " open files";
diff --git a/src/mds/events/ESlaveUpdate.h b/src/mds/events/ESlaveUpdate.h
index ea1fa3acf77..28e19822f0b 100644
--- a/src/mds/events/ESlaveUpdate.h
+++ b/src/mds/events/ESlaveUpdate.h
@@ -120,7 +120,7 @@ public:
 
   ESlaveUpdate() : LogEvent(EVENT_SLAVEUPDATE), master(0), op(0), origop(0) { }
   ESlaveUpdate(MDLog *mdlog, const char *s, metareqid_t ri, int mastermds, int o, int oo) : 
-    LogEvent(EVENT_SLAVEUPDATE), commit(mdlog), 
+    LogEvent(EVENT_SLAVEUPDATE),
     type(s),
     reqid(ri),
     master(mastermds),
diff --git a/src/mds/events/EUpdate.h b/src/mds/events/EUpdate.h
index c4ef5627fd8..ed3eb3617a2 100644
--- a/src/mds/events/EUpdate.h
+++ b/src/mds/events/EUpdate.h
@@ -29,7 +29,7 @@ public:
 
   EUpdate() : LogEvent(EVENT_UPDATE), cmapv(0), had_slaves(false) { }
   EUpdate(MDLog *mdlog, const char *s) : 
-    LogEvent(EVENT_UPDATE), metablob(mdlog),
+    LogEvent(EVENT_UPDATE),
     type(s), cmapv(0), had_slaves(false) { }
   
   void print(ostream& out) const override {
diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index b63fbd980c8..c659c2e7b12 100644
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -299,11 +299,6 @@ void LogSegment::try_to_expire(MDSRank *mds, MDSGatherBuilder &gather_bld, int o
 // -----------------------
 // EMetaBlob
 
-EMetaBlob::EMetaBlob(MDLog *mdlog) : opened_ino(0), renamed_dirino(0),
-				     inotablev(0), sessionmapv(0), allocated_ino(0),
-				     last_subtree_map(0), event_seq(0)
-{ }
-
 void EMetaBlob::add_dir_context(CDir *dir, int mode)
 {
   MDSRank *mds = dir->cache->mds;