mds: set LogEvent _start_off, drop unused _end_off

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mds/LogEvent.h b/src/mds/LogEvent.h
index 17e2d6105998fd87dbc4c4ec9e1e64bac9ccae9d..87489a7bbe2695bde5b39d5b17ea21229b4445e4 100644 (file)
--- a/src/mds/LogEvent.h
+++ b/src/mds/LogEvent.h
@@ -51,7 +51,7 @@ class LogSegment;
 class LogEvent {
  private:
   __u32 _type;
-  loff_t _start_off,_end_off;
+  uint64_t _start_off;
 
 protected:
   utime_t stamp;
@@ -61,13 +61,13 @@ protected:
  public:
   LogSegment *_segment;
 
-  LogEvent(int t) : 
-    _type(t), _start_off(0), _end_off(0), _segment(0) { }
+  LogEvent(int t)
+    : _type(t), _start_off(0), _segment(0) { }
   virtual ~LogEvent() { }
 
   int get_type() { return _type; }
-  loff_t get_start_off() { return _start_off; }
-  loff_t get_end_off() { return _end_off; }
+  uint64_t get_start_off() const { return _start_off; }
+  void set_start_off(uint64_t o) { _start_off = o; }
   utime_t get_stamp() const { return stamp; }
 
   void set_stamp(utime_t t) { stamp = t; }

diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index a2d498f7f10692f99d2d76ca1c87be6548b594b4..f7b17e79bbf62258cb73c2cc8bca297d685e2038 100644 (file)
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -151,6 +151,13 @@ void MDLog::append()
 
 // -------------------------------------------------
 
+void MDLog::start_entry(LogEvent *e)
+{
+  assert(cur_event == NULL);
+  cur_event = e;
+  e->set_start_off(get_write_pos());
+}
+
 void MDLog::submit_entry(LogEvent *le, Context *c) 
 {
   assert(!mds->is_any_replay());
@@ -534,6 +541,7 @@ void MDLog::_replay_thread()
       assert(!!"corrupt log event" == g_conf->mds_log_skip_corrupt_events);
       continue;
     }
+    le->set_start_off(pos);
 
     // new segment?
     if (le->get_type() == EVENT_SUBTREEMAP ||

diff --git a/src/mds/MDLog.h b/src/mds/MDLog.h
index 104c39f51464d0b1ebc9c98dee8cfa29043e4ca2..7f9a5b73cfc9eeeeacbb88924cb6cc4c7d160677 100644 (file)
--- a/src/mds/MDLog.h
+++ b/src/mds/MDLog.h
@@ -196,10 +196,7 @@ public:
 private:
   LogEvent *cur_event;
 public:
-  void start_entry(LogEvent *e) {
-    assert(cur_event == NULL);
-    cur_event = e;
-  }
+  void start_entry(LogEvent *e);
   void submit_entry(LogEvent *e, Context *c = 0);
   void start_submit_entry(LogEvent *e, Context *c = 0) {
     start_entry(e);