From: Joao Eduardo Luis <joao@suse.de>
Date: Wed, 24 Jun 2015 22:49:54 +0000 (+0100)
Subject: mon: MDSMonitor: use op-related no_reply()
X-Git-Tag: v9.1.0~535^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dce78ee124186886f7140e832c8afacc3c2456e2;p=ceph.git

mon: MDSMonitor: use op-related no_reply()

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
---

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 91d6cfbaad9a..d588e14c304d 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -370,7 +370,7 @@ bool MDSMonitor::preprocess_beacon(MonOpRequestRef op)
 
  ignore:
   // I won't reply this beacon, drop it.
-  mon->no_reply(m);
+  mon->no_reply(op);
   return true;
 }
 
diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h
index b840b1e7c2e9..03a22764b709 100644
--- a/src/mon/MDSMonitor.h
+++ b/src/mon/MDSMonitor.h
@@ -59,7 +59,7 @@ class MDSMonitor : public PaxosService {
       if (r >= 0)
 	mm->_updated(op);   // success
       else if (r == -ECANCELED) {
-	mm->mon->no_reply(op->get_req<PaxosServiceMessage>());
+	mm->mon->no_reply(op);
       } else {
 	mm->dispatch(op);        // try again
       }
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 3f80242862aa..a4bab5dd504a 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1758,9 +1758,11 @@ void OSDMonitor::process_failures()
 
       while (!ls.empty()) {
         MonOpRequestRef o = ls.front();
-        o->mark_event(__func__);
-        MOSDFailure *m = o->get_req<MOSDFailure>();
-	send_latest(o, m->get_epoch());
+        if (o) {
+          o->mark_event(__func__);
+          MOSDFailure *m = o->get_req<MOSDFailure>();
+          send_latest(o, m->get_epoch());
+        }
 	ls.pop_front();
       }
     }