From: Joao Eduardo Luis <joao@suse.de>
Date: Wed, 17 Jun 2015 09:59:44 +0000 (+0100)
Subject: mon: LogMonitor: implements C_MonOp on op-related callback contexts
X-Git-Tag: v9.1.0~535^2~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fff540d40cfd99e14a5b5d13ef3f03f6e281cf2e;p=ceph.git

mon: LogMonitor: implements C_MonOp on op-related callback contexts

These contexts deal with MonOpRequests, and we need to track their life
cycle; use C_MonOp to mark events when the callbacks are woken up for
some reason.

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

diff --git a/src/mon/LogMonitor.h b/src/mon/LogMonitor.h
index a298d52a1039..6dcee8b85cbc 100644
--- a/src/mon/LogMonitor.h
+++ b/src/mon/LogMonitor.h
@@ -130,11 +130,11 @@ private:
     return true;
   }
 
-  struct C_Log : public Context {
+  struct C_Log : public C_MonOp {
     LogMonitor *logmon;
-    MonOpRequestRef op;
-    C_Log(LogMonitor *p, MonOpRequestRef o) : logmon(p), op(o) {}
-    void finish(int r) {
+    C_Log(LogMonitor *p, MonOpRequestRef o) : 
+      C_MonOp(o), logmon(p) {}
+    void _finish(int r) {
       if (r == -ECANCELED) {
 	return;
       }