Merge pull request #1821 from ceph/mds-optracker-fixes

mds: fix Server::submit_mdlog_entry()
This commit is contained in:
Yan, Zheng 2014-05-18 13:42:51 +08:00
commit 991f7f15a6

View File

@ -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);
}
/*