From: Joao Eduardo Luis <joao@suse.de>
Date: Thu, 18 Jun 2015 15:39:07 +0000 (+0100)
Subject: mon: Monitor: drop reply_command(MMonCommand *m,...)
X-Git-Tag: v9.1.0~535^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ebbab9e7540f194d3ca1f44820ae689a84fd3dd;p=ceph.git

mon: Monitor: drop reply_command(MMonCommand *m,...)

Monitor commands are now op requests; always use ops when replying to
commands.

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 87e865686b52..d5b7fac6784f 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -3006,20 +3006,6 @@ void Monitor::handle_command(MonOpRequestRef op)
     reply_command(op, r, rs, rdata, 0);
 }
 
-void Monitor::reply_command(MMonCommand *m, int rc, const string &rs, version_t version)
-{
-  bufferlist rdata;
-  reply_command(m, rc, rs, rdata, version);
-}
-
-void Monitor::reply_command(MMonCommand *m, int rc, const string &rs, bufferlist& rdata, version_t version)
-{
-  MMonCommandAck *reply = new MMonCommandAck(m->cmd, rc, rs, version);
-  reply->set_tid(m->get_tid());
-  reply->set_data(rdata);
-  send_reply(m, reply);
-}
-
 void Monitor::reply_command(MonOpRequestRef op, int rc, const string &rs, version_t version)
 {
   bufferlist rdata;
diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index cf4e160b3aec..a2469d5fcbd7 100644
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -759,8 +759,6 @@ public:
                              Formatter *f);
   void get_cluster_status(stringstream &ss, Formatter *f);
 
-  void reply_command(MMonCommand *m, int rc, const string &rs, version_t version);
-  void reply_command(MMonCommand *m, int rc, const string &rs, bufferlist& rdata, version_t version);
   void reply_command(MonOpRequestRef op, int rc, const string &rs, version_t version);
   void reply_command(MonOpRequestRef op, int rc, const string &rs, bufferlist& rdata, version_t version);