From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Sun, 18 May 2014 05:38:19 +0000 (+0800)
Subject: mds: fix Server::submit_mdlog_entry()
X-Git-Tag: v0.82~81^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1821%2Fhead;p=ceph.git

mds: fix Server::submit_mdlog_entry()

mdr can be NULL when rolling back slave update

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index b0f0a13d1631..85645ea65c9d 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -826,10 +826,13 @@ public:
 void Server::submit_mdlog_entry(LogEvent *le, Context *fin, MDRequestRef& mdr,
                                 const char *event)
 {
-  string event_str("submit entry: ");
-  event_str += event;
-  mdr->mark_event(event_str);
-  mdlog->submit_entry(le, new C_MarkEvent(fin, mdr, event));
+  if (mdr) {
+    string event_str("submit entry: ");
+    event_str += event;
+    mdr->mark_event(event_str);
+    mdlog->submit_entry(le, new C_MarkEvent(fin, mdr, event));
+  } else
+    mdlog->submit_entry(le, fin);
 }
 
 /*