]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/MonClient: drop unused param
authorKefu Chai <kchai@redhat.com>
Tue, 23 May 2017 08:54:34 +0000 (16:54 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 24 May 2017 15:58:25 +0000 (23:58 +0800)
Signed-off-by: Kefu Chai <kchai@redhat.com>
src/mon/MonClient.cc
src/mon/MonClient.h

index da843269ac993ab392c80df2c4b67d763f2195df..b926076961c027d97177763750d6584da4e1278d 100644 (file)
@@ -1003,7 +1003,7 @@ void MonClient::handle_mon_command_ack(MMonCommandAck *ack)
   ack->put();
 }
 
-int MonClient::_cancel_mon_command(uint64_t tid, int r)
+int MonClient::_cancel_mon_command(uint64_t tid)
 {
   assert(monc_lock.is_locked());
 
@@ -1053,7 +1053,7 @@ void MonClient::start_mon_command(const vector<string>& cmd,
       public:
       C_CancelMonCommand(uint64_t tid, MonClient *monc) : tid(tid), monc(monc) {}
       void finish(int r) override {
-       monc->_cancel_mon_command(tid, -ETIMEDOUT);
+       monc->_cancel_mon_command(tid);
       }
     };
     r->ontimeout = new C_CancelMonCommand(r->tid, this);
index 9656db0ee71a6d1fd59801204627ca1002e78c54..be24d7a67065b3fe0092158112b06bbad0767945 100644 (file)
@@ -432,7 +432,7 @@ private:
 
   void _send_command(MonCommand *r);
   void _resend_mon_commands();
-  int _cancel_mon_command(uint64_t tid, int r);
+  int _cancel_mon_command(uint64_t tid);
   void _finish_command(MonCommand *r, int ret, string rs);
   void _finish_auth();
   void handle_mon_command_ack(MMonCommandAck *ack);