diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc index da843269ac9..b926076961c 100644 --- a/src/mon/MonClient.cc +++ b/src/mon/MonClient.cc @@ -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& 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); diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h index 9656db0ee71..be24d7a6706 100644 --- a/src/mon/MonClient.h +++ b/src/mon/MonClient.h @@ -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);